Imported translations from launchpad

63 files changed, 1895 insertions, 848 deletions

diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index c1f782445..20fed1191 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -9,50 +9,52 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli na $product';
-$labels['username'] = 'Korisničko ime';
-$labels['password'] = 'Lozinka';
+$labels['welcome'] = 'Dobrodošli u $product';
+$labels['username'] = 'Korisnik';
+$labels['password'] = 'Šifra';
 $labels['server'] = 'Server';
 $labels['login'] = 'Prijava';
 $labels['logout'] = 'Odjava';
-$labels['mail'] = 'Sanduče';
+$labels['mail'] = 'Email';
 $labels['settings'] = 'Podešavanja';
-$labels['addressbook'] = 'Imenik';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
+$labels['addressbook'] = 'Adresar';
+$labels['inbox'] = 'Sanduče';
+$labels['drafts'] = 'Skice';
 $labels['sent'] = 'Poslano';
-$labels['trash'] = 'Trash';
-$labels['junk'] = 'Junk';
+$labels['trash'] = 'Smeće';
+$labels['junk'] = 'Spam';
 $labels['subject'] = 'Naslov';
 $labels['from'] = 'Od';
 $labels['to'] = 'Za';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Odgovori';
-$labels['followupto'] = 'Uprati';
+$labels['followupto'] = 'Prati';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status poruke';
-$labels['mailboxlist'] = 'Fascikle';
-$labels['folders'] = 'Fascikle';
+$labels['listoptions'] = 'Izlistaj opcije...';
+$labels['mailboxlist'] = 'Folderi';
+$labels['folders'] = 'Folderi';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
-$labels['threadsfromto'] = 'Teme $from do $to od $count';
+$labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
-$labels['copy'] = 'Kopirati';
-$labels['move'] = 'Prebaciti';
-$labels['moveto'] = 'prebaci u...';
-$labels['download'] = 'preuzmi (download)';
+$labels['fromtoshort'] = '$from – $to od ukupno $count';
+$labels['copy'] = 'Kopiraj';
+$labels['move'] = 'Premjesti';
+$labels['moveto'] = 'Premjesti u...';
+$labels['download'] = 'Preuzmi';
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
-$labels['addtoaddressbook'] = 'Dodaj u imenik';
+$labels['addtoaddressbook'] = 'Dodaj u adresar';
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
 $labels['tue'] = 'Uto';
@@ -91,109 +93,126 @@ $labels['longsep'] = 'Septembar';
 $labels['longoct'] = 'Oktobar';
 $labels['longnov'] = 'Novembar';
 $labels['longdec'] = 'Decembar';
-$labels['today'] = 'danas';
-$labels['checkmail'] = 'Provjera novih poruka';
-$labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Nova poruka';
-$labels['replytomessage'] = 'Odgovori na poruku';
-$labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primaocima';
+$labels['today'] = 'Danas';
+$labels['refresh'] = 'Osvježi';
+$labels['checkmail'] = 'Provjeri ima li novih poruka';
+$labels['compose'] = 'Napiši poruku';
+$labels['writenewmessage'] = 'Kreiraj novu poruku';
+$labels['reply'] = 'Odgovori';
+$labels['replytomessage'] = 'Odgovori pošiljaocu';
+$labels['replytoallmessage'] = 'Odgovori listi osobi ili pošiljaocu i svim primaocima';
 $labels['replyall'] = 'Odgovori svima';
 $labels['replylist'] = 'Odgovori listi';
+$labels['forward'] = 'Proslijedi';
+$labels['forwardinline'] = 'Proslijedi odmah';
+$labels['forwardattachment'] = 'Proslijedi kao prilog';
 $labels['forwardmessage'] = 'Proslijedi poruku';
 $labels['deletemessage'] = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Prebaci poruku u smeće';
 $labels['printmessage'] = 'Odštampaj poruku';
 $labels['previousmessage'] = 'Prikaži prethodnu poruku';
 $labels['firstmessage'] = 'Prikaži prvu poruku';
-$labels['nextmessage'] = 'Prikaži posljednju poruku';
+$labels['nextmessage'] = 'Prikaži sljedeću poruku';
 $labels['lastmessage'] = 'Prikaži zadnju poruku';
-$labels['backtolist'] = 'Povratak na listu poruka';
-$labels['viewsource'] = 'Prikaži poruku u izvornom obliku';
+$labels['backtolist'] = 'Nazad na listu poruka';
+$labels['viewsource'] = 'Prikaži izvornu poruku';
+$labels['mark'] = 'Označi';
 $labels['markmessages'] = 'Označi poruke';
 $labels['markread'] = 'Kao pročitane';
 $labels['markunread'] = 'Kao nepročitane';
-$labels['markflagged'] = 'Kao markirane';
-$labels['markunflagged'] = 'Kao nemarkirane';
-$labels['select'] = 'Obilježi';
+$labels['markflagged'] = 'Kao važne';
+$labels['markunflagged'] = 'Kao nevažne';
+$labels['moreactions'] = 'Više akcija...';
+$labels['more'] = 'Više';
+$labels['back'] = 'Nazad';
+$labels['options'] = 'Opcije';
+$labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
 $labels['nonesort'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
-$labels['unread'] = 'Nepročitane';
-$labels['flagged'] = 'Obilježeno';
-$labels['unanswered'] = 'Neuzvraćeno';
+$labels['unread'] = 'Nepročitano';
+$labels['flagged'] = 'Važno';
+$labels['unanswered'] = 'Neodgovoreno';
 $labels['deleted'] = 'Obrisano';
-$labels['invert'] = 'Izokrenuti';
+$labels['invert'] = 'Izokreni';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lista';
 $labels['threads'] = 'Teme';
 $labels['expand-all'] = 'Proširi sve';
 $labels['expand-unread'] = 'Proširi nepročitane';
-$labels['collapse-all'] = 'Sažmi sve';
+$labels['collapse-all'] = 'Zatvori sve';
+$labels['threaded'] = 'Teme';
 $labels['autoexpand_threads'] = 'Proširi teme poruka';
 $labels['do_expand'] = 'sve teme';
 $labels['expand_only_unread'] = 'samo sa nepročitanim porukama';
-$labels['fromto'] = 'Pošiljaoc/Primatelj';
+$labels['fromto'] = 'Od/Za';
 $labels['flag'] = 'Oznaka';
-$labels['attachment'] = 'Privitak';
+$labels['attachment'] = 'Prilog';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'rastući';
 $labels['desc'] = 'opadajući';
 $labels['listcolumns'] = 'Lista kolona';
 $labels['listsorting'] = 'Sortiranje kolona';
-$labels['listorder'] = 'Redoslijed sortiranja';
+$labels['listorder'] = 'Raspored sortiranja';
 $labels['listmode'] = 'Način prikaza liste';
-$labels['folderactions'] = 'Radnja fascikle...';
+$labels['folderactions'] = 'Akcije za foldere...';
 $labels['compact'] = 'Skraćeno';
-$labels['empty'] = 'Izprazni';
-$labels['quota'] = 'Kvota';
+$labels['empty'] = 'Isprazni';
+$labels['quota'] = 'Zauzeće diska';
 $labels['unknown'] = 'nepoznato';
-$labels['unlimited'] = 'beskonačna';
+$labels['unlimited'] = 'neograničeno';
 $labels['quicksearch'] = 'Brza pretraga';
-$labels['resetsearch'] = 'Prikaži sve poruke';
+$labels['resetsearch'] = 'Resetuj pretragu';
 $labels['searchmod'] = 'Modifikacija pretrage';
-$labels['msgtext'] = 'Cjela poruka';
+$labels['msgtext'] = 'Cijela poruka';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
-$labels['emlsave'] = 'Snimi (.eml)';
+$labels['emlsave'] = 'Preuzmi (.eml)';
 $labels['editasnew'] = 'Uredi kao novo';
-$labels['savemessage'] = 'Sačuvaj nacrt';
+$labels['savemessage'] = 'Sačuvaj skicu';
 $labels['sendmessage'] = 'Pošalji poruku';
 $labels['addattachment'] = 'Priloži datoteku';
 $labels['charset'] = 'Skup znakova';
 $labels['editortype'] = 'Vrsta urednika';
 $labels['returnreceipt'] = 'Potvrda o prispijeću poruke';
-$labels['dsn'] = 'Obaviještenje o statusu isporuke';
-$labels['editidents'] = 'Uredi pseudonime';
+$labels['dsn'] = 'Obavještenje o statusu dostave';
+$labels['mailreplyintro'] = '$date, $sender je napisao/la:';
+$labels['originalmessage'] = 'Originalna poruka';
+$labels['editidents'] = 'Uredi identitete';
+$labels['spellcheck'] = 'Spelovanje';
 $labels['checkspelling'] = 'Provjera pravopisa';
-$labels['resumeediting'] = 'Povratak u režim pisanja';
+$labels['resumeediting'] = 'Nastavi uređivanje';
 $labels['revertto'] = 'Vrati na';
-$labels['attachments'] = 'Dodatci (Attachments)';
+$labels['attach'] = 'Priloži';
+$labels['attachments'] = 'Prilozi';
 $labels['upload'] = 'Dodaj';
+$labels['uploadprogress'] = '$percent ($current od $total)';
 $labels['close'] = 'Zatvori';
 $labels['messageoptions'] = 'Opcije poruke...';
 $labels['low'] = 'Nizak';
 $labels['lowest'] = 'Najniži';
-$labels['normal'] = 'Srednji';
+$labels['normal'] = 'Normalan';
 $labels['high'] = 'Visok';
-$labels['highest'] = 'Najviši';
+$labels['highest'] = 'Najveći';
 $labels['nosubject'] = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
+$labels['isdraft'] = 'Ovo je skica.';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Običan tekst';
-$labels['savesentmessagein'] = 'Spremi poslane poruke u';
-$labels['dontsave'] = 'ne spremaj';
-$labels['maxuploadsize'] = 'Maksimalna dozvoljena velicina datoteke je $size';
+$labels['plaintoggle'] = 'Obični tekst';
+$labels['savesentmessagein'] = 'Sačuvaj poslane poruke u';
+$labels['dontsave'] = 'ne snimaj';
+$labels['maxuploadsize'] = 'Maksimalna dozvoljena veličina datoteke je $size';
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
-$labels['addreplyto'] = 'Dodaj Odgovori-na';
-$labels['addfollowupto'] = 'Dodaj Nastavak-na';
-$labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten o njenom primitku. Želite li obavijestiti pošiljaoca?';
-$labels['receiptread'] = 'Vrati potvrdu (pročitano)';
-$labels['yourmessage'] = 'Ovo je vraćena potvrda vaše poruke';
-$labels['receiptnote'] = 'Napomena: Ova potvrda samo obaviještava da je poruka bila prikazana na kompjuteru primaoca. Nije garancija da je primaoc pročitao ili razumio poruku.';
-$labels['name'] = 'Puno ime';
+$labels['addreplyto'] = 'Dodaj odgovor na';
+$labels['addfollowupto'] = 'Dodaj praćenje za';
+$labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten kada pročitate ovu poruku. Želite li obavijestiti pošiljaoca?';
+$labels['receiptread'] = 'Povratnica (pročitano)';
+$labels['yourmessage'] = 'Ovo je povratnica vaše poruke';
+$labels['receiptnote'] = 'Napomena: Ova povratnica samo potvrđuje da je poruka bila prikazana na računaru primaoca. Nema garancija da je primaoc pročitao ili razumio sadržaj poruke.';
+$labels['name'] = 'Ime za prikaz';
 $labels['firstname'] = 'Ime';
 $labels['surname'] = 'Prezime';
 $labels['middlename'] = 'Srednje ime';
@@ -202,9 +221,9 @@ $labels['namesuffix'] = 'Sufiks';
 $labels['nickname'] = 'Nadimak';
 $labels['jobtitle'] = 'Titula';
 $labels['department'] = 'Odjel';
-$labels['gender'] = 'Rod';
+$labels['gender'] = 'Spol';
 $labels['maidenname'] = 'Djevojačko ime';
-$labels['email'] = 'E-Mail';
+$labels['email'] = 'Email';
 $labels['phone'] = 'Telefon';
 $labels['address'] = 'Adresa';
 $labels['street'] = 'Ulica';
@@ -213,16 +232,20 @@ $labels['zipcode'] = 'Poštanski broj';
 $labels['region'] = 'Oblast';
 $labels['country'] = 'Zemlja';
 $labels['birthday'] = 'Rođendan';
-$labels['anniversary'] = 'Jubilej';
+$labels['anniversary'] = 'Godišnjica';
 $labels['website'] = 'Web stranica';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'bilješke';
+$labels['notes'] = 'Napomene';
 $labels['male'] = 'Muško';
 $labels['female'] = 'Žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Pomoćnik';
 $labels['typeassistant'] = 'Pomoćnik';
-$labels['spouse'] = 'Muž/Žena';
+$labels['spouse'] = 'Supružnik';
+$labels['allfields'] = 'Sva polja';
+$labels['search'] = 'Pretraga';
+$labels['advsearch'] = 'Napredna pretraga';
+$labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
 $labels['typeother'] = 'Ostalo';
 $labels['typehome'] = 'Kućni broj';
@@ -231,158 +254,192 @@ $labels['typemobile'] = 'Mobilni broj';
 $labels['typemain'] = 'Glavni broj';
 $labels['typehomefax'] = 'Fax kuća';
 $labels['typeworkfax'] = 'Fax posao';
-$labels['typecar'] = 'Auto';
+$labels['typecar'] = 'Automobil';
 $labels['typepager'] = 'Pejdžer';
 $labels['typevideo'] = 'Video';
-$labels['addfield'] = 'Dodati polje...';
+$labels['typehomepage'] = 'Početna stranica';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
+$labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
-$labels['editcontact'] = 'Izmijeni kontakt';
+$labels['editcontact'] = 'Uredi kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['personalinfo'] = 'Lični podaci';
-$labels['edit'] = 'Izmijeni';
+$labels['edit'] = 'Uredi';
 $labels['cancel'] = 'Otkaži';
 $labels['save'] = 'Sačuvaj';
 $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
-$labels['replacephoto'] = 'Izmjeni';
+$labels['replacephoto'] = 'Zamijeni';
+$labels['uploadphoto'] = 'Dodaj fotografiju';
 $labels['newcontact'] = 'Dodaj novi kontakt';
 $labels['deletecontact'] = 'Obriši odabrane kontakte';
-$labels['composeto'] = 'Napiši mail...';
+$labels['composeto'] = 'Napiši email za';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
 $labels['print'] = 'Štampaj';
 $labels['export'] = 'Izvezi';
 $labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
-$labels['newcontactgroup'] = 'Kreiraj novu kontakt-grupu';
-$labels['previouspage'] = 'Prikaži predhodnu stranicu';
-$labels['firstpage'] = 'Prikaži prvi skup';
+$labels['newcontactgroup'] = 'Kreiraj novu grupu kontakata';
+$labels['grouprename'] = 'Preimenuj grupu';
+$labels['groupdelete'] = 'Obriši grupu';
+$labels['previouspage'] = 'Prikaži prethodnu stranicu';
+$labels['firstpage'] = 'Prikaži prvu stranicu';
 $labels['nextpage'] = 'Prikaži sljedeću stranicu';
-$labels['lastpage'] = 'Prikaži zadnji skup';
+$labels['lastpage'] = 'Prikaži zadnju stranicu';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Lične adrese';
+$labels['searchsave'] = 'Sačuvaj pretragu';
+$labels['searchdelete'] = 'Obriši pretragu';
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakata';
 $labels['importfromfile'] = 'Uvoz iz datoteke:';
-$labels['importreplace'] = 'Izmjeni čitav ovaj adresar';
-$labels['importtext'] = 'Možete prebaciti kontakte iz postojećeg adresara.<br/>Trenutno podržavamo uvozenje adresa iz <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formata.';
+$labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
+$labels['importreplace'] = 'Zamijeni cijeli adresar';
+$labels['importtext'] = 'Možete dodati kontakte iz postojećeg adresara.<br/>Trenutno podržavamo uvoz adresa iz <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formata podataka.';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Podešavanja za';
+$labels['about'] = 'Informacije';
 $labels['preferences'] = 'Podešavanja';
-$labels['userpreferences'] = 'Opšta podešavanja';
-$labels['editpreferences'] = 'Izmjena opštih podešavanja';
+$labels['userpreferences'] = 'Korisničke opcije';
+$labels['editpreferences'] = 'Uredi korisničke opcije';
 $labels['identities'] = 'Identiteti';
-$labels['manageidentities'] = 'Podesi identitete za ovaj nalog';
+$labels['manageidentities'] = 'Podesi identitete za ovaj račun';
 $labels['newidentity'] = 'Dodaj identitet';
-$labels['newitem'] = 'New item';
-$labels['edititem'] = 'Edit item';
-$labels['preferhtml'] = 'HTML format u prednosti';
-$labels['defaultcharset'] = 'Zadani skup znakova';
-$labels['htmlmessage'] = 'HTML format poruke';
-$labels['prettydate'] = 'Formatiran datum';
-$labels['setdefault'] = 'Postavi glavnim';
+$labels['newitem'] = 'Nova stavka';
+$labels['edititem'] = 'Uredi stavku';
+$labels['preferhtml'] = 'Prikaži HTML';
+$labels['defaultcharset'] = 'Glavni skup znakova';
+$labels['htmlmessage'] = 'HTML poruke';
+$labels['dateformat'] = 'Format datuma';
+$labels['timeformat'] = 'Format vremena';
+$labels['prettydate'] = 'Formatirani datum';
+$labels['setdefault'] = 'Postavi kao glavno';
 $labels['autodetect'] = 'Automatski';
 $labels['language'] = 'Jezik';
 $labels['timezone'] = 'Vremenska zona';
 $labels['pagesize'] = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-$labels['dstactive'] = 'Ljetno pomjeranje vremena';
-$labels['htmleditor'] = 'Pisi HTML poruke';
-$labels['htmlonreply'] = 'odgovor samo na HTML poruke';
+$labels['dstactive'] = 'Ljetno računanje vremena';
+$labels['htmleditor'] = 'Piši HTML poruke';
+$labels['htmlonreply'] = 'samo kao odgovor na HTML poruke';
 $labels['htmlsignature'] = 'HTML potpis';
-$labels['previewpane'] = 'Pokaži prethodu poruku';
-$labels['skin'] = 'Interfejs izgled';
-$labels['logoutclear'] = 'Očisti smeće pri izlazu';
-$labels['logoutcompact'] = 'Komprimiraj Inbox pri izlazu';
+$labels['previewpane'] = 'Prikaži pregled poruke';
+$labels['skin'] = 'Skin interfejsa';
+$labels['logoutclear'] = 'Očisti smeće prilikom odjavljivanja';
+$labels['logoutcompact'] = 'Optimiziraj sanduče prilikom odjavljivanja';
 $labels['uisettings'] = 'Korisnički interfejs';
 $labels['serversettings'] = 'Postavke servera';
-$labels['mailboxview'] = 'Pregled Mailboxa';
-$labels['mdnrequests'] = 'obavijest pošiljatelja';
+$labels['mailboxview'] = 'Pregled emaila';
+$labels['mdnrequests'] = 'Prilikom zahtjeva za povratnicu';
 $labels['askuser'] = 'pitaj korisnika';
-$labels['autosend'] = 'Pošalji obavijest';
-$labels['autosendknown'] = 'pošalji obavijest mojim kontaktima, inače me pitaj';
-$labels['autosendknownignore'] = 'pošalji obavijest mojim kontaktima, inače ignoriši';
-$labels['ignore'] = 'ignorisati';
+$labels['autosend'] = 'pošalji povratnicu';
+$labels['autosendknown'] = 'pošalji povratnicu mojim kontaktima, u suprotnom me pitaj';
+$labels['autosendknownignore'] = 'pošalji povratnicu mojim kontaktima, u suprotnom zanemari';
+$labels['ignore'] = 'zanemari';
 $labels['readwhendeleted'] = 'Označi poruku kao pročitanu pri brisanju';
 $labels['flagfordeletion'] = 'Označi poruku za brisanje umjesto brisanja';
-$labels['skipdeleted'] = 'Ne prikazivaj pobrisane poruke';
-$labels['deletealways'] = 'Ako poruke prebacujem u kantu, obriši ih odmah';
-$labels['showremoteimages'] = 'prikaži slike s interneta';
+$labels['skipdeleted'] = 'Ne prikazuj obrisane poruke';
+$labels['deletealways'] = 'Ako premještanje poruka u smeće ne uspije, odmah ih obriši';
+$labels['showremoteimages'] = 'Prikaži vanjske slike u porukama';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
-$labels['showinlineimages'] = 'prikaži slike ispod poruke';
-$labels['autosavedraft'] = 'Automatski spasi predlozak';
+$labels['showinlineimages'] = 'Prikaži priložene slike ispod poruke';
+$labels['autosavedraft'] = 'Automatski sačuvaj skicu';
 $labels['everynminutes'] = 'svakih $n minuta';
-$labels['keepalive'] = 'provjeri nove poruke';
-$labels['never'] = 'nikada';
+$labels['keepalive'] = 'Provjeri ima li novih poruka';
+$labels['never'] = 'nikad';
 $labels['immediately'] = 'odmah';
-$labels['messagesdisplaying'] = 'prikazujem poruke';
-$labels['messagescomposition'] = 'komponiram poruke';
-$labels['mimeparamfolding'] = 'Ime priloga';
-$labels['advancedoptions'] = 'napredne opcije';
-$labels['focusonnewmessage'] = 'fokusiraj browser pri novoj poruci';
-$labels['checkallfolders'] = 'provjeri nove poruke u svim mapama';
-$labels['displaynext'] = 'nakon brisanja/micanja poruke, prikaži slijedeću';
-$labels['mainoptions'] = 'glavne opcije';
-$labels['section'] = 'sekcija';
-$labels['maintenance'] = 'održavanje';
-$labels['newmessage'] = 'nova poruka';
-$labels['signatureoptions'] = 'opcije potpisa';
-$labels['whenreplying'] = 'prilikom odgovora';
+$labels['messagesdisplaying'] = 'Prikazujem poruke';
+$labels['messagescomposition'] = 'Pisanje poruka';
+$labels['mimeparamfolding'] = 'Nazivi priloga';
+$labels['2231folding'] = 'Puni RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Puni RFC 2047 (ostalo)';
+$labels['force7bit'] = 'Koristi MIME kodiranje za 8-bitne znakove';
+$labels['advancedoptions'] = 'Napredne opcije';
+$labels['focusonnewmessage'] = 'Fokusiraj prozor preglednika na novu poruku';
+$labels['checkallfolders'] = 'Provjeri ima li novih poruka u svim folderima';
+$labels['displaynext'] = 'Aakon brisanja/premještanja poruke, prikaži slijedeću poruku';
+$labels['defaultfont'] = 'Osnovni font za HTML poruke';
+$labels['mainoptions'] = 'Glavne opcija';
+$labels['browseroptions'] = 'Opcije preglednika';
+$labels['section'] = 'Sekcija';
+$labels['maintenance'] = 'Održavanje';
+$labels['newmessage'] = 'Nova poruka';
+$labels['signatureoptions'] = 'Opcija potpisa';
+$labels['whenreplying'] = 'Prilikom odgovora';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
 $labels['replybottomposting'] = 'započni novu poruku ispod originala';
-$labels['replyremovesignature'] = 'kod odgovaranja, makni originalni potpis iz poruke';
-$labels['autoaddsignature'] = 'automatski dodaj potpis';
-$labels['newmessageonly'] = 'samo nova poruka';
-$labels['replyandforwardonly'] = 'samo odgovori i proslijeđivanja';
-$labels['replysignaturepos'] = 'kod downloada ili proslijeđivanja postavi potpis';
+$labels['replyremovesignature'] = 'Prilikom odgovaranja na poruku, ukloni originalni potpis iz poruke';
+$labels['autoaddsignature'] = 'Automatski dodaj potpis';
+$labels['newmessageonly'] = 'samo za nove poruke';
+$labels['replyandforwardonly'] = 'samo za odgovore i prosljeđivanja';
+$labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeđivanja potpis ubaci';
 $labels['belowquote'] = 'ispod citata';
 $labels['abovequote'] = 'iznad citata';
-$labels['insertsignature'] = 'umetni potpis';
-$labels['previewpanemarkread'] = 'obilježi pregledane poruke kao pročitane';
+$labels['insertsignature'] = 'Umetni potpis';
+$labels['previewpanemarkread'] = 'Obilježi prikazane poruke kao pročitane';
 $labels['afternseconds'] = 'nakon $n sekundi';
-$labels['reqmdn'] = 'uvijek zatraži potvrdu o primitku poruke';
-$labels['reqdsn'] = 'uvijek zatraži potvrdu o slanju poruke';
-$labels['replysamefolder'] = 'spremi odgovore u mapu gdje se nalazi poruka';
-$labels['folder'] = 'Fascikla';
-$labels['foldername'] = 'Ime fascikle';
+$labels['reqmdn'] = 'Uvijek zahtjevaj povratnicu';
+$labels['reqdsn'] = 'Uvijek zahtjevaj obavijest o statusu dostave';
+$labels['replysamefolder'] = 'Sačuvaj odgovore u folder poruke na osnovu koje se piše odgovor';
+$labels['defaultaddressbook'] = 'DOdaj nove kontakte u odabrani adresar';
+$labels['autocompletesingle'] = 'Preskoči alternativne email adrese prilikom automatskog popunjavanja';
+$labels['listnamedisplay'] = 'Izlistaj kontakte kao';
+$labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
+$labels['spellcheckoptions'] = 'Opcije provjere pravopisa';
+$labels['spellcheckignoresyms'] = 'Zanemari riječi sa simbolima';
+$labels['spellcheckignorenums'] = 'Zanemari riječi sa brojevima';
+$labels['spellcheckignorecaps'] = 'Zanemari riječi napisane velikim slovima';
+$labels['addtodict'] = 'Dodaj u rječnik';
+$labels['mailtoprotohandler'] = 'Registruj upravljač protokola za mailto: linkovi';
+$labels['folder'] = 'Folder';
+$labels['foldername'] = 'Naziv foldera';
 $labels['subscribed'] = 'Pretplaćen';
-$labels['messagecount'] = 'poruke';
-$labels['create'] = 'Napravi';
-$labels['createfolder'] = 'Napravi novu fasciklu';
-$labels['managefolders'] = 'Podesi fasciklu';
-$labels['specialfolders'] = 'specijalna Mapa';
-$labels['properties'] = 'svojstva';
-$labels['folderproperties'] = 'svojstva mape';
-$labels['parentfolder'] = 'glavna mapa';
-$labels['location'] = 'lokacija';
-$labels['info'] = 'Podatak';
-$labels['getfoldersize'] = 'kliknite da biste dobili veličinu mape';
-$labels['changesubscription'] = 'kliknite da biste promjenili pretplatu';
-$labels['foldertype'] = 'Vrsta mape';
-$labels['personalfolder'] = 'privatna mapa';
-$labels['otherfolder'] = 'mapa drugih korisnika';
-$labels['sharedfolder'] = 'javna mapa';
+$labels['messagecount'] = 'Poruke';
+$labels['create'] = 'Kreiraj';
+$labels['createfolder'] = 'Kreiraj novi folder';
+$labels['managefolders'] = 'Upravljanje folderima';
+$labels['specialfolders'] = 'Specijalni folder';
+$labels['properties'] = 'Svojstva';
+$labels['folderproperties'] = 'Svojstva foldera';
+$labels['parentfolder'] = 'Matični folder';
+$labels['location'] = 'Lokacija';
+$labels['info'] = 'Informacije';
+$labels['getfoldersize'] = 'Kliknite da biste dobili informaciju o veličini foldera';
+$labels['changesubscription'] = 'Kliknite da promijenite pretplatu';
+$labels['foldertype'] = 'Vrsta foldera';
+$labels['personalfolder'] = 'Privatni folder';
+$labels['otherfolder'] = 'Folder drugog korisnika';
+$labels['sharedfolder'] = 'Javni folder';
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc'] = 'Sortiraj rastućim nizom';
-$labels['sortdesc'] = 'Sortiraj opadajućim nizom';
+$labels['sortasc'] = 'Sortiraj uzlazno';
+$labels['sortdesc'] = 'Sortiraj silazno';
+$labels['undo'] = 'Nazad';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Verzija';
+$labels['source'] = 'Izvorni kod';
+$labels['license'] = 'Licenca';
+$labels['support'] = 'Podrška';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-$labels['unicode'] = 'unicode';
+$labels['unicode'] = 'Unikod';
 $labels['english'] = 'engleski';
-$labels['westerneuropean'] = 'zapadnoevropski';
-$labels['easterneuropean'] = 'istočnoevropski';
-$labels['southeasterneuropean'] = 'jugo-istočno evropski';
+$labels['westerneuropean'] = 'Zapadna Evropa';
+$labels['easterneuropean'] = 'Istočna Evropa';
+$labels['southeasterneuropean'] = 'Jugoistočna Evropa';
 $labels['baltic'] = 'Baltički';
 $labels['cyrillic'] = 'ćirilični';
 $labels['arabic'] = 'arapski';
 $labels['greek'] = 'grčki';
 $labels['hebrew'] = 'hebrejski';
 $labels['turkish'] = 'turski';
-$labels['nordic'] = 'nordski';
+$labels['nordic'] = 'Nordijski';
 $labels['thai'] = 'tajlandski';
 $labels['celtic'] = 'keltski';
 $labels['vietnamese'] = 'vijetnamski';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 3490cf68b..9ed06a7d5 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -9,129 +9,152 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Prijava neuspješna';
-$messages['cookiesdisabled'] = 'Vaš Web pretraživač ne podržava kolačiće (cookies)';
-$messages['sessionerror'] = 'Morate se ponovno ulogovati';
+$messages['errortitle'] = 'Desila se greška!';
+$messages['loginfailed'] = 'Prijava nije uspjela.';
+$messages['cookiesdisabled'] = 'Vaš preglednik ne prihvata kolačiće.';
+$messages['sessionerror'] = 'Vaša sesija je neispravna ili je istekla.';
 $messages['storageerror'] = 'Neuspješna konekcija na IMAP server';
-$messages['servererror'] = 'Greška poslužitelja';
-$messages['servererrormsg'] = 'Greška na serveru: $msg';
-$messages['errorreadonly'] = 'Nemoguća izvedba operacije. Mapa je samo za čitanje.';
-$messages['errornoperm'] = 'Nemoguća izvedba operacije. Dozvola odbijena.';
-$messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.';
-$messages['nomessagesfound'] = 'Nema poruka u sandučetu';
+$messages['servererror'] = 'Serverska greška!';
+$messages['servererrormsg'] = 'Serverska greška: $msg';
+$messages['dberror'] = 'Greška u bazi podataka!';
+$messages['errorreadonly'] = 'Nije moguće izvršiti operaciju. Folder je samo za čitanje.';
+$messages['errornoperm'] = 'Nije moguće izvršiti operaciju. Pristup je odbijen.';
+$messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sačuvani.';
+$messages['nomessagesfound'] = 'Nema poruka u ovom sandučetu.';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Doviđenja!';
-$messages['mailboxempty'] = 'Sanduče je prazno';
+$messages['mailboxempty'] = 'Sanduče je prazno.';
 $messages['loading'] = 'Učitavanje...';
-$messages['uploading'] = 'Snimam datoteku na poslužitelj';
+$messages['uploading'] = 'Dodajem datoteku...';
+$messages['uploadingmany'] = 'Dodajem datoteke...';
 $messages['loadingdata'] = 'Učitavanje podataka...';
-$messages['checkingmail'] = 'Provjera novih poruka u toku...';
-$messages['sendingmessage'] = 'Poruka se šalje...';
-$messages['messagesent'] = 'Poruka je uspješno poslana';
+$messages['checkingmail'] = 'Provjeram ima li novih poruka...';
+$messages['sendingmessage'] = 'Šaljem poruku...';
+$messages['messagesent'] = 'Poruka je uspješno poslana.';
 $messages['savingmessage'] = 'Poruka se snima...';
-$messages['messagesaved'] = 'Poruka uspješno spremljena u \'Predlošci\'';
-$messages['successfullysaved'] = 'Snimanje uspješno obavljeno';
-$messages['addedsuccessfully'] = 'Kontakt uspješno dodat u imenik';
-$messages['contactexists'] = 'Kontakt sa ovom e-mail adresom već postoji u imeniku';
-$messages['blockedimages'] = 'Zbog zaštite privatnosti, slike sa drugih servera su blokirane.';
-$messages['encryptedmessage'] = 'Ova poruka je zaštićena pa se ne može prikazati';
-$messages['nocontactsfound'] = 'Imenik je prazan';
-$messages['contactnotfound'] = 'Traženi kontakt nije pronađen';
-$messages['sendingfailed'] = 'Greška pri slanju poruke';
-$messages['senttooquickly'] = 'Molimo sačekajte $sec sek. prije slanja ove poruke';
-$messages['errorsavingsent'] = 'Greška pri spremanju poslane poruke';
-$messages['errorsaving'] = 'Greška pri spremanju';
-$messages['errormoving'] = 'Greška pri premještanju poruke';
-$messages['errorcopying'] = 'Greška pri kopiranju poruke';
-$messages['errordeleting'] = 'Greška pri brisanju poruke';
-$messages['errormarking'] = 'Nije moguće označiti poruku';
-$messages['deletecontactconfirm'] = 'Želite li obrisati izabrane kontakte?';
-$messages['deletemessagesconfirm'] = 'Sigurno želite obrisati odabrane poruke?';
-$messages['deletefolderconfirm'] = 'Želite li obrisati ovu fasciklu?';
-$messages['purgefolderconfirm'] = 'Želite li obrisati sve poruke u fascikli?';
-$messages['folderdeleting'] = 'Brišem fasciklu...';
-$messages['foldermoving'] = 'Premještam fasciklu...';
-$messages['foldersubscribing'] = 'Pretplata na fasciklu...';
-$messages['folderunsubscribing'] = 'Poništavanje pretplate na fasciklu...';
-$messages['formincomplete'] = 'Obrazac nije u cjelosti popunjen';
-$messages['noemailwarning'] = 'Unesite valjanu email adresu';
-$messages['nonamewarning'] = 'Unesite ime';
-$messages['nopagesizewarning'] = 'Unesite veličinu stranice';
-$messages['nosenderwarning'] = 'Unesite email adresu pošiljaoca';
-$messages['norecipientwarning'] = 'Unesite primatelja (ZA)';
+$messages['messagesaved'] = 'Poruka je uspješno sačuvana u skicama.';
+$messages['successfullysaved'] = 'Uspješno sačuvano.';
+$messages['addedsuccessfully'] = 'Kontakt uspješno dodan u adresar.';
+$messages['contactexists'] = 'Kontakt sa ovom email adresom već postoji u adresaru.';
+$messages['contactnameexists'] = 'Kontakt s tim imenom već postoji.';
+$messages['blockedimages'] = 'Zbog zaštite privatnosti, slike sa drugih servera su blokirane u ovoj poruci.';
+$messages['encryptedmessage'] = 'Ova poruka je šifrirana i nije je moguće prikazati. Žao nam je!';
+$messages['nocontactsfound'] = 'Adresar je prazan.';
+$messages['contactnotfound'] = 'Traženi kontakt nije pronađen.';
+$messages['contactsearchonly'] = 'Unesite neki pojam za pretragu';
+$messages['sendingfailed'] = 'Greška pri slanju poruke.';
+$messages['senttooquickly'] = 'Molimo sačekajte $sec sekundi prije slanja ove poruke.';
+$messages['errorsavingsent'] = 'Desila se greška pri snimanju poslane poruke.';
+$messages['errorsaving'] = 'Desila se greška pri snimanju.';
+$messages['errormoving'] = 'Nije moguće premjestiti poruke.';
+$messages['errorcopying'] = 'Nije moguće kopirati poruke.';
+$messages['errordeleting'] = 'Nije moguće obrisati poruke.';
+$messages['errormarking'] = 'Nije moguće označiti poruke.';
+$messages['deletecontactconfirm'] = 'Da li zaista želite obrisati označene kontakte?';
+$messages['deletegroupconfirm'] = 'Da li zaista želite obrisati označenu grupu?';
+$messages['deletemessagesconfirm'] = 'Da li zaista želite obrisati označene poruke?';
+$messages['deletefolderconfirm'] = 'Da li zaista želite obrisati ovaj folder?';
+$messages['purgefolderconfirm'] = 'Da li zaista želite obrisati sve poruke u ovom folderu?';
+$messages['contactdeleting'] = 'Brišem kontakte...';
+$messages['groupdeleting'] = 'Brišem grupu...';
+$messages['folderdeleting'] = 'Brišem folder...';
+$messages['foldermoving'] = 'Premještam folder...';
+$messages['foldersubscribing'] = 'Pretplaćujem se na folder...';
+$messages['folderunsubscribing'] = 'Uklanjam pretplatu za folder...';
+$messages['formincomplete'] = 'Obrazac nije popunjen u cjelosti.';
+$messages['noemailwarning'] = 'Molimo vas da upišete ispravnu email adresu.';
+$messages['nonamewarning'] = 'Molimo vas da upišete ime.';
+$messages['nopagesizewarning'] = 'Molimo vas da upišete veličinu stranice.';
+$messages['nosenderwarning'] = 'Molimo vas da upišete email adresu pošiljaoca';
+$messages['norecipientwarning'] = 'Molimo vas da upišete barem jednog primaoca.';
 $messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
-$messages['notsentwarning'] = 'Poruka nije poslata. Želite li odbaciti ovu poruku?';
-$messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
-$messages['nosearchname'] = 'Unesite ime ili email adresu';
-$messages['notuploadedwarning'] = 'Svi prilozi još nisu presnimljeni na poslužitelj. Molim pričekajte ili zaustavite presnimavanje.';
+$messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
+$messages['noldapserver'] = 'Molimo vas da odaberete LDAP server za pretragu.';
+$messages['nosearchname'] = 'Molimo vas da upišete ime kontakta ili email adresu.';
+$messages['notuploadedwarning'] = 'Neki od priloga još nisu dodani na server. Molimo vas da sačekate ili da otkažete dodavanje.';
 $messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
-$messages['searchnomatch'] = 'Traženi termin nije pronađen ni u jednoj poruci';
-$messages['searching'] = 'Pretraga u toku...';
-$messages['checking'] = 'Provjera u toku...';
-$messages['nospellerrors'] = 'Nije pronađena niti jedna pravopisna greška';
-$messages['folderdeleted'] = 'Fascikla uspješno obrisana';
-$messages['foldersubscribed'] = 'Fascikla uspješno pretplaćena';
-$messages['folderunsubscribed'] = 'Pretplata na fasciklu uspješno poništena';
-$messages['folderpurged'] = 'Fascikla uspješno ispražnjena';
-$messages['folderexpunged'] = 'Fascikla uspješno zbijena';
-$messages['deletedsuccessfully'] = 'Uspješno obrisano';
-$messages['converting'] = 'Formatiranje poruke';
-$messages['messageopenerror'] = 'Nije moguće';
-$messages['fileuploaderror'] = 'Prijenos datoteke nije uspio';
-$messages['filesizeerror'] = 'Datoteka je prevelika. Maksimalna veličina je $size';
-$messages['copysuccess'] = 'Uspješno kopirano $n adresa';
-$messages['copyerror'] = 'Nije uspjelo kopiranje adresa';
-$messages['sourceisreadonly'] = 'Ovaj resurs adresa je samo za čitanje';
-$messages['errorsavingcontact'] = 'Nije uspjelo spremanje adrese kontakta';
-$messages['movingmessage'] = 'Premještanje poruke...';
-$messages['copyingmessage'] = 'Kopiranje poruke...';
-$messages['deletingmessage'] = 'Brisanje poruke...';
-$messages['markingmessage'] = 'Označavanje poruke...';
-$messages['receiptsent'] = 'Uspješno poslata potvrda (pročitano)';
-$messages['errorsendingreceipt'] = 'Ne može poslati potvrdu';
-$messages['nodeletelastidentity'] = 'Ne možete izbrisati zadnji pseudonim.';
-$messages['forbiddencharacter'] = 'Naziv mape sadrži zabranjene znakove';
-$messages['selectimportfile'] = 'Odaberite datoteku za prijenos';
-$messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivati...';
-$messages['contactaddedtogroup'] = 'Kontakti uspješno dodani ovoj grupi';
-$messages['contactremovedfromgroup'] = 'Kontakti uspješno izbrisani iz ove grupe';
-$messages['importwait'] = 'Uvozim, molimo sačekajte...';
+$messages['contactsearchsuccessful'] = '$nr kontakata je pronađeno.';
+$messages['searchnomatch'] = 'Traženi pojam nije pronađen ni u jednoj poruci.';
+$messages['searching'] = 'Pretražujem...';
+$messages['checking'] = 'Provjeravam...';
+$messages['nospellerrors'] = 'Pravopisne greške nisu pronađene.';
+$messages['folderdeleted'] = 'Folder je uspješno obrisan.';
+$messages['foldersubscribed'] = 'Uspješno ste pretplaćeni na folder.';
+$messages['folderunsubscribed'] = 'Pretplata na folder je uspješno ukinuta.';
+$messages['folderpurged'] = 'Folder je uspješno ispražnjen.';
+$messages['folderexpunged'] = 'Folder je uspješno optimiziran.';
+$messages['deletedsuccessfully'] = 'Brisanje uspješno.';
+$messages['converting'] = 'Uklanjam formatiranje...';
+$messages['messageopenerror'] = 'Nije moguće učitati poruku sa servera.';
+$messages['fileuploaderror'] = 'Dodavanje datoteke nije uspjelo.';
+$messages['filesizeerror'] = 'Datoteka je prevelika. Maksimalna veličina je $size.';
+$messages['copysuccess'] = 'Uspješno kopirano $n adresa.';
+$messages['copyerror'] = 'Nije moguće kopirati adrese.';
+$messages['sourceisreadonly'] = 'Ovaj izvor adresa je samo za čitanje.';
+$messages['errorsavingcontact'] = 'Nije moguće sačuvati kontakt adresu.';
+$messages['movingmessage'] = 'Premještam poruke...';
+$messages['copyingmessage'] = 'Kopiram poruke...';
+$messages['copyingcontact'] = 'Kopiram kontakte...';
+$messages['deletingmessage'] = 'Brišem poruke...';
+$messages['markingmessage'] = 'Označavam poruke...';
+$messages['addingmember'] = 'Dodajem kontakte u grupu...';
+$messages['removingmember'] = 'Uklanjam kontakte iz grupe...';
+$messages['receiptsent'] = 'Potvrda o primitku je uspješno poslana.';
+$messages['errorsendingreceipt'] = 'Nije moguće poslati potvrdu.';
+$messages['deleteidentityconfirm'] = 'Da li zaista želite obrisati ovaj identitet?';
+$messages['nodeletelastidentity'] = 'Ne možete obrisati jedini identitet.';
+$messages['forbiddencharacter'] = 'Naziv foldera sadrži nedozvoljeni znak.';
+$messages['selectimportfile'] = 'Molimo vas da odaberete datoteku za dodavanje.';
+$messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivati.';
+$messages['contactaddedtogroup'] = 'Kontakti su uspješno dodani u ovu grupu.';
+$messages['contactremovedfromgroup'] = 'Kontakti su uspješno uklonjeni iz ove grupe.';
+$messages['importwait'] = 'Uvoz u toku, molimo sačekajte...';
 $messages['importerror'] = 'Greška pri uvozu! Datoteka ne sadrži pravilan vCard format.';
-$messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakt(a), preskočeno $skipped već postojećih</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakata</b>';
 $messages['importconfirmskipped'] = '<b>Preskočeno $skipped postojećih unosa</b>';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
-$messages['nofromaddress'] = 'Nije upisana email adresa u odabrani pseudonim';
-$messages['editorwarning'] = 'Prebacivanje u čisti tekstualni uređivač će prouzrokovati gubljenje formata teksta. Želite li nastaviti?';
-$messages['httpreceivedencrypterror'] = 'Dogodila se fatalna greška u konfiguraciji. Odmah kontaktirajte administratora. <b>Vaša poruka ne može biti poslata.</b>';
-$messages['smtpconnerror'] = 'SMTP Greška ($code): Veza na server nije uspjela';
-$messages['smtpautherror'] = 'SMTP Greška ($code): Autentikacija nije uspjela';
-$messages['smtpfromerror'] = 'SMTP Greška ($code): Nije uspjelo postavljanje pošiljaoca "$from" ($msg)';
-$messages['smtptoerror'] = 'SMTP Greška ($code): Nije uspjelo dodavanje primaoca "$to" ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Greška: Nije moguće pročitati listu primaoca';
-$messages['smtperror'] = 'SMTP Greška: $msg';
-$messages['emailformaterror'] = 'Nepravilna email adresa: $email';
+$messages['nofromaddress'] = 'U odabrani identitet nije upisana email adresa.';
+$messages['editorwarning'] = 'Prebacivanje u obični tekstualni uređivač će prouzrokovati gubljenje formatiranja teksta. Želite li nastaviti?';
+$messages['httpreceivedencrypterror'] = 'Dogodila se fatalna konfiguracijska greška. Odmah kontaktirajte administratora. <b>Vaša poruka se ne poslati.</b>';
+$messages['smtpconnerror'] = 'SMTP greška ($code): Veza sa serverom nije uspostavljena.';
+$messages['smtpautherror'] = 'SMTP greška ($code): Autentifikacija nije uspjela.';
+$messages['smtpfromerror'] = 'SMTP greška ($code): Nije uspjelo postavljanje pošiljaoca "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP greška ($code): Nije uspjelo dodavanje primaoca "$to" ($msg)';
+$messages['smtprecipientserror'] = 'SMTP greška: Nije moguće pročitati listu primaoca.';
+$messages['smtperror'] = 'SMTP greška: $msg';
+$messages['emailformaterror'] = 'Netačna email adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primaoca. Smanjite broj primaoca na $max.';
-$messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi preko maximuma od $max';
-$messages['internalerror'] = 'Dogodila se interna greška. Molimo Vas pokušajte ponovo.';
+$messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi maksimum od $max.';
+$messages['internalerror'] = 'Dogodila se interna greška. Molimo vas da pokušate ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
-$messages['contactdeleted'] = 'Kontakti uspješno obrisani.';
-$messages['groupdeleted'] = 'Grupa uspješno obrisana.';
-$messages['grouprenamed'] = 'Grupa uspješno preimenovana.';
-$messages['groupcreated'] = 'Grupa uspješno kreirana.';
-$messages['messagedeleted'] = 'Poruke uspješno obrisane.';
-$messages['messagemoved'] = 'Poruke uspješno pomjerene.';
+$messages['contactdeleted'] = 'Kontakti su uspješno obrisani.';
+$messages['contactrestoreerror'] = 'Nije moguće vratiti obrisane kontakte.';
+$messages['contactrestored'] = 'Kontakti su uspješno vraćeni.';
+$messages['groupdeleted'] = 'Grupa je uspješno obrisana.';
+$messages['grouprenamed'] = 'Grupa je uspješno preimenovana.';
+$messages['groupcreated'] = 'Grupa je uspješno kreirana.';
+$messages['savedsearchdeleted'] = 'Sačuvana pretraga je uspješno obrisana.';
+$messages['savedsearchdeleteerror'] = 'Nije moguće obrisati sačuvanu pretragu.';
+$messages['savedsearchcreated'] = 'Uspješno ste sačuvali rezultate pretrage.';
+$messages['savedsearchcreateerror'] = 'Nije moguće sačuvati pretragu.';
+$messages['messagedeleted'] = 'Poruke su uspješno obrisane.';
+$messages['messagemoved'] = 'Poruke su uspješno premještene.';
 $messages['messagecopied'] = 'Poruke uspješno kopirane.';
 $messages['messagemarked'] = 'Poruke uspješno označene.';
-$messages['autocompletechars'] = 'Unesite barem $min znakova za auto-dopunjavanje.';
+$messages['autocompletechars'] = 'Unesite barem $min znakova za automatsko popunjavanje.';
+$messages['autocompletemore'] = 'Pronađeno je još rezultata. Molimo vas da upišete još znakova.';
 $messages['namecannotbeempty'] = 'Polje za ime ne može biti prazno.';
-$messages['nametoolong'] = 'Ime predugo.';
-$messages['folderupdated'] = 'Ažuriranje mape uspješno.';
-$messages['foldercreated'] = 'Kreiranje mape uspješno.';
-$messages['invalidimageformat'] = 'Format slike nije validan.';
+$messages['nametoolong'] = 'Ime je predugo.';
+$messages['folderupdated'] = 'Folder je uspješno ažuriran.';
+$messages['foldercreated'] = 'Folder je uspješno kreiran.';
+$messages['invalidimageformat'] = 'Format slike nije ispravan.';
+$messages['mispellingsfound'] = 'Pronađene su pravopisne greške u ovoj poruci.';
+$messages['parentnotwritable'] = 'Nije moguće kreirati/premjestiti folder u odabrani matični folder. Nemate prava pristupa.';
+$messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
 
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index dfdda3029..58dde620e 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Tomáš Kyzlink <Unknown>                                     |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
 $labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
 $labels['messagenrof'] = 'Zpráva $nr z $count';
+$labels['fromtoshort'] = '$from - $to z $count';
 $labels['copy'] = 'Kopírovat';
 $labels['move'] = 'Přesunout';
 $labels['moveto'] = 'přesunout do...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Říjen';
 $labels['longnov'] = 'Listopad';
 $labels['longdec'] = 'Prosinec';
 $labels['today'] = 'Dnes';
+$labels['refresh'] = 'Obnovit';
 $labels['checkmail'] = 'Zkontrolovat nové zprávy';
 $labels['compose'] = 'Napsat zprávu';
 $labels['writenewmessage'] = 'Vytvořit novou zprávu';
+$labels['reply'] = 'Odpovědět';
 $labels['replytomessage'] = 'Odpovědět odesílateli';
 $labels['replytoallmessage'] = 'Odpovědět všem';
 $labels['replyall'] = 'Odpovědět všem';
 $labels['replylist'] = 'Odpovědět do e-mailové konference';
+$labels['forward'] = 'Přeposlat';
 $labels['forwardinline'] = 'Přeposlat v textu';
 $labels['forwardattachment'] = 'Přeposlat jako přílohu';
 $labels['forwardmessage'] = 'Předat zprávu';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Zobrazit další zprávu';
 $labels['lastmessage'] = 'Zobrazit poslední zprávu';
 $labels['backtolist'] = 'Zpět do seznamu zpráv';
 $labels['viewsource'] = 'Zobrazit zdroj';
+$labels['mark'] = 'Označit';
 $labels['markmessages'] = 'Označ zprávy';
 $labels['markread'] = 'Jako přečtené';
 $labels['markunread'] = 'Jako nepřečtené';
 $labels['markflagged'] = 'Jako označené';
 $labels['markunflagged'] = 'Jako neoznačené';
 $labels['moreactions'] = 'Další akce...';
+$labels['more'] = 'Více';
+$labels['back'] = 'Zpět';
+$labels['options'] = 'Možnosti';
 $labels['select'] = 'Vybrat';
 $labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Stav doručení';
 $labels['mailreplyintro'] = 'Dne $date, $sender napsal:';
 $labels['originalmessage'] = 'Původní zpráva';
 $labels['editidents'] = 'Editovat identity';
+$labels['spellcheck'] = 'Pravopis';
 $labels['checkspelling'] = 'Zkontrolovat pravopis';
 $labels['resumeediting'] = 'Pokračovat v úpravách';
 $labels['revertto'] = 'Přejít na';
+$labels['attach'] = 'Přiložit';
 $labels['attachments'] = 'Přílohy';
 $labels['upload'] = 'Nahrát';
 $labels['uploadprogress'] = '$percent ($current z $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Manžel/ka';
 $labels['allfields'] = 'Všechny položky';
 $labels['search'] = 'Hledat';
 $labels['advsearch'] = 'Pokročilé vyhledávání';
+$labels['advanced'] = 'Pokročilé';
 $labels['other'] = 'Ostatní';
 $labels['typeother'] = 'Ostatní';
 $labels['typehome'] = 'Domací';
@@ -350,6 +361,7 @@ $labels['advancedoptions'] = 'Pokročilá nastavení';
 $labels['focusonnewmessage'] = 'Aktivovat okno prohlížeče při příchozí zprávě';
 $labels['checkallfolders'] = 'Kontrolovat nové zprávy ve všech složkách';
 $labels['displaynext'] = 'Zobrazit další zprávu po smazání/přesunu zprávy';
+$labels['defaultfont'] = 'Výchozí písmo zprávy HTML';
 $labels['mainoptions'] = 'Hlavní nastavení';
 $labels['section'] = 'Sekce';
 $labels['maintenance'] = 'Údržba';
@@ -373,6 +385,7 @@ $labels['reqdsn'] = 'Vždy požádat o oznámení o stavu doručení';
 $labels['replysamefolder'] = 'Ukládat odpovědi ve stejné složce jako je zodpovězená zpráva';
 $labels['defaultaddressbook'] = 'Přidávat nové kontakty do seznamu kontaktů';
 $labels['autocompletesingle'] = 'Při doplňování adres přeskočit alternativní email.';
+$labels['listnamedisplay'] = 'Vypsat kontakty jako';
 $labels['spellcheckbeforesend'] = 'Před odesláním zkontrolovat pravopis';
 $labels['spellcheckoptions'] = 'Nastavení pravopisu';
 $labels['spellcheckignoresyms'] = 'Ignorovat slova obsahující symboly';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 9623c07b2..1d031f327 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Přidávám kontakty do skupiny...';
 $messages['removingmember'] = 'Odstraňuji kontakty ze skupiny...';
 $messages['receiptsent'] = 'Potvrzení o přřijetí zprávy odesláno';
 $messages['errorsendingreceipt'] = 'Potvrzení o přijetí zprávy nebylo možné odeslat';
+$messages['deleteidentityconfirm'] = 'Opravdu chcete odstranit tuto identitu?';
 $messages['nodeletelastidentity'] = 'Alespoň jedna identita musí být ponechána. Identitu nelze odstranit.';
 $messages['forbiddencharacter'] = 'Název složky obsahuje zakázaný znak';
 $messages['selectimportfile'] = 'Prosím vyberte soubor k nahrání';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index e2f8720ea..62c2d5ae0 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Ffolderi';
 $labels['messagesfromto'] = 'Negeseuon $from i $to o $count';
 $labels['threadsfromto'] = 'Edefau $from i $to o $count';
 $labels['messagenrof'] = 'Neges $nr o $count';
+$labels['fromtoshort'] = '$from - $to o $count';
 $labels['copy'] = 'Copio';
 $labels['move'] = 'Symud';
 $labels['moveto'] = 'Symud i...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Hydref';
 $labels['longnov'] = 'Tachwedd';
 $labels['longdec'] = 'Rhagfyr';
 $labels['today'] = 'Heddiw';
+$labels['refresh'] = 'Adnewyddu';
 $labels['checkmail'] = 'Edrych am negeseuon newydd';
 $labels['compose'] = 'Ysgrifennu neges';
 $labels['writenewmessage'] = 'Creu neges newydd';
+$labels['reply'] = 'Ymateb';
 $labels['replytomessage'] = 'Ymateb i\'r anfonwr';
 $labels['replytoallmessage'] = 'Ymateb i\'r anfonwr a phob derbyniwr';
 $labels['replyall'] = 'Ymateb i bawb';
 $labels['replylist'] = 'Ymateb i\'r rhestr';
+$labels['forward'] = 'Anfon ymlaen';
 $labels['forwardinline'] = 'Anfon ymlaen o fewn y neges';
 $labels['forwardattachment'] = 'Anfon ymlaen fel atodiad';
 $labels['forwardmessage'] = 'Danfon y neges ymlaen';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Dangos y neges nesaf';
 $labels['lastmessage'] = 'Dangos y neges olaf';
 $labels['backtolist'] = 'Nôl i\'r rhestr o negeseuon';
 $labels['viewsource'] = 'Edrych ar y ffynhonnell';
+$labels['mark'] = 'Nodi';
 $labels['markmessages'] = 'Nodi\'r negeseuon';
 $labels['markread'] = 'Wedi eu darllen';
 $labels['markunread'] = 'Heb eu darllen';
 $labels['markflagged'] = 'Wedi eu fflagio';
 $labels['markunflagged'] = 'Heb eu fflagio';
 $labels['moreactions'] = 'Mwy o weithredoedd...';
+$labels['more'] = 'Mwy';
+$labels['back'] = 'Yn ôl';
+$labels['options'] = 'Dewisiadau';
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
 $labels['none'] = 'Dim';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Hysbysiad statws danfon';
 $labels['mailreplyintro'] = 'Ar $date, ysgrifennodd $sender:';
 $labels['originalmessage'] = 'Neges Wreiddiol';
 $labels['editidents'] = 'Golygu personoliaethau';
+$labels['spellcheck'] = 'Sillafu';
 $labels['checkspelling'] = 'Gwirio sillafu';
 $labels['resumeediting'] = 'Ail-ddechrau golygu';
 $labels['revertto'] = 'Dychwelyd i';
+$labels['attach'] = 'Atodi';
 $labels['attachments'] = 'Atodiadau';
 $labels['upload'] = 'Llwytho fyny';
 $labels['uploadprogress'] = '$percent ($current o $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Cymar';
 $labels['allfields'] = 'Pob maes';
 $labels['search'] = 'Chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
+$labels['advanced'] = 'Uwch';
 $labels['other'] = 'Arall';
 $labels['typeother'] = 'Arall';
 $labels['typehome'] = 'Cartref';
@@ -374,6 +385,7 @@ $labels['reqdsn'] = 'Gofyn am hysbysiad statws danfon bob amser';
 $labels['replysamefolder'] = 'Rhoi atebion yn yr un ffolder i\'r neges sy\'n cael ei ateb';
 $labels['defaultaddressbook'] = 'Ychwanegu cysylltiadau newydd i\'r llyfr cyfeiriad dewiswyd';
 $labels['autocompletesingle'] = 'Hepgor cyfeiriadau ebost amgen wrth awto-gwblhau';
+$labels['listnamedisplay'] = 'Rhestrwch cysylltiadau fel';
 $labels['spellcheckbeforesend'] = 'Gwirio sillafu cyn danfon neges';
 $labels['spellcheckoptions'] = 'Dewisiadau gwirio sillafu';
 $labels['spellcheckignoresyms'] = 'Anwybyddu geiriau gyda symbolau';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index ddb988cff..1cae384ae 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Yn ychwanegu cyswllt/cysylltiadau i\'r grŵp...';
 $messages['removingmember'] = 'Yn dileu cyswllt/cysylltiadau o\'r grŵp...';
 $messages['receiptsent'] = 'Danfonwyd cadarnhad derbyn yn llwyddiannus';
 $messages['errorsendingreceipt'] = 'Methwyd danfon cadarnhad derbyn';
+$messages['deleteidentityconfirm'] = 'Ydych chi wir am ddileu\'r personoliaeth hwn?';
 $messages['nodeletelastidentity'] = 'Allwch chi ddim dileu\'r personoliaeth yma, hwn yw\'r un olaf.';
 $messages['forbiddencharacter'] = 'Mae enw\'r ffolder yn cynnwys llythyren annerbynniol';
 $messages['selectimportfile'] = 'Dewiswch ffeil i\'w lwytho fyny';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 6c1b7360d..d043defdb 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: John Loft Christiansen <Unknown>                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Besked $from til $to af $count';
 $labels['threadsfromto'] = 'Tråd $from til $to af $count';
 $labels['messagenrof'] = 'Besked $nr af $count';
+$labels['fromtoshort'] = '$from – $to af $count';
 $labels['copy'] = 'Kopier';
 $labels['move'] = 'Flyt';
 $labels['moveto'] = 'Flyt til...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'I dag';
+$labels['refresh'] = 'Opdater';
 $labels['checkmail'] = 'Se efter nye beskeder';
 $labels['compose'] = 'Forfat en besked';
 $labels['writenewmessage'] = 'Skriv en ny besked';
+$labels['reply'] = 'Svar';
 $labels['replytomessage'] = 'Svar på denne besked';
 $labels['replytoallmessage'] = 'Svar til alle modtagere';
 $labels['replyall'] = 'Svar alle';
 $labels['replylist'] = 'Svar til listen';
+$labels['forward'] = 'Frem';
 $labels['forwardinline'] = 'Videresend';
 $labels['forwardattachment'] = 'Videresend som vedhæftning';
 $labels['forwardmessage'] = 'Videresend denne besked';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Vis næste besked';
 $labels['lastmessage'] = 'Vis sidste besked';
 $labels['backtolist'] = 'Tilbage til beskedlisten';
 $labels['viewsource'] = 'Vis rå besked';
+$labels['mark'] = 'Markér';
 $labels['markmessages'] = 'Markér beskeder';
 $labels['markread'] = 'Som læst';
 $labels['markunread'] = 'Som ulæst';
 $labels['markflagged'] = 'Som markeret';
 $labels['markunflagged'] = 'Som umarkeret';
 $labels['moreactions'] = 'Flere funktioner...';
+$labels['more'] = 'Mere';
+$labels['back'] = 'Tilbage';
+$labels['options'] = 'Indstillinger';
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Notifikation om leveringstatus';
 $labels['mailreplyintro'] = 'Den $date, $sender skrev:';
 $labels['originalmessage'] = 'Original besked';
 $labels['editidents'] = 'Ret identiteter';
+$labels['spellcheck'] = 'Stav';
 $labels['checkspelling'] = 'Stavekontrol';
 $labels['resumeediting'] = 'Genoptag redigering';
 $labels['revertto'] = 'Vend tilbage til';
+$labels['attach'] = 'Vedhæft';
 $labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current af $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Ægtefælle';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søg';
 $labels['advsearch'] = 'Avanceret søg';
+$labels['advanced'] = 'Avanceret';
 $labels['other'] = 'Andet';
 $labels['typeother'] = 'Andet';
 $labels['typehome'] = 'Hjem';
@@ -374,6 +385,7 @@ $labels['reqdsn'] = 'Bed altid om at få en status på levering';
 $labels['replysamefolder'] = 'Placer svar til en besked i samme mappe som beskeden der besvares';
 $labels['defaultaddressbook'] = 'Tilføj nye kontakter til den valgte adressebog';
 $labels['autocompletesingle'] = 'Undgå alternative emailadresser under autofuldførelse';
+$labels['listnamedisplay'] = 'List kontakter som';
 $labels['spellcheckbeforesend'] = 'Tjek stavning inden beskeden sendes';
 $labels['spellcheckoptions'] = 'Stavning muligheder';
 $labels['spellcheckignoresyms'] = 'Ignorer ord med symboler';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 96c7495e0..d6cde5e1a 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Tilføjer kontakt(er) til gruppen...';
 $messages['removingmember'] = 'Fjerner kontakt(er) fra gruppen...';
 $messages['receiptsent'] = 'Kvittering for læsning er sendt';
 $messages['errorsendingreceipt'] = 'Kvitteringen kunne ikke sendes';
+$messages['deleteidentityconfirm'] = 'Vil du slette denne identitet?';
 $messages['nodeletelastidentity'] = 'Du kan ikke slette denne identitet, da det er den eneste der er tilbage.';
 $messages['forbiddencharacter'] = 'Mappe-navnet indeholder ugyldige tegn';
 $messages['selectimportfile'] = 'Vælg venligst den fil der skal uploades';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index c2c2caddb..792fb8dad 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -41,6 +41,7 @@ $labels['size'] = 'Grösse';
 $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
+$labels['listoptions'] = 'Listenoptionen...';
 $labels['mailboxlist'] = 'Ordner';
 $labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
@@ -364,6 +365,7 @@ $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
 $labels['defaultfont'] = 'Standardschrift in HTML-Nachrichten';
 $labels['mainoptions'] = 'Allgemein';
+$labels['browseroptions'] = 'Browsereinstellungen';
 $labels['section'] = 'Bereich';
 $labels['maintenance'] = 'Wartung';
 $labels['newmessage'] = 'Neue Nachrichten';
@@ -393,6 +395,7 @@ $labels['spellcheckignoresyms'] = 'Wörter mit Symbolen überspringen';
 $labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
 $labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Grossbuchstaben bestehen';
 $labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
+$labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
 $labels['folder'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 4898294e5..fd99142f6 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -15,7 +15,7 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Fehlermeldung';
+$messages['errortitle'] = 'Fehlermeldung';
 $messages['loginfailed'] = 'Login fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
 $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
@@ -77,6 +77,7 @@ $messages['nobodywarning'] = 'Wollen Sie 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['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein.';
+$messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
 $messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
 $messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
 $messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
@@ -136,8 +137,8 @@ $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
 $messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['grouprenamed'] = 'Gruppe erfolgreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erfolgreich erstellt.';
 $messages['savedsearchdeleted'] = 'Suche erfolgreich gelöscht.';
 $messages['savedsearchdeleteerror'] = 'Suche konnte nicht gelöscht werden.';
 $messages['savedsearchcreated'] = 'Suche erfolgreich gespeichert.';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 196d87ce6..bb90aedf2 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -41,6 +41,7 @@ $labels['size'] = 'Größe';
 $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
+$labels['listoptions'] = 'Listenoptionen...';
 $labels['mailboxlist'] = 'Ordner';
 $labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
@@ -364,6 +365,7 @@ $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
 $labels['defaultfont'] = 'Standard Schrift von HTML Nachrichten';
 $labels['mainoptions'] = 'Allgemein';
+$labels['browseroptions'] = 'Browsereinstellungen';
 $labels['section'] = 'Bereich';
 $labels['maintenance'] = 'Wartung';
 $labels['newmessage'] = 'Neue Nachricht';
@@ -393,6 +395,7 @@ $labels['spellcheckignoresyms'] = 'Wörter mit Symbolen überspringen';
 $labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
 $labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Großbuchstaben bestehen';
 $labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
+$labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
 $labels['folder'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index d2b4e46c1..061d8920a 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Daniel Winzen <d@winzen4.de>                                  |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
-$messages['errortitle']  = 'Fehlermeldung';
+$messages['errortitle'] = 'Fehlermeldung';
 $messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
 $messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
@@ -137,8 +137,8 @@ $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
 $messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['grouprenamed'] = 'Gruppe erfolgreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erfolgreich erstellt.';
 $messages['savedsearchdeleted'] = 'Suchergebnisse erfolgreich gelöscht.';
 $messages['savedsearchdeleteerror'] = 'Suchergebnisse konnten nicht gelöscht werden.';
 $messages['savedsearchcreated'] = 'Suchergebnisse wurden erfolgreich wiederherstellt.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index ca4872967..16b3e9af9 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Prokopis Stamoulis <prokopino@gmail.com>                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -19,41 +19,46 @@ $labels['welcome'] = 'Καλώς ήρθατε στο $product';
 $labels['username'] = 'Όνομα Χρήστη';
 $labels['password'] = 'Κωδικός Πρόσβασης';
 $labels['server'] = 'Διακομιστής';
-$labels['login'] = 'Είσοδος';
-$labels['logout'] = 'Έξοδος';
+$labels['login'] = 'Σύνδεση';
+$labels['logout'] = 'Αποσύνδεση';
 $labels['mail'] = 'E-Mail';
 $labels['settings'] = 'Ρυθμίσεις';
 $labels['addressbook'] = 'Επαφές';
 $labels['inbox'] = 'Εισερχόμενα';
 $labels['drafts'] = 'Πρόχειρα';
 $labels['sent'] = 'Απεσταλμένα';
-$labels['trash'] = 'Κάδος';
-$labels['junk'] = 'Junk';
+$labels['trash'] = 'Κάδος Απορριμάτων';
+$labels['junk'] = 'Ανεπιθύμητα';
 $labels['subject'] = 'Θέμα';
 $labels['from'] = 'Αποστολέας';
 $labels['to'] = 'Παραλήπτης';
-$labels['cc'] = 'Αντίγραφο';
-$labels['bcc'] = 'Bcc';
-$labels['replyto'] = 'Απάντηση σε';
-$labels['date'] = 'Ημ/νία';
+$labels['cc'] = 'Κοινοποίηση';
+$labels['bcc'] = 'Κρυφή κοινοποίηση';
+$labels['replyto'] = 'Απάντηση στο';
+$labels['followupto'] = 'Σε συνέχεια';
+$labels['date'] = 'Ημερομηνία';
 $labels['size'] = 'Μέγεθος';
 $labels['priority'] = 'Πρoτεραιότητα';
 $labels['organization'] = 'Οργανισμός';
+$labels['readstatus'] = 'Κατάσταση ανάγνωσης';
 $labels['mailboxlist'] = 'Φάκελοι';
 $labels['folders'] = 'Φάκελοι';
 $labels['messagesfromto'] = 'Μηνύματα $from από $to έως $count';
+$labels['threadsfromto'] = 'Θέματα $from έως $to από $count';
 $labels['messagenrof'] = 'Μήνυμα $nr από $count';
+$labels['fromtoshort'] = '$from – $to από $count';
 $labels['copy'] = 'Αντίγραφο';
-$labels['moveto'] = 'μετακίνηση σε...';
-$labels['download'] = 'λήψη';
+$labels['move'] = 'Μετακίνηση';
+$labels['moveto'] = 'Μετακίνηση σε...';
+$labels['download'] = 'Λήψη';
 $labels['filename'] = 'Όνομα αρχείου';
 $labels['filesize'] = 'Μέγεθος αρχείου';
-$labels['addtoaddressbook'] = 'Προσθήκη στις Επαφές';
+$labels['addtoaddressbook'] = 'Προσθήκη στο βιβλίο διευθύνσεων';
 $labels['sun'] = 'Κυρ';
 $labels['mon'] = 'Δευτ';
 $labels['tue'] = 'Τρι';
 $labels['wed'] = 'Τετ';
-$labels['thu'] = 'Πεμ';
+$labels['thu'] = 'Πεμπ';
 $labels['fri'] = 'Παρ';
 $labels['sat'] = 'Σαβ';
 $labels['sunday'] = 'Κυριακή';
@@ -67,10 +72,10 @@ $labels['jan'] = 'Ιαν';
 $labels['feb'] = 'Φεβ';
 $labels['mar'] = 'Μαρ';
 $labels['apr'] = 'Απρ';
-$labels['may'] = 'Μάιος';
-$labels['longmay'] = 'Μάιος';
-$labels['jun'] = 'Ιον';
-$labels['jul'] = 'Ιολ';
+$labels['may'] = 'Μαι';
+$labels['longmay'] = 'Μαι';
+$labels['jun'] = 'Ιουν';
+$labels['jul'] = 'Ιουλ';
 $labels['aug'] = 'Αυγ';
 $labels['sep'] = 'Σεπ';
 $labels['oct'] = 'Οκτ';
@@ -88,35 +93,70 @@ $labels['longoct'] = 'Οκτώβριος';
 $labels['longnov'] = 'Νοέμβριος';
 $labels['longdec'] = 'Δεκέμβριος';
 $labels['today'] = 'Σήμερα';
+$labels['refresh'] = 'Ανανέωση';
 $labels['checkmail'] = 'Έλεγχος για νέα μηνύματα';
-$labels['compose'] = 'Συγγραφή μηνύματος';
+$labels['compose'] = 'Δημιουργία μηνύματος';
 $labels['writenewmessage'] = 'Δημιουργία νέου μηνύματος';
-$labels['replytomessage'] = 'Απάντηση';
-$labels['replytoallmessage'] = 'Απάντηση στον αποστολέα και όλους τους παραλήπτες';
+$labels['reply'] = 'Απάντηση';
+$labels['replytomessage'] = 'Απάντηση στον αποστολέα';
+$labels['replytoallmessage'] = 'Απάντηση στη λίστα ή στον αποστολέα και όλους τους παραλήπτες';
+$labels['replyall'] = 'Απάντηση όλων';
+$labels['replylist'] = 'Λίστα παραληπτών απάντησης';
+$labels['forward'] = 'Προώθηση';
+$labels['forwardinline'] = 'Forward inline';
+$labels['forwardattachment'] = 'Προώθηση σαν συνημμένο';
 $labels['forwardmessage'] = 'Προώθηση μηνύματος';
 $labels['deletemessage'] = 'Διαγραφή μηνύματος';
-$labels['movemessagetotrash'] = 'Μετακίνηση μηνύματος στον Κάδο';
-$labels['printmessage'] = 'Εκτύπωση';
-$labels['previousmessage'] = 'Εμφάνιση προηγούμενου μηνύματος';
-$labels['firstmessage'] = 'Εμφάνιση πρώτου μηνύματος';
-$labels['nextmessage'] = 'Εμφάνιση επόμενου μηνύματος';
-$labels['lastmessage'] = 'Εμφάνιση τελευταίου μηνύματος';
+$labels['movemessagetotrash'] = 'Διαγραφή του μηνύματος';
+$labels['printmessage'] = 'Εκτύπωση του μηνύματος';
+$labels['previousmessage'] = 'Εμφάνιση του προηγούμενου μηνύματος';
+$labels['firstmessage'] = 'Εμφάνιση του πρώτου μηνύματος';
+$labels['nextmessage'] = 'Εμφάνιση του επόμενου μηνύματος';
+$labels['lastmessage'] = 'Εμφάνιση του τελευταίου μηνύματος';
 $labels['backtolist'] = 'Επιστροφή στη λίστα μηνυμάτων';
 $labels['viewsource'] = 'Προβολή πηγαίου κώδικα';
-$labels['markmessages'] = 'Σήμανση μηνυμάτων';
+$labels['mark'] = 'Μαρκάρισμα';
+$labels['markmessages'] = 'Μαρκάρισμα μηνυμάτων';
 $labels['markread'] = 'ως αναγνωσμένα';
 $labels['markunread'] = 'ως μη-αναγνωσμένα';
-$labels['markflagged'] = 'Με σήμανση';
-$labels['markunflagged'] = 'Χωρίς σήμανση';
-$labels['select'] = 'Επιλογή';
+$labels['markflagged'] = 'ως με σήμανση';
+$labels['markunflagged'] = 'ως Χωρίς σήμανση';
+$labels['moreactions'] = 'Περισσότερες ενέργειες...';
+$labels['more'] = 'Περισσότερα';
+$labels['back'] = 'Επιστροφή';
+$labels['options'] = 'Επιλογές';
+$labels['select'] = 'Επιλέξτε';
 $labels['all'] = 'Όλα';
 $labels['none'] = 'Κανένα';
 $labels['nonesort'] = 'Κανένα';
-$labels['unread'] = 'Μη αναγνωσμένα';
+$labels['currpage'] = 'Τρέχουσα σελίδα';
+$labels['unread'] = 'Μη αναγνωσμένο';
+$labels['flagged'] = 'Σημειωμένο';
 $labels['unanswered'] = 'Αναπάντητο';
 $labels['deleted'] = 'Διεγραμμένο';
 $labels['invert'] = 'Αναστροφή';
 $labels['filter'] = 'Φίλτρο';
+$labels['list'] = 'Λίστα';
+$labels['threads'] = 'Θέματα';
+$labels['expand-all'] = 'Ανάπτυξη όλων';
+$labels['expand-unread'] = 'Ανάπτυξη των μη αναγνωσμένων';
+$labels['collapse-all'] = 'Σύμπτυξη όλων';
+$labels['threaded'] = 'Θεματοποιημένα';
+$labels['autoexpand_threads'] = 'Ανάπτυξη θεματοποιημένων μηνυμάτων';
+$labels['do_expand'] = 'όλα τα θέματα';
+$labels['expand_only_unread'] = 'μόνο με τα μη αναγνωσμένα μηνύματα';
+$labels['fromto'] = 'Από/Προς';
+$labels['flag'] = 'Επισήμανση';
+$labels['attachment'] = 'Συνημμένο αρχείο';
+$labels['sentdate'] = 'Ημερ. Αποστολής';
+$labels['arrival'] = 'Ημερ. Λήψης';
+$labels['asc'] = 'αύξουσα';
+$labels['desc'] = 'φθίνουσα';
+$labels['listcolumns'] = 'Στήλες';
+$labels['listsorting'] = 'Ταξινόμηση στηλών';
+$labels['listorder'] = 'Σειρά ταξινόμησης';
+$labels['listmode'] = 'Προβολή σε λίστα';
+$labels['folderactions'] = 'Ενέργειες στους φακέλους';
 $labels['compact'] = 'Συμπίεση';
 $labels['empty'] = 'Άδειασμα';
 $labels['quota'] = 'Χρήση δίσκου';
@@ -124,114 +164,281 @@ $labels['unknown'] = 'άγνωστο';
 $labels['unlimited'] = 'απεριόριστο';
 $labels['quicksearch'] = 'Γρήγορη Αναζήτηση';
 $labels['resetsearch'] = 'Επαναφορά Αναζήτησης';
+$labels['searchmod'] = 'Search modifiers';
 $labels['msgtext'] = 'Σε όλο το μήνυμα';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
-$labels['savemessage'] = 'Αποθήκευση ως πρόχειρου';
-$labels['sendmessage'] = 'Αποστολή μηνύματος τώρα';
+$labels['emlsave'] = 'Λήψη αρχείου (.eml)';
+$labels['editasnew'] = 'Επεξεργασία σαν νέο';
+$labels['savemessage'] = 'Αποθήκευση ως πρόχειρο';
+$labels['sendmessage'] = 'Αποστολή μηνύματος';
 $labels['addattachment'] = 'Επισύναψη αρχείου';
-$labels['charset'] = 'Charset';
+$labels['charset'] = 'Κωδικοποίηση χαρακτήρων';
 $labels['editortype'] = 'Είδος επεξεργαστή κειμένου';
 $labels['returnreceipt'] = 'Αναφορά Παράδοσης';
+$labels['dsn'] = 'Κατάσταση αναφοράς παράδοσης';
+$labels['mailreplyintro'] = 'Στις $date, $sender έγραψε:';
+$labels['originalmessage'] = 'Αρχικό μήνυμα';
+$labels['editidents'] = 'Επεξεργασία ταυτοτήτων';
+$labels['spellcheck'] = 'Συλλαβισμός';
 $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
-$labels['resumeediting'] = 'Συνέχιση επεξεργασίας';
-$labels['revertto'] = 'Επαναφορά σε';
+$labels['resumeediting'] = 'Συνέχεια επεξεργασίας';
+$labels['revertto'] = 'Επαναφορά στο';
+$labels['attach'] = 'Επισύναψη';
 $labels['attachments'] = 'Συνημμένα';
-$labels['upload'] = 'Ανέβασμα';
+$labels['upload'] = 'Αποστολή';
+$labels['uploadprogress'] = '$percent ($current από $total)';
 $labels['close'] = 'Κλείσιμο';
+$labels['messageoptions'] = 'Επιλογές μηνύματος';
 $labels['low'] = 'Χαμηλή';
 $labels['lowest'] = 'Χαμηλότερη';
 $labels['normal'] = 'Κανονική';
 $labels['high'] = 'Υψηλή';
-$labels['highest'] = 'Υψηλότερη';
-$labels['nosubject'] = '(κανένα θέμα)';
-$labels['showimages'] = 'Εμφάνιση εικόνων';
+$labels['highest'] = 'Μέγιστη δυνατή';
+$labels['nosubject'] = '(χωρίς θέμα)';
+$labels['showimages'] = 'Προβολή εικόνων';
+$labels['alwaysshow'] = 'Να προβάλλονται πάντα οι εικόνες που αποστέλλονται από τον $sender';
+$labels['isdraft'] = 'Αυτό το μήνυμα έχει σημανθεί σαν πρόχειρο';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Απλό κείμενο';
 $labels['savesentmessagein'] = 'Αποθήκευση απεσταλμένου στο φάκελο';
-$labels['dontsave'] = 'Χωρίς αποθήκευση';
-$labels['addcc'] = 'Προσθήκη Cc';
-$labels['addbcc'] = 'Προσθήκη Bcc';
-$labels['addreplyto'] = 'Προσθήκη Απάντηση-Σε';
-$labels['mdnrequest'] = 'Ο αποστολέας του μηνύματος έχει ζητήσει να ενημερωθεί όταν διαβάσετε αυτό το μήνυμα. Επιθυμείτε να ενημερώστε τον αποστολέα;';
-$labels['receiptread'] = 'Αναφορά (ανάγνωσης)';
-$labels['yourmessage'] = 'Αυτό είναι μια Αναφορά για το μήνυμά σας';
-$labels['receiptnote'] = 'Σημείωση: Αυτή η αναφορά επιβεβαιώνει μόνο ότι το μήνυμα εμφανίστηκε μόνο στον υπολογιστή του παραλήπτη. Δεν επιβεβαιώνει ότι ο παραλήπτης έχει διαβάσει ή έχει κατανοήσει το περιεχόμενο του μηνύματος.';
+$labels['dontsave'] = 'να μην αποθηκευθεί';
+$labels['maxuploadsize'] = 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείου είναι $size';
+$labels['addcc'] = 'Προσθήκη Παραλήπτη Κοινοποίησης';
+$labels['addbcc'] = 'Προσθήκη Παραλήπτη Κρυφής Κοινοποίησης';
+$labels['addreplyto'] = 'Προσθήκη Απάντησης-Στο';
+$labels['addfollowupto'] = 'Προσθήκη Σε συνέχεια του';
+$labels['mdnrequest'] = 'Ο αποστολέας αυτού του μηνύματος, έχει ζητήσει να ειδοποιηθεί όταν θα το διαβάσετε. Θέλετε να επιτρέψετε την ενημέρωσή του;';
+$labels['receiptread'] = 'Αναφορά παράδοσης (διαβάστε την)';
+$labels['yourmessage'] = 'Αυτό είναι μια αναφορά παράδοσης για το μήνυμά σας';
+$labels['receiptnote'] = 'Σημείωση: Αυτή η αναφορά επιβεβαιώνει μόνο ότι το μήνυμά σας εμφανίστηκε στον υπολογιστή του παραλήπτη. Δεν επιβεβαιώνει ότι ο παραλήπτης έχει διαβάσει ή έχει κατανοήσει το περιεχόμενό του.';
 $labels['name'] = 'Εμφανιζόμενο όνομα';
 $labels['firstname'] = 'Όνομα';
 $labels['surname'] = 'Επώνυμο';
+$labels['middlename'] = 'Πατρώνυμο';
+$labels['nameprefix'] = 'Πρόθεμα';
+$labels['namesuffix'] = 'Κατάληξη';
+$labels['nickname'] = 'Ψευδώνυμο';
+$labels['jobtitle'] = 'Τίτλος εργασίας';
+$labels['department'] = 'Τμήμα';
+$labels['gender'] = 'Φύλο';
+$labels['maidenname'] = 'Πατρώνυμο';
 $labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'Προσθήκη επιλεγμένης επαφής στις Επαφές';
+$labels['phone'] = 'Τηλέφωνο';
+$labels['address'] = 'Διεύθυνση';
+$labels['street'] = 'Οδός';
+$labels['locality'] = 'Πόλη';
+$labels['zipcode'] = 'ΤΚ';
+$labels['region'] = 'Νομός';
+$labels['country'] = 'Χώρα';
+$labels['birthday'] = 'Ημερ/νία Γέννησης';
+$labels['anniversary'] = 'Επέτειος';
+$labels['website'] = 'Ιστοσελίδα';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Σημειώσεις';
+$labels['male'] = 'άνδρας';
+$labels['female'] = 'γυναίκα';
+$labels['manager'] = 'Υπεύθυνος';
+$labels['assistant'] = 'Υπάλληλος';
+$labels['typeassistant'] = 'Υπάλληλος';
+$labels['spouse'] = 'Σύζυγος';
+$labels['allfields'] = 'Όλα τα πεδία';
+$labels['search'] = 'Αναζήτηση';
+$labels['advsearch'] = 'Προηγμένη Αναζήτηση';
+$labels['advanced'] = 'Προχωρημένες ρυθμίσεις';
+$labels['other'] = 'Άλλα';
+$labels['typeother'] = 'Άλλα';
+$labels['typehome'] = 'Οικία';
+$labels['typework'] = 'Εργασία';
+$labels['typemobile'] = 'Κινητό';
+$labels['typemain'] = 'Κύρια';
+$labels['typehomefax'] = 'Φαξ οικίας';
+$labels['typeworkfax'] = 'Φαξ εργασίας';
+$labels['typecar'] = 'Αυτοκίνητο';
+$labels['typepager'] = 'Βομβητής';
+$labels['typevideo'] = 'Βίντεο';
+$labels['typehomepage'] = 'Αρχική Σελίδα';
+$labels['typeblog'] = 'Ιστολόγιο';
+$labels['typeprofile'] = 'Προφίλ';
+$labels['addfield'] = 'Προσθήκη πεδίου...';
+$labels['addcontact'] = 'Προσθήκη νέας επαφής';
 $labels['editcontact'] = 'Επεξεργασία επαφής';
+$labels['contacts'] = 'Επαφές';
+$labels['contactproperties'] = 'Ιδιότητες επαφών';
+$labels['personalinfo'] = 'Προσωπικές πληροφορίες';
 $labels['edit'] = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
 $labels['save'] = 'Αποθήκευση';
 $labels['delete'] = 'Διαγραφή';
-$labels['newcontact'] = 'Δημιουργία νέας επαφής';
+$labels['rename'] = 'Μετονομασία';
+$labels['addphoto'] = 'Προσθήκη';
+$labels['replacephoto'] = 'Αντικατάσταση';
+$labels['newcontact'] = 'Δημιουργία νέας κάρτας επαφής';
 $labels['deletecontact'] = 'Διαγραφή επιλεγμένων επαφών';
 $labels['composeto'] = 'Σύνθεση μηνύματος προς';
 $labels['contactsfromto'] = 'Επαφή $from από $to έως $count';
 $labels['print'] = 'Εκτύπωση';
 $labels['export'] = 'Εξαγωγή';
 $labels['exportvcards'] = 'Εξαγωγή επαφών σε vCard';
+$labels['newcontactgroup'] = 'Δημιουργία νέας Ομάδας επαφών';
+$labels['grouprename'] = 'Μετονομασία ομάδας';
+$labels['groupdelete'] = 'Διαγραφή ομάδας';
 $labels['previouspage'] = 'Εμφάνιση προηγούμενης σελίδας';
-$labels['firstpage'] = 'Εμφάνιση πρώτης σελίδας';
+$labels['firstpage'] = 'Εμφάνιση της πρώτης σελίδας';
 $labels['nextpage'] = 'Εμφάνιση επόμενης σελίδας';
-$labels['lastpage'] = 'Εμφάνιση τελευταίας σελίδας';
+$labels['lastpage'] = 'Εμφάνιση της τελευταίας σελίδας';
+$labels['group'] = 'Ομάδα';
 $labels['groups'] = 'Ομάδες';
-$labels['personaladrbook'] = 'Προσωπικές Επαφές';
+$labels['personaladrbook'] = 'Προσωπικές Διυθύνσεις';
+$labels['searchsave'] = 'Αποθήκευση αναζήτησης';
+$labels['searchdelete'] = 'Διαγραφή αποθηκευμένης αναζήτησης';
 $labels['import'] = 'Εισαγωγή';
 $labels['importcontacts'] = 'Εισαγωγή επαφών';
-$labels['importfromfile'] = 'Εισαγωγή από αρχείο';
-$labels['done'] = 'Έτοιμο';
+$labels['importfromfile'] = 'Εισαγωγή από το αρχείο:';
+$labels['importtarget'] = 'Προσθήκη νέων επαφών στο βιβλίο διευθύνσεων:';
+$labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
+$labels['importtext'] = 'Μπορείτε να αποστείλετε επαφές από ένα υπάρχων βιβλίο διευθύνσεων.<br/>Προς το παρόν, όσον αφορά την εισαγωγή επαφών, επιτρέπετε η εισαγωγή επαφών σε μορφή <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
+$labels['done'] = 'Ολοκληρώθηκε';
 $labels['settingsfor'] = 'Ρυθμίσεις για';
+$labels['about'] = 'Σχετικά';
 $labels['preferences'] = 'Προτιμήσεις';
 $labels['userpreferences'] = 'Προτιμήσεις χρήστη';
 $labels['editpreferences'] = 'Επεξεργασία προτιμήσεων χρήστη';
 $labels['identities'] = 'Ταυτότητες';
-$labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για το λογαριασμό αυτό';
+$labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για αυτόν το λογαριασμό';
 $labels['newidentity'] = 'Νέα ταυτότητα';
 $labels['newitem'] = 'Νέο αντικείμενο';
 $labels['edititem'] = 'Επεξεργασία αντικειμένου';
-$labels['preferhtml'] = 'Προτίμηση HTML';
-$labels['htmlmessage'] = 'Μήνυμα HTML';
-$labels['prettydate'] = 'Όμορφη ημ/νία';
+$labels['preferhtml'] = 'Προβολή σε HTML';
+$labels['defaultcharset'] = 'Προεπιλεγμένη κωδικοποίηση χαρακτήρων';
+$labels['htmlmessage'] = 'Μήνυμα σε μορφή HTML';
+$labels['dateformat'] = 'Μορφή ημερομηνίας';
+$labels['timeformat'] = 'Μορφή ώρας';
+$labels['prettydate'] = 'Κομψή ημερ/νία';
 $labels['setdefault'] = 'Ορισμός ως προεπιλογή';
+$labels['autodetect'] = 'Αυτόματα';
 $labels['language'] = 'Γλώσσα';
-$labels['timezone'] = 'Περιοχή ώρας';
+$labels['timezone'] = 'Ζώνη Ώρας';
 $labels['pagesize'] = 'Γραμμές ανά σελίδα';
 $labels['signature'] = 'Υπογραφή';
-$labels['dstactive'] = 'Daylight savings';
-$labels['htmleditor'] = 'Σύνθεση HTML μηνύματος';
+$labels['dstactive'] = 'Θερινή ώρα';
+$labels['htmleditor'] = 'Δημιουργία μηνύματος σε μορφή HTML';
+$labels['htmlonreply'] = 'μόνο σε απάντηση μηνύματος μορφής HTML';
 $labels['htmlsignature'] = 'Υπογραφή HTML';
-$labels['previewpane'] = 'Εμφάνιση παραθύρου προεπισκόπησης';
-$labels['skin'] = 'Θεματική παραλλαγή';
-$labels['logoutclear'] = 'Άδειασμα κάδου στην έξοδο';
-$labels['logoutcompact'] = 'Συμπίεση εισερχομένων στην έξοδο';
-$labels['serversettings'] = 'Ρυθμίσεις εξυπηρετητή';
-$labels['mdnrequests'] = 'Ειδοποιήσεις αποστολέα';
-$labels['autosend'] = 'Στείλε αυτόματα';
-$labels['skipdeleted'] = 'Μη εμφάνιση διεγραμμένων μηνυμάτων';
+$labels['previewpane'] = 'Εμφάνιση προεπισκόπησης';
+$labels['skin'] = 'Θέμα εμφάνισης';
+$labels['logoutclear'] = 'Άδειασμα του κάδου στην έξοδο';
+$labels['logoutcompact'] = 'Συμπίεση φακέλου εισερχομένων στην έξοδο';
+$labels['uisettings'] = 'Περιβάλλον χρήστη';
+$labels['serversettings'] = 'Ρυθμίσεις διακομιστή';
+$labels['mailboxview'] = 'Προβολή Μηνυμάτων';
+$labels['mdnrequests'] = 'Όταν ο αποστολέας έχει ζητήσει αναφορά παράδοσης';
+$labels['askuser'] = 'ρώτησέ με';
+$labels['autosend'] = 'στείλε αυτόματα την απόδειξη παραλαβής';
+$labels['autosendknown'] = 'στείλε αυτόματα αποδείξεις παραλαβής σε όσους έχω στις επαφές, για τους άλλους ρώτα με';
+$labels['autosendknownignore'] = 'στείλε αυτόματα αποδείξεις παραλαβής σε όσους έχω στις επαφές, για τους άλλους καμιά ενέργεια';
+$labels['ignore'] = 'αγνόησε';
+$labels['readwhendeleted'] = 'Κατά τη διαγραφή του μηνύματος, μαρκάρισέ το σαν αναγνωσμένο';
+$labels['flagfordeletion'] = 'Αντί να το διαγράψεις, απλά και μόνο σημείωσέ το';
+$labels['skipdeleted'] = 'Να μην εμφανίζονται τα διαγραμμένα μηνύματα';
+$labels['deletealways'] = 'αν η μετακίνηση στον κάδο αποτύχει, διέγραψέ τα';
+$labels['showremoteimages'] = 'Να εμφανίζονται οι εικόνες που έχουν αποσταλεί σε συνδέσμους';
 $labels['fromknownsenders'] = 'από γνωστούς αποστολείς';
 $labels['always'] = 'πάντα';
-$labels['showinlineimages'] = 'Προβολή συνημμένων φωτογραφιών, κάτω από το μήνυμα';
-$labels['autosavedraft'] = 'Αυτόματη αποθήκευση προχείρου';
+$labels['showinlineimages'] = 'Οι συνημμένες εικόνες να προβάλλονται στο τέλος του μηνήματος';
+$labels['autosavedraft'] = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
 $labels['everynminutes'] = 'κάθε $n λεπτό/α';
+$labels['keepalive'] = 'Έλεγχος για νέα μηνύματα';
 $labels['never'] = 'ποτέ';
+$labels['immediately'] = 'άμεσα';
 $labels['messagesdisplaying'] = 'Προβολή Μηνυμάτων';
-$labels['messagescomposition'] = 'Συγγραφή Μηνυμάτων';
-$labels['mimeparamfolding'] = 'Ονόματα συνημένων';
+$labels['messagescomposition'] = 'Δημιουργία Μηνυμάτων';
+$labels['mimeparamfolding'] = 'Ονόματα συνημμένων αρχείων';
+$labels['2231folding'] = 'Full RFC 2231 (μορφή Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (μορφή MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (άλλη μορφή)';
+$labels['force7bit'] = 'Να γίνεται χρήση της κωδικοποίησης MIME για τους χαρακτήρες 8-bit';
 $labels['advancedoptions'] = 'Προχωρημένες επιλογές';
+$labels['focusonnewmessage'] = 'Τα νέα μηνύματα να επιλέγονται αυτόματα';
+$labels['checkallfolders'] = 'Να γίνεται έλεγχος σε όλους τους φακέλους για νέα μηνύματα';
+$labels['displaynext'] = 'Μετά από κάθε μετακίνηση/διαγραφή μηνήματος να εμφανίζεται το επόμενο';
+$labels['defaultfont'] = 'Προεπιλεγμένη γραμματοσειρά για τα μηνύματα μορφής HTML';
 $labels['mainoptions'] = 'Βασικές επιλογές';
+$labels['section'] = 'Ενότητα';
+$labels['maintenance'] = 'Συντήρηση';
 $labels['newmessage'] = 'Νέο Μήνυμα';
+$labels['signatureoptions'] = 'Επιλογές υπογραφής';
+$labels['whenreplying'] = 'Στις απαντήσεις';
+$labels['replytopposting'] = 'το νέο μήνυμα να είναι πάνω από το αρχικό';
+$labels['replybottomposting'] = 'το νέο μήνυμα να είναι κάτω από το αρχικό';
+$labels['replyremovesignature'] = 'Όταν το μήνυμα είναι απάντηση, να αφαιρείται η υπογραφή του αρχικού μηνύματος';
+$labels['autoaddsignature'] = 'Η υπογραφή να προστίθεται αυτόματα';
+$labels['newmessageonly'] = 'μόνο στα νέα μηνύματα';
+$labels['replyandforwardonly'] = 'μόνο στις απαντήσεις και προωθήσεις';
+$labels['replysignaturepos'] = 'Όταν γίνεται απάντηση ή προώθηση, η υπογραφή να τοποθετείτε';
+$labels['belowquote'] = 'πάνω από την παράθεση';
+$labels['abovequote'] = 'κάτω από την παράθεση';
+$labels['insertsignature'] = 'Προσθήκη υπογραφής';
+$labels['previewpanemarkread'] = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
+$labels['afternseconds'] = 'μετά από $n δευτερόλεπτα';
+$labels['reqmdn'] = 'Να γίνεται πάντα αίτηση για αναφορά απάντησης';
+$labels['reqdsn'] = 'Να γίνεται πάντα αίτηση για αναφορά παράδοσης';
+$labels['replysamefolder'] = 'Τα μηνύματα που είναι απαντήσεις να τοποθετούνται σε ξεχωριστό φάκελο';
+$labels['defaultaddressbook'] = 'Οι νέες επαφές να αποθηκεύονται στο επιλεγμένο βιβλίο διευθύνσεων';
+$labels['autocompletesingle'] = 'Να μην χρησιμοποιούνται οι εναλλακτικές διευθύνσεις κατά την αυτόματη συμπλήρωση';
+$labels['spellcheckbeforesend'] = 'Να γίνεται πάντα έλεγχος ορθογραφίας πριν την αποστολή του μηνύματος';
+$labels['spellcheckoptions'] = 'Επιλογές Ορθογραφικού ελέγχου';
+$labels['spellcheckignoresyms'] = 'Οι λέξεις που περιέχουν σύμβολα να αγνοούνται';
+$labels['spellcheckignorenums'] = 'Οι λέξεις που περιέχουν αριθμούς να αγνοούνται';
+$labels['spellcheckignorecaps'] = 'Οι λέξεις γραμμένες με ΚΕΦΑΛΑΙΑ να αγνοούνται';
+$labels['addtodict'] = 'Προσθήκη στο λεξικό';
 $labels['folder'] = 'Φάκελος';
 $labels['foldername'] = 'Όνομα φακέλου';
-$labels['subscribed'] = 'Εγγραφή';
+$labels['subscribed'] = 'Εγγεγραμμένος';
 $labels['messagecount'] = 'Μηνύματα';
 $labels['create'] = 'Δημιουργία';
 $labels['createfolder'] = 'Δημιουργία νέου φακέλου';
 $labels['managefolders'] = 'Διαχείριση φακέλων';
 $labels['specialfolders'] = 'Ειδικοί Φάκελοι';
+$labels['properties'] = 'Ιδιότητες';
+$labels['folderproperties'] = 'Ιδιότητες φακέλου';
+$labels['parentfolder'] = 'Γονικός φάκελος';
+$labels['location'] = 'Τοποθεσία';
+$labels['info'] = 'Πληροφορίες';
+$labels['getfoldersize'] = 'Κάντε κλικ εδώ για να δείτε το μέγεθος του φακέλου';
+$labels['changesubscription'] = 'Κάντε κλικ εδώ για να αλλάξετε τη συνδρομή σας';
+$labels['foldertype'] = 'Τύπος φακέλου';
+$labels['personalfolder'] = 'Προσωπικός φάκελος';
+$labels['otherfolder'] = 'Φάκελοι άλλων χρηστών';
+$labels['sharedfolder'] = 'Κοινόχρηστος φάκελος';
 $labels['sortby'] = 'Ταξινόμηση κατά';
 $labels['sortasc'] = 'Αύξουσα ταξινόμηση';
 $labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
+$labels['undo'] = 'Αναίρεση';
+$labels['plugin'] = 'Πρόσθετο';
+$labels['version'] = 'Έκδοση';
+$labels['source'] = 'Προέλευση';
+$labels['license'] = 'Άδεια χρήσης';
+$labels['support'] = 'Υποστήριξη';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Αγγλικά';
+$labels['westerneuropean'] = 'Δυτικής Ευρώπης';
+$labels['easterneuropean'] = 'Ανατολικής Ευρώπης';
+$labels['southeasterneuropean'] = 'Νοτιο-Ανατολικής Ευρώπης';
+$labels['baltic'] = 'Βαλτικής';
+$labels['cyrillic'] = 'Κυριλλικά';
+$labels['arabic'] = 'Αραβικά';
+$labels['greek'] = 'Ελληνικά';
+$labels['hebrew'] = 'Εβραϊκά';
+$labels['turkish'] = 'Τουρκικά';
+$labels['nordic'] = 'Σκανδιναβικά';
+$labels['thai'] = 'Ταϊλανδέζικα';
+$labels['celtic'] = 'Κελτικά';
+$labels['vietnamese'] = 'Βιετναμέζικα';
+$labels['japanese'] = 'Ιαπωνικά';
+$labels['korean'] = 'Κορεατικά';
+$labels['chinese'] = 'Κινεζικά';
 
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index ff755f944..fbd0a1ea7 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy'] = 'Copy';
 $labels['move'] = 'Move';
 $labels['moveto'] = 'Move to...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'October';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Today';
+$labels['refresh'] = 'Refresh';
 $labels['checkmail'] = 'Check for new messages';
 $labels['compose'] = 'Compose a message';
 $labels['writenewmessage'] = 'Create a new message';
+$labels['reply'] = 'Reply';
 $labels['replytomessage'] = 'Reply to sender';
 $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
 $labels['replyall'] = 'Reply all';
 $labels['replylist'] = 'Reply list';
+$labels['forward'] = 'Forward';
 $labels['forwardinline'] = 'Forward inline';
 $labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage'] = 'Forward the message';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Show the next message';
 $labels['lastmessage'] = 'Show the last message';
 $labels['backtolist'] = 'Back to message list';
 $labels['viewsource'] = 'Show source';
+$labels['mark'] = 'Mark';
 $labels['markmessages'] = 'Mark messages';
 $labels['markread'] = 'As read';
 $labels['markunread'] = 'As unread';
 $labels['markflagged'] = 'As flagged';
 $labels['markunflagged'] = 'As unflagged';
 $labels['moreactions'] = 'More actions...';
+$labels['more'] = 'More';
+$labels['back'] = 'Back';
+$labels['options'] = 'Options';
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Delivery status notification';
 $labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Original Message';
 $labels['editidents'] = 'Edit identities';
+$labels['spellcheck'] = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
 $labels['revertto'] = 'Revert to';
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Attachments';
 $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current from $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'All fields';
 $labels['search'] = 'Search';
 $labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'Other';
 $labels['typeother'] = 'Other';
 $labels['typehome'] = 'Home';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index da01e584e..a5b1f3126 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Adding contact(s) to the group...';
 $messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Successfully sent a read receipt.';
 $messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
 $messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
 $messages['selectimportfile'] = 'Please select a file to upload.';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 1a1a7fb95..1bc653bd0 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kristjan SCHMIDT <Unknown>                                    |
+ | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -19,10 +19,10 @@ $labels['welcome'] = 'Bonvenon al $product';
 $labels['username'] = 'Uzantnomo';
 $labels['password'] = 'Pasvorto';
 $labels['server'] = 'Servilo';
-$labels['login'] = 'Ensalutu';
-$labels['logout'] = 'Elsalutu';
+$labels['login'] = 'Ensaluti';
+$labels['logout'] = 'Elsaluti';
 $labels['mail'] = 'Retpoŝto';
-$labels['settings'] = 'Preferoj';
+$labels['settings'] = 'Agordoj';
 $labels['addressbook'] = 'Adresaro';
 $labels['inbox'] = 'Ricevitujo';
 $labels['drafts'] = 'Malnetujo';
@@ -43,7 +43,8 @@ $labels['mailboxlist'] = 'Dosierujoj';
 $labels['folders'] = 'Dosierujoj';
 $labels['messagesfromto'] = 'Mesaĝoj ekde $from ĝis $to de $count';
 $labels['messagenrof'] = 'Mesaĝo $nr-a de $count';
-$labels['copy'] = 'Kopio';
+$labels['copy'] = 'Kopii';
+$labels['move'] = 'Movi';
 $labels['moveto'] = 'transloku al...';
 $labels['download'] = 'elŝutu';
 $labels['filename'] = 'Dosiernomo';
@@ -213,7 +214,7 @@ $labels['folder'] = 'Dosierujo';
 $labels['foldername'] = 'Dosierujo-nomo';
 $labels['subscribed'] = 'Abonata';
 $labels['messagecount'] = 'Mesaĝoj';
-$labels['create'] = 'Kreu';
+$labels['create'] = 'Krei';
 $labels['createfolder'] = 'Kreu novan dosierujon';
 $labels['managefolders'] = 'Administru dosierujon';
 $labels['sortby'] = 'Ordigu per';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index e95d2164b..ee4ddc4c9 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: javierwilson <Unknown>                                        |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -19,7 +19,7 @@ $labels['welcome'] = 'Bienvenido a $product';
 $labels['username'] = 'Nombre de usuario';
 $labels['password'] = 'Contraseña';
 $labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
+$labels['login'] = 'Iniciar sesión';
 $labels['logout'] = 'Cerrar sesión';
 $labels['mail'] = 'Correo';
 $labels['settings'] = 'Configuración';
@@ -32,23 +32,24 @@ $labels['junk'] = 'Basura';
 $labels['subject'] = 'Asunto';
 $labels['from'] = 'Remitente';
 $labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia';
+$labels['cc'] = 'Cc';
 $labels['bcc'] = 'Cco';
-$labels['replyto'] = 'Respuesta a';
+$labels['replyto'] = 'Responder a';
 $labels['followupto'] = 'Responder-a';
 $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Leer estado';
-$labels['mailboxlist'] = 'Bandejas';
-$labels['folders'] = 'Bandejas';
+$labels['mailboxlist'] = 'Carpetas';
+$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
+$labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy'] = 'Copiar';
 $labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['moveto'] = 'Mover a…';
 $labels['download'] = 'Descargar';
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
@@ -71,8 +72,8 @@ $labels['jan'] = 'Ene';
 $labels['feb'] = 'Feb';
 $labels['mar'] = 'Mar';
 $labels['apr'] = 'Abr';
-$labels['may'] = 'Mayo';
-$labels['longmay'] = 'Mayo';
+$labels['may'] = 'May';
+$labels['longmay'] = 'May';
 $labels['jun'] = 'Jun';
 $labels['jul'] = 'Jul';
 $labels['aug'] = 'Ago';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Octubre';
 $labels['longnov'] = 'Noviembre';
 $labels['longdec'] = 'Diciembre';
 $labels['today'] = 'Hoy';
-$labels['checkmail'] = 'Revisar si hay nuevos mensajes';
-$labels['compose'] = 'Escribir un mensaje';
-$labels['writenewmessage'] = 'Crear nuevo mensaje';
+$labels['refresh'] = 'Actualizar';
+$labels['checkmail'] = 'Revisar si hay mensajes nuevos';
+$labels['compose'] = 'Redactar';
+$labels['writenewmessage'] = 'Crear un mensaje nuevo';
+$labels['reply'] = 'Responder';
 $labels['replytomessage'] = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
 $labels['replyall'] = 'Responder a todos';
 $labels['replylist'] = 'Responder a la lista';
+$labels['forward'] = 'Reenviar';
 $labels['forwardinline'] = 'Reenviar directamente';
 $labels['forwardattachment'] = 'Reenviar como adjunto';
 $labels['forwardmessage'] = 'Reenviar mensaje';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Mostrar el siguiente mensaje';
 $labels['lastmessage'] = 'Mostrar el último mensaje';
 $labels['backtolist'] = 'Volver a la lista de mensajes';
 $labels['viewsource'] = 'Mostrar código';
+$labels['mark'] = 'Marcar';
 $labels['markmessages'] = 'Marcar mensajes';
 $labels['markread'] = 'Como leído';
 $labels['markunread'] = 'Como no leído';
 $labels['markflagged'] = 'Como marcado';
 $labels['markunflagged'] = 'Como no marcado';
 $labels['moreactions'] = 'Más acciones…';
+$labels['more'] = 'Más';
+$labels['back'] = 'Volver';
+$labels['options'] = 'Opciones';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Entrega de notificaciones de estado';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
 $labels['editidents'] = 'Editar identidades';
+$labels['spellcheck'] = 'Corrector ortográfico';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto'] = 'Revertir a';
+$labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda avanzada';
+$labels['advanced'] = 'Avanzadas';
 $labels['other'] = 'Otro';
 $labels['typeother'] = 'Otro';
 $labels['typehome'] = 'Casa';
@@ -288,7 +299,7 @@ $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
 $labels['importtext'] = 'Puede importar contactos desde una lista existente.<br/>Actualmente sólo soportamos el formato <a href="http://es.wikipedia.org/wiki/VCard">vCard</a>.';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
-$labels['about'] = 'Acerca De';
+$labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
@@ -349,7 +360,7 @@ $labels['force7bit'] = 'Usar codificación MIME para caracteres de 8 bits';
 $labels['advancedoptions'] = 'Opciones avanzadas';
 $labels['focusonnewmessage'] = 'Activar la ventana del navegador si hay un mensaje nuevo';
 $labels['checkallfolders'] = 'Comprobar en todas las bandejas si hay mensajes nuevos';
-$labels['displaynext'] = 'Después de borrar/mover, mostrar el siguiente mensaje después de borrar/mover un mensaje';
+$labels['displaynext'] = 'Después de borrar/mover un mensaje, mostrar el siguiente';
 $labels['defaultfont'] = 'Tipo de letra predeterminada del mensaje HTML';
 $labels['mainoptions'] = 'Opciones principales';
 $labels['section'] = 'Sección';
@@ -419,7 +430,7 @@ $labels['easterneuropean'] = 'Europeo oriental';
 $labels['southeasterneuropean'] = 'Europeo sudoriental';
 $labels['baltic'] = 'Báltico';
 $labels['cyrillic'] = 'Cirílico';
-$labels['arabic'] = 'Árabe';
+$labels['arabic'] = 'Árabe';
 $labels['greek'] = 'Griego';
 $labels['hebrew'] = 'Hebreo';
 $labels['turkish'] = 'Turco';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 60ccb44ba..5862b9c80 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pablo Rosciani <Unknown>                                      |
+ | Author: Marcelino Aranda <marars@gmail.com>                           |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Añadiendo contacto(s) al grupo…';
 $messages['removingmember'] = 'Quitando contacto(s) del grupo…';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado correctamente.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
+$messages['deleteidentityconfirm'] = 'Realmente desea eliminar esta identidad?';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
 $messages['forbiddencharacter'] = 'El nombre de la bandeja contiene un carácter prohibido';
 $messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index fadd64dc6..25eaebbe2 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -363,6 +363,7 @@ $labels['checkallfolders'] = 'Kontrolli uusi kirju kõigist kaustadest';
 $labels['displaynext'] = 'Pärast kirja kustutamist/liigutamist näita järgmist kirja';
 $labels['defaultfont'] = 'HTML kirjade vaikefont';
 $labels['mainoptions'] = 'Peamised valikud';
+$labels['browseroptions'] = 'Sirvimis valikud';
 $labels['section'] = 'Osa';
 $labels['maintenance'] = 'Hooldus';
 $labels['newmessage'] = 'Uus kiri';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 7f340bd6f..2d8bf78cf 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar <Unknown>                                               |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Ilmnes tõrge!';
 $messages['loginfailed'] = 'Sisselogimine ebaõnnestus';
 $messages['cookiesdisabled'] = 'Sinu veebilehitseja ei võta präänikuid vastu';
 $messages['sessionerror'] = 'Sinu seanss on aegunud või vigane';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index fb742b0c4..e2b2f8099 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
+ | Author: Samu Juvonen <Unknown>                                        |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -35,15 +35,18 @@ $labels['to'] = 'Vastaanottaja';
 $labels['cc'] = 'Kopio';
 $labels['bcc'] = 'Piilokopio';
 $labels['replyto'] = 'Vastaus osoitteeseen';
+$labels['followupto'] = 'Keskustelunsiirto';
 $labels['date'] = 'Päiväys';
 $labels['size'] = 'Koko';
 $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
+$labels['readstatus'] = 'Luettu';
 $labels['mailboxlist'] = 'Kansiot';
 $labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
 $labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
+$labels['fromtoshort'] = '$from - $to (yhteensä $count)';
 $labels['copy'] = 'Kopioi';
 $labels['move'] = 'Siirrä';
 $labels['moveto'] = 'siirrä kansioon...';
@@ -98,7 +101,9 @@ $labels['reply'] = 'Vastaa';
 $labels['replytomessage'] = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
 $labels['replyall'] = 'Vastaa kaikille';
+$labels['replylist'] = 'Vastaa listalle';
 $labels['forward'] = 'Välitä eteenpäin';
+$labels['forwardinline'] = 'Välitä viesti';
 $labels['forwardattachment'] = 'Välitä viesti liitteenä';
 $labels['forwardmessage'] = 'Välitä viesti';
 $labels['deletemessage'] = 'Poista viesti';
@@ -110,6 +115,7 @@ $labels['nextmessage'] = 'Näytä edellinen viesti';
 $labels['lastmessage'] = 'Näytä viimeinen viesti';
 $labels['backtolist'] = 'Takaisin viesteihin';
 $labels['viewsource'] = 'Näytä lähdekoodi';
+$labels['mark'] = 'Merkitse';
 $labels['markmessages'] = 'Merkitse viestit';
 $labels['markread'] = 'luetuiksi';
 $labels['markunread'] = 'ei-luetuiksi';
@@ -118,6 +124,7 @@ $labels['markunflagged'] = 'ei-korostetuiksi';
 $labels['moreactions'] = 'Lisää toimintoja...';
 $labels['more'] = 'Lisää';
 $labels['back'] = 'Takaisin';
+$labels['options'] = 'Asetukset';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
@@ -134,10 +141,12 @@ $labels['threads'] = 'Viestiketjut';
 $labels['expand-all'] = 'Laajenna kaikki';
 $labels['expand-unread'] = 'Laajenna lukemattomat';
 $labels['collapse-all'] = 'Kutista kaikki';
+$labels['threaded'] = 'Säikeet';
 $labels['autoexpand_threads'] = 'Laajenna viestiketjut automaattisesti';
 $labels['do_expand'] = 'kaikki viestiketjut';
 $labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
 $labels['fromto'] = 'Lähettäjä/Vastaanottaja';
+$labels['flag'] = 'Merkitse';
 $labels['attachment'] = 'Liite';
 $labels['sentdate'] = 'Lähetysaika';
 $labels['arrival'] = 'Saapumisaika';
@@ -146,6 +155,7 @@ $labels['desc'] = 'laskeva';
 $labels['listcolumns'] = 'Näkyvät kentät';
 $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
+$labels['listmode'] = 'Listausnäkymä';
 $labels['folderactions'] = 'Kansiotoiminnot...';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
@@ -165,13 +175,20 @@ $labels['addattachment'] = 'Liitetiedosto';
 $labels['charset'] = 'Merkistö';
 $labels['editortype'] = 'Editorin tyyppi';
 $labels['returnreceipt'] = 'Perillesaapumisilmoitus';
+$labels['dsn'] = 'Toimituksen tilailmoitus';
+$labels['mailreplyintro'] = '$sender kirjoitti $date:';
 $labels['originalmessage'] = 'Alkuperäinen viesti';
+$labels['editidents'] = 'Muokkaa identiteettejä';
+$labels['spellcheck'] = 'Oikeinkirjoitus';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
 $labels['revertto'] = 'Muuta takaisin';
+$labels['attach'] = 'Liitä';
 $labels['attachments'] = 'Liitetiedostot';
 $labels['upload'] = 'Lisää';
+$labels['uploadprogress'] = '$percent ($current, yhteensä $total)';
 $labels['close'] = 'Sulje';
+$labels['messageoptions'] = 'Viestin asetukset...';
 $labels['low'] = 'Matala';
 $labels['lowest'] = 'Matalin';
 $labels['normal'] = 'Normaali';
@@ -189,6 +206,7 @@ $labels['maxuploadsize'] = 'Suurin sallittu tiedostokoko on $size';
 $labels['addcc'] = 'Lisää kopio';
 $labels['addbcc'] = 'Lisää piilokopio';
 $labels['addreplyto'] = 'Lisää vastausosoite';
+$labels['addfollowupto'] = 'Lisää keskustelunsiirto';
 $labels['mdnrequest'] = 'Viestin lähettäjä on pyytänyt kuittauksen siitä että olet lukenut viestin. Haluatko lähettää kuittauksen?';
 $labels['receiptread'] = 'Lukukuittaus';
 $labels['yourmessage'] = 'Tämä viesti on kuittaus lähettämällesi viestille';
@@ -226,13 +244,18 @@ $labels['spouse'] = 'Puoliso';
 $labels['allfields'] = 'Kaikki kentät';
 $labels['search'] = 'Haku';
 $labels['advsearch'] = 'Tarkennettu haku';
+$labels['advanced'] = 'Lisäasetukset';
+$labels['other'] = 'Muu';
+$labels['typeother'] = 'Muu';
 $labels['typehome'] = 'Koti';
 $labels['typework'] = 'Työ';
 $labels['typemobile'] = 'Matkapuhelin';
+$labels['typemain'] = 'Oma';
 $labels['typehomefax'] = 'Kotifaksi';
 $labels['typeworkfax'] = 'Työfaksi';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Hakulaite';
+$labels['typevideo'] = 'Video';
 $labels['typehomepage'] = 'Kotisivu';
 $labels['typeblog'] = 'Blogi';
 $labels['typeprofile'] = 'Profiili';
@@ -249,6 +272,7 @@ $labels['delete'] = 'Poista';
 $labels['rename'] = 'Nimeä uudelleen';
 $labels['addphoto'] = 'Lisää';
 $labels['replacephoto'] = 'Korvaa';
+$labels['uploadphoto'] = 'Lähetä kuva';
 $labels['newcontact'] = 'Luo uusi yhteystieto';
 $labels['deletecontact'] = 'Poista valitut yhteystiedot';
 $labels['composeto'] = 'Kirjoita viesti yhteystiedolle';
@@ -299,6 +323,7 @@ $labels['pagesize'] = 'Rivejä sivulla';
 $labels['signature'] = 'Allekirjoitus';
 $labels['dstactive'] = 'Kesäaika';
 $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
+$labels['htmlonreply'] = 'Vain vastatessa HTML-viesteihin';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
 $labels['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
@@ -310,6 +335,8 @@ $labels['mailboxview'] = 'Postilaatikkonäkymä';
 $labels['mdnrequests'] = 'Lähettäjän kuittaukset';
 $labels['askuser'] = 'kysy käyttäjältä';
 $labels['autosend'] = 'lähetä automaattisesti';
+$labels['autosendknown'] = 'Lähetä kuittaus kontaktilistassa oleville, kysy muulloin';
+$labels['autosendknownignore'] = 'Lähetä kuittaus vain kontaktilistassa oleville';
 $labels['ignore'] = 'jätä huomiotta';
 $labels['readwhendeleted'] = 'Merkitse poistettavat viestit luetuiksi';
 $labels['flagfordeletion'] = 'Poistamisen sijaan merkitse viestit poistettavaksi';
@@ -320,7 +347,7 @@ $labels['fromknownsenders'] = 'tunnetuilta lähettäjiltä';
 $labels['always'] = 'aina';
 $labels['showinlineimages'] = 'Näytä liitekuvat viestin jälkeen';
 $labels['autosavedraft'] = 'Tallenna luonnos automaattisesti';
-$labels['everynminutes'] = 'joka $n minuutti';
+$labels['everynminutes'] = 'joka $n. minuutti';
 $labels['keepalive'] = 'Tarkasta uudet viestit';
 $labels['never'] = 'ei koskaan';
 $labels['immediately'] = 'välittömästi';
@@ -337,6 +364,7 @@ $labels['checkallfolders'] = 'Tarkista kaikki kansiot uusien viestien varalta';
 $labels['displaynext'] = 'Viestin siirron tai poiston jälkeen, näytä seuraava viesti';
 $labels['defaultfont'] = 'HTML-viestin oletuskirjasin';
 $labels['mainoptions'] = 'Pääasetukset';
+$labels['browseroptions'] = 'Selainasetukset';
 $labels['section'] = 'Kohta';
 $labels['maintenance'] = 'Huolto';
 $labels['newmessage'] = 'Uusi viesti';
@@ -354,6 +382,12 @@ $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds'] = '$n sekunnin jälkeen';
+$labels['reqmdn'] = 'Pyydä aina kuittausviestiä';
+$labels['reqdsn'] = 'Pyydä aina toimituksen tilailmoitus';
+$labels['replysamefolder'] = 'Laita vastaukseni samaan hakemistoon alkuperäisen viestin kanssa';
+$labels['defaultaddressbook'] = 'Lisää uudet kontaktit valittuun osoitekirjaan';
+$labels['autocompletesingle'] = 'Älä huomioi vaihtoehtoisia sähköpostiosoitteita automaattisessa täydennyksessä';
+$labels['listnamedisplay'] = 'Listaa yhteystiedot';
 $labels['spellcheckbeforesend'] = 'Tarkista oikeinkirjoitus ennen viestin lähetystä';
 $labels['spellcheckoptions'] = 'Oikuluvun asetukset';
 $labels['spellcheckignoresyms'] = 'Jätä huomiotta sanat, joissa on symboleja';
@@ -374,6 +408,7 @@ $labels['parentfolder'] = 'Yläkansio';
 $labels['location'] = 'Sijanti';
 $labels['info'] = 'Tietoja';
 $labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
+$labels['changesubscription'] = 'Klikkaa muuttaaksesi tilausta';
 $labels['foldertype'] = 'Kansion tyyppi';
 $labels['personalfolder'] = 'Yksityinen kansio';
 $labels['otherfolder'] = 'Toisen käyttäjän kansio';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 7c104f061..004b18ca1 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -15,6 +15,7 @@
 */
 
 $messages = array();
+$messages['errortitle'] = 'Virhe havaittu.';
 $messages['loginfailed'] = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
 $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
@@ -22,6 +23,8 @@ $messages['storageerror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
 $messages['servererror'] = 'Palvelinvirhe!';
 $messages['servererrormsg'] = 'Palvelinvirhe: $msg';
 $messages['dberror'] = 'Tietokantavirhe!';
+$messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
+$messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 $messages['loggedout'] = 'Sinut on kirjattu ulos järjestelmästä.';
@@ -43,6 +46,7 @@ $messages['blockedimages'] = 'Turvallisuussyistä viestin kuvia ei näytetty.';
 $messages['encryptedmessage'] = 'Viesti on salattu, eikä sitä voida näyttää.';
 $messages['nocontactsfound'] = 'Yhteystietoja ei löytynyt.';
 $messages['contactnotfound'] = 'Pyydettyä yhteystietoa ei löytynyt';
+$messages['contactsearchonly'] = 'Anna hakusanoja, joilla yhteystietoja haetaan';
 $messages['sendingfailed'] = 'Viestin lähetys epäonnistui';
 $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämistä';
 $messages['errorsavingsent'] = 'Lähetetyn viestin tallennuksessa tapahtui virhe';
@@ -56,9 +60,12 @@ $messages['deletegroupconfirm'] = 'Haluatko varmasti poistaa valitun ryhmän?';
 $messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
 $messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
 $messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+$messages['contactdeleting'] = 'Poistetaan yhteystietoja...';
 $messages['groupdeleting'] = 'Poistetaan ryhmää...';
 $messages['folderdeleting'] = 'Poistetaan kansiota...';
 $messages['foldermoving'] = 'Siirretään kansiota...';
+$messages['foldersubscribing'] = 'Tilataan kansio...';
+$messages['folderunsubscribing'] = 'Perutaan kansio tilaus...';
 $messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
 $messages['noemailwarning'] = 'Anna sähköpostiosoite';
 $messages['nonamewarning'] = 'Anna nimi';
@@ -78,6 +85,10 @@ $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
 $messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt';
 $messages['folderdeleted'] = 'Kansio poistettu onnistuneesti';
+$messages['foldersubscribed'] = 'Kansio tilattu onnistuneesti.';
+$messages['folderunsubscribed'] = 'Kansion tilaus poistettu onnistuneesti.';
+$messages['folderpurged'] = 'Kansio on tyhjennetty onnistuneesti.';
+$messages['folderexpunged'] = 'Kansio on pakattu onnistuneesti.';
 $messages['deletedsuccessfully'] = 'Poistettu onnistuneesti';
 $messages['converting'] = 'Poistetaan asettelu viestistä...';
 $messages['messageopenerror'] = 'Virhe kopioitaessa viestiä palvelimelta';
@@ -89,8 +100,14 @@ $messages['sourceisreadonly'] = 'Tämän osoitteen lähde on kirjoitussuojattu';
 $messages['errorsavingcontact'] = 'Yhteystietoa ei voitu tallentaa';
 $messages['movingmessage'] = 'Siirretään viestiä...';
 $messages['copyingmessage'] = 'Kopioidaan viestiä...';
+$messages['copyingcontact'] = 'Kopioidaan yhteystietoja...';
+$messages['deletingmessage'] = 'Poistetaan viestejä...';
+$messages['markingmessage'] = 'Merkitään viestejä...';
+$messages['addingmember'] = 'Lisätään yhteystietoja ryhmään...';
+$messages['removingmember'] = 'Poistetaan yhteystietoja ryhmästä...';
 $messages['receiptsent'] = 'Lukukuittaus lähetetty onnistuneesti';
 $messages['errorsendingreceipt'] = 'Lukukuittausta ei voitu lähettää';
+$messages['deleteidentityconfirm'] = 'Haluatko varmasti poistaa identiteetin?';
 $messages['nodeletelastidentity'] = 'Et voi poistaa tätä identiteettiä, koska se on ainoa jäljelläoleva';
 $messages['forbiddencharacter'] = 'Kansion nimessä on kiellettyjä merkkejä';
 $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
@@ -100,6 +117,7 @@ $messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
 $messages['importwait'] = 'Tuodaan, odota...';
 $messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard-muodossa.';
 $messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
+$messages['importconfirmskipped'] = '<b>Ohitettu $skipped  olemassa olevaa merkintää</b>';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
 $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
@@ -114,6 +132,10 @@ $messages['emailformaterror'] = 'Virheellinen sähköpostiosoite: $email';
 $messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
 $messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
 $messages['internalerror'] = 'Ilmeni sisäinen virhe. Yritä uudelleen.';
+$messages['contactdelerror'] = 'Yhteystietoja ei voitu poistaa.';
+$messages['contactdeleted'] = 'Yhteystiedot poistettu onnistuneesti.';
+$messages['contactrestoreerror'] = 'Poistettujen yhteystietojen palautus epäonnistui.';
+$messages['contactrestored'] = 'Yhteystiedot palautettu onnistuneesti.';
 $messages['groupdeleted'] = 'Ryhmä poistettu onnistuneesti.';
 $messages['grouprenamed'] = 'Ryhmä nimetty uudelleen onnistuneesti.';
 $messages['groupcreated'] = 'Ryhmä luotu onnistuneesti.';
@@ -121,9 +143,18 @@ $messages['savedsearchdeleted'] = 'Tallennettu haku poistettu onnistuneesti.';
 $messages['savedsearchdeleteerror'] = 'Tallennetun haun poisto epäonnistui.';
 $messages['savedsearchcreated'] = 'Tallennettu haku luotu onnistuneesti.';
 $messages['savedsearchcreateerror'] = 'Tallennetun haun tallennus epäonnistui.';
+$messages['messagedeleted'] = 'Viestit poistettu onnistuneesti.';
+$messages['messagemoved'] = 'Viestit siirretty onnistuneesti.';
+$messages['messagecopied'] = 'Viestit kopioitu onnistuneesti.';
+$messages['messagemarked'] = 'Viestit merkitty onnistuneesti.';
+$messages['autocompletechars'] = 'Kirjoita vähintään $min merkkiä  ennen automaattista täydennystä.';
+$messages['autocompletemore'] = 'Täsmääviä kohteita löytyi enemmän. Syötä lisää merkkejä.';
 $messages['namecannotbeempty'] = 'Nimi ei voi olla tyhjä.';
 $messages['nametoolong'] = 'Nimi on liian pitkä.';
 $messages['folderupdated'] = 'Kansio päivitetty onnistuneesti.';
 $messages['foldercreated'] = 'Kansio luotu onnistuneesti.';
+$messages['invalidimageformat'] = 'Virheellinen kuvamuoto.';
 $messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
+$messages['parentnotwritable'] = 'Kansiota ei voitu siirtää tai luoda valittuun yläkansioon. Ei käyttöoikeutta.';
+$messages['messagetoobig'] = 'Viestiosa on liian suuri prosessoitavaksi.';
 
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 3ccf6929f..9a1c72737 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Xosé <Unknown>                                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -88,7 +88,7 @@ $labels['longjun'] = 'Xuño';
 $labels['longjul'] = 'Xullo';
 $labels['longaug'] = 'Agosto';
 $labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outobro';
+$labels['longoct'] = 'Outubro';
 $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Decembro';
 $labels['today'] = 'Hoxe';
@@ -405,7 +405,7 @@ $labels['undo'] = 'Desfacer';
 $labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Fonte';
-$labels['license'] = 'Licencia';
+$labels['license'] = 'Licenza';
 $labels['support'] = 'Obter axuda';
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 57e8aa12e..5374d38ed 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'תיקים';
 $labels['messagesfromto'] = 'הודעות $from עד $to מתוך $count';
 $labels['threadsfromto'] = 'שרשור $from עד $to מתוך $count';
 $labels['messagenrof'] = 'הודעה $nr מתוך $count';
+$labels['fromtoshort'] = '$from – $to מתוך $count';
 $labels['copy'] = 'העתק';
 $labels['move'] = 'העבר';
 $labels['moveto'] = 'תיוק ב...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'אוקטובר';
 $labels['longnov'] = 'נובמבר';
 $labels['longdec'] = 'דצמבר';
 $labels['today'] = 'היום';
+$labels['refresh'] = 'רענון';
 $labels['checkmail'] = 'משיכת הודעות חדשות';
 $labels['compose'] = 'כתיבת הודעה';
 $labels['writenewmessage'] = 'יצירת הודעה חדשה';
+$labels['reply'] = 'תגובה';
 $labels['replytomessage'] = 'מענה לשולח';
 $labels['replytoallmessage'] = 'מענה לשולח ולכל הנמענים';
 $labels['replyall'] = 'מענה לכולם';
 $labels['replylist'] = 'מענה לרשימת תפוצה';
+$labels['forward'] = 'העברה';
 $labels['forwardinline'] = 'העבר בגוף ההודעה';
 $labels['forwardattachment'] = 'העבר כקובץ מצורף';
 $labels['forwardmessage'] = 'העבר הודעה';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'הצגת ההודעה הבאה';
 $labels['lastmessage'] = 'הצגת ההודעה האחרונה';
 $labels['backtolist'] = 'חזרה אל רשימת ההודעות';
 $labels['viewsource'] = 'הצגת קוד מקור';
+$labels['mark'] = 'סימון';
 $labels['markmessages'] = 'סימון הודעות';
 $labels['markread'] = 'כנקראו';
 $labels['markunread'] = 'כלא נקראו';
 $labels['markflagged'] = 'כמסומן';
 $labels['markunflagged'] = 'כלא מסומן';
 $labels['moreactions'] = 'פעולות נוספות...';
+$labels['more'] = 'עוד';
+$labels['back'] = 'חזרה';
+$labels['options'] = 'אפשרויות';
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'הודעה על מצב המסירה';
 $labels['mailreplyintro'] = ':כתב $sender, $date בתאריך';
 $labels['originalmessage'] = 'הודעה מקורית';
 $labels['editidents'] = 'עריכת זהויות';
+$labels['spellcheck'] = 'איות';
 $labels['checkspelling'] = 'בדיקת איות';
 $labels['resumeediting'] = 'המשך עריכה';
 $labels['revertto'] = 'חזור למצב קודם';
+$labels['attach'] = 'צירוף';
 $labels['attachments'] = 'קבצים מצורפים';
 $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'בן/בת זוג';
 $labels['allfields'] = 'כל השדות';
 $labels['search'] = 'חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
+$labels['advanced'] = 'מתקדם';
 $labels['other'] = 'אחר';
 $labels['typeother'] = 'אחר';
 $labels['typehome'] = 'בית';
@@ -374,6 +385,7 @@ $labels['reqdsn'] = 'תמיד לבקש הודעה על מצב המסירה';
 $labels['replysamefolder'] = 'המענה ישמר בתיקיה של ההודעה המקורית';
 $labels['defaultaddressbook'] = 'הוספת אנשי קשר לספר הכתובות שנבחר';
 $labels['autocompletesingle'] = 'לדלג על כתובת דואר חילופית בעת שימוש בהשלמה אוטומטית של הקלדה';
+$labels['listnamedisplay'] = 'הצגת איש הקשר בתור';
 $labels['spellcheckbeforesend'] = 'בדיקת איות לפני המשלוח';
 $labels['spellcheckoptions'] = 'אפשריות בדיקת איות';
 $labels['spellcheckignoresyms'] = 'התעלמות ממילים המכילות סמלים';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 3d577f637..d9634f3b2 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'הוספת אנשי קשר לקבוצה...';
 $messages['removingmember'] = 'הסרת אנשי קשר מהקבוצה...';
 $messages['receiptsent'] = 'אישור הקבלה נשלח בהצלחה';
 $messages['errorsendingreceipt'] = 'לא ניתן לשלוח אישור קבלה';
+$messages['deleteidentityconfirm'] = 'האם אכן ברצונך למחוק זהות זאת?';
 $messages['nodeletelastidentity'] = 'זו הזהות האחרונה ולכן לא ניתן לבטלה';
 $messages['forbiddencharacter'] = 'שם התיקיה מכיל תוים אסורים';
 $messages['selectimportfile'] = 'נא לבחור קובץ לייבוא';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 17aa78dc7..930af8e25 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -9,22 +9,22 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $labels = array();
 $labels['welcome'] = 'Dobrodošli na $product';
-$labels['username'] = 'E-mail';
+$labels['username'] = 'Korisničko ime';
 $labels['password'] = 'Lozinka';
 $labels['server'] = 'Poslužitelj';
 $labels['login'] = 'Prijava';
 $labels['logout'] = 'Odjava';
-$labels['mail'] = 'E-Mail';
+$labels['mail'] = 'Pošta';
 $labels['settings'] = 'Postavke';
 $labels['addressbook'] = 'Imenik';
-$labels['inbox'] = 'Sandučić';
+$labels['inbox'] = 'Pristigla pošta';
 $labels['drafts'] = 'Predlošci';
 $labels['sent'] = 'Poslano';
 $labels['trash'] = 'Smeće';
@@ -34,7 +34,7 @@ $labels['from'] = 'Od';
 $labels['to'] = 'Za';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
-$labels['replyto'] = 'Odgovor-na';
+$labels['replyto'] = 'Odgovori';
 $labels['followupto'] = 'Nastavi-na';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Veličina';
@@ -46,6 +46,7 @@ $labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
+$labels['fromtoshort'] = '$from - $to od $count';
 $labels['copy'] = 'Kopiraj';
 $labels['move'] = 'Premjesti';
 $labels['moveto'] = 'Premjesti u...';
@@ -91,32 +92,40 @@ $labels['longsep'] = 'Rujan';
 $labels['longoct'] = 'Listopad';
 $labels['longnov'] = 'Studeni';
 $labels['longdec'] = 'Prosinac';
-$labels['today'] = 'danas';
+$labels['today'] = 'Danas';
+$labels['refresh'] = 'Osvježi';
 $labels['checkmail'] = 'Provjera novih poruka';
 $labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Nova poruka';
+$labels['writenewmessage'] = 'Stvori novu poruku';
+$labels['reply'] = 'Odgovori';
 $labels['replytomessage'] = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primateljima';
 $labels['replyall'] = 'Odgovori svima';
 $labels['replylist'] = 'Odgovori listi';
+$labels['forward'] = 'Proslijedi';
 $labels['forwardinline'] = 'Proslijedi citirano';
 $labels['forwardattachment'] = 'Proslijedi kao privitak';
 $labels['forwardmessage'] = 'Prosljedi poruku';
-$labels['deletemessage'] = 'Prebaci poruku u mapu smeće';
+$labels['deletemessage'] = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Preseli poruke u smeće';
-$labels['printmessage'] = 'Print poruke';
+$labels['printmessage'] = 'Ispiši ovu poruku';
 $labels['previousmessage'] = 'Prikaži prethodnu poruku';
 $labels['firstmessage'] = 'Prikaži prvu poruku';
 $labels['nextmessage'] = 'Prikaži slijedeću poruku';
 $labels['lastmessage'] = 'Prikaži zadnju poruku';
 $labels['backtolist'] = 'Povratak na listu poruka';
 $labels['viewsource'] = 'Prikaži poruku u izvornom obliku';
+$labels['mark'] = 'Označi';
 $labels['markmessages'] = 'Označi poruke';
 $labels['markread'] = 'Kao pročitano';
 $labels['markunread'] = 'Kao nepročitano';
 $labels['markflagged'] = 'Kao označenu';
 $labels['markunflagged'] = 'Kao neoznačenu';
-$labels['select'] = 'Označi';
+$labels['moreactions'] = 'Više akcija';
+$labels['more'] = 'Više';
+$labels['back'] = 'Natrag';
+$labels['options'] = 'Postavke';
+$labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
 $labels['nonesort'] = 'Ništa';
@@ -167,12 +176,17 @@ $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Tip editora';
 $labels['returnreceipt'] = 'Potvrda o primitku poruke';
 $labels['dsn'] = 'Potvrda o poslanoj poruci';
+$labels['mailreplyintro'] = 'Dana $date, $sender je napisao(la):';
+$labels['originalmessage'] = 'Izvorna Poruka';
 $labels['editidents'] = 'Promijeni identitete';
+$labels['spellcheck'] = 'Piši';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Povratak u pisanje';
 $labels['revertto'] = 'Vrati na';
+$labels['attach'] = 'Priloži';
 $labels['attachments'] = 'Privitci (Attachments)';
 $labels['upload'] = 'Dodaj';
+$labels['uploadprogress'] = '$percent ($current od $total)';
 $labels['close'] = 'Zatvori';
 $labels['messageoptions'] = 'Opcije poruka...';
 $labels['low'] = 'Nizak';
@@ -183,6 +197,7 @@ $labels['highest'] = 'Najviši';
 $labels['nosubject'] = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
+$labels['isdraft'] = 'Ova poruka je skica (draft)';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Samo tekst';
 $labels['savesentmessagein'] = 'Spremi poslane poruke u';
@@ -226,6 +241,10 @@ $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Asistent';
 $labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Suprug/a';
+$labels['allfields'] = 'Sva polja';
+$labels['search'] = 'Pretraga';
+$labels['advsearch'] = 'Napredna Pretraga';
+$labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
 $labels['typeother'] = 'Ostalo';
 $labels['typehome'] = 'Kućni broj';
@@ -237,6 +256,9 @@ $labels['typeworkfax'] = 'Fax posao';
 $labels['typecar'] = 'Auto';
 $labels['typepager'] = 'Pejdžer';
 $labels['typevideo'] = 'Video';
+$labels['typehomepage'] = 'Početna stranica';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmjeni kontakt';
@@ -258,6 +280,8 @@ $labels['print'] = 'Print';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
+$labels['grouprename'] = 'Promijeni ime grupe';
+$labels['groupdelete'] = 'Izbriši grupu';
 $labels['previouspage'] = 'Prethodna strana';
 $labels['firstpage'] = 'Prva strana';
 $labels['nextpage'] = 'Slijedeća strana';
@@ -265,13 +289,17 @@ $labels['lastpage'] = 'Zadnja strana';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Privatna adresa';
+$labels['searchsave'] = 'Pohrani pretragu';
+$labels['searchdelete'] = 'Obriši pretragu';
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakta';
 $labels['importfromfile'] = 'Uvezi iz datoteke:';
+$labels['importtarget'] = 'Dodaj nove kontakte u imenik:';
 $labels['importreplace'] = 'Prepiši cijeli adresar';
 $labels['importtext'] = 'Možete prebaciti kontakte iz postojećeg adresara.<br/>Trenutno podržavamo uvozenje adresa iz <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formata.';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Postavke za';
+$labels['about'] = 'O programu';
 $labels['preferences'] = 'Postavke';
 $labels['userpreferences'] = 'Korisničke postavke';
 $labels['editpreferences'] = 'Izmjena postavki';
@@ -283,6 +311,8 @@ $labels['edititem'] = 'Uredi';
 $labels['preferhtml'] = 'HTML format u prednosti';
 $labels['defaultcharset'] = 'Zadani skup znakova';
 $labels['htmlmessage'] = 'HTML format poruke';
+$labels['dateformat'] = 'Format datuma';
+$labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatiran datum';
 $labels['setdefault'] = 'Postavi predodređeno';
 $labels['autodetect'] = 'Auto';
@@ -331,6 +361,7 @@ $labels['advancedoptions'] = 'Napredne postavke';
 $labels['focusonnewmessage'] = 'Fokusiraj browser pri novoj poruci';
 $labels['checkallfolders'] = 'Provjeri nove poruke u svim mapama';
 $labels['displaynext'] = 'Nakon brisanja/micanja poruke, prikaži slijedeću';
+$labels['defaultfont'] = 'Predodređeni font HTML poruke';
 $labels['mainoptions'] = 'Glavne postavke';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Održavanje';
@@ -352,6 +383,14 @@ $labels['afternseconds'] = 'nakon $n sekundi';
 $labels['reqmdn'] = 'Uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'Uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
+$labels['defaultaddressbook'] = 'Dodaj nove kontakte u odabrani imenik';
+$labels['autocompletesingle'] = 'Preskoči alternativne email adrese u autocomplete prijedlozima';
+$labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
+$labels['spellcheckoptions'] = 'Postavke provjere pravopisa';
+$labels['spellcheckignoresyms'] = 'Ignoriraj riječi koje sadrže simbole';
+$labels['spellcheckignorenums'] = 'Ignoriraj riječi koje sadrže brojeve';
+$labels['spellcheckignorecaps'] = 'Ignoriraj riječi sa sa svim velikim slovima';
+$labels['addtodict'] = 'Dodaj u rječnik';
 $labels['folder'] = 'Mapa';
 $labels['foldername'] = 'Ime mape';
 $labels['subscribed'] = 'Pretplata';
@@ -374,6 +413,12 @@ $labels['sharedfolder'] = 'Javna mapa';
 $labels['sortby'] = 'Sortiraj po';
 $labels['sortasc'] = 'Sortiraj rastućim nizom';
 $labels['sortdesc'] = 'Sortiraj opadajućim nizom';
+$labels['undo'] = 'Poništi';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Verzija';
+$labels['source'] = 'Izvor';
+$labels['license'] = 'Licenca';
+$labels['support'] = 'Podrška';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index f724f0711..354365db8 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -40,10 +40,12 @@ $messages['messagesaved'] = 'Poruka uspješno spremljena u \'Predlošci\'';
 $messages['successfullysaved'] = 'Spremanje uspješno obavljeno';
 $messages['addedsuccessfully'] = 'Kontakt uspješno dodan u imenik';
 $messages['contactexists'] = 'Kontakt sa ovom e-mail adresom već postoji u imeniku';
+$messages['contactnameexists'] = 'Kontak s istim imenom već postoji.';
 $messages['blockedimages'] = 'Zbog zaštite privatnosti, slike sa udaljenih servera su blokirane.';
 $messages['encryptedmessage'] = 'Ova poruka je zaštićena pa se ne može prikazati';
 $messages['nocontactsfound'] = 'Imenik je prazan';
 $messages['contactnotfound'] = 'Traženi kontakt nije pronađen';
+$messages['contactsearchonly'] = 'Upišite nekoliko pojmova za pretragu imenika';
 $messages['sendingfailed'] = 'Greška pri slanju poruke';
 $messages['senttooquickly'] = 'Molimo sačekajte $sec sek. prije slanja ove poruke';
 $messages['errorsavingsent'] = 'Greška pri spremanju poslane poruke';
@@ -53,9 +55,12 @@ $messages['errorcopying'] = 'Greška pri kopiranju poruke';
 $messages['errordeleting'] = 'Greška pri brisanju poruke';
 $messages['errormarking'] = 'Nije moguće označiti poruku';
 $messages['deletecontactconfirm'] = 'Želite li obrisati izabrane kontakte?';
+$messages['deletegroupconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu?';
 $messages['deletemessagesconfirm'] = 'Sigurno želite obrisati odabrane poruke?';
 $messages['deletefolderconfirm'] = 'Želite li obrisati ovu mapu?';
 $messages['purgefolderconfirm'] = 'Želite li obrisati sve poruke u mapi?';
+$messages['contactdeleting'] = 'Brišem kontakt(e)...';
+$messages['groupdeleting'] = 'Brišem grupu...';
 $messages['folderdeleting'] = 'Brišem mapu...';
 $messages['foldermoving'] = 'Premještam mapu...';
 $messages['foldersubscribing'] = 'Pretplata na mapu...';
@@ -73,6 +78,7 @@ $messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
 $messages['nosearchname'] = 'Unesite ime ili e-mail adresu';
 $messages['notuploadedwarning'] = 'Svi prilozi još nisu presnimljeni na poslužitelj. Molim pričekajte ili zaustavite prsnimavanje.';
 $messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
+$messages['contactsearchsuccessful'] = '$nr kontakata pronađeno.';
 $messages['searchnomatch'] = 'Traženi termin nije pronađen ni u jednoj poruci';
 $messages['searching'] = 'Pretraga u tijeku...';
 $messages['checking'] = 'Provjera u tijeku...';
@@ -93,10 +99,14 @@ $messages['sourceisreadonly'] = 'Ovaj resurs adresa je samo za čitanje';
 $messages['errorsavingcontact'] = 'Nije uspjelo spremanje adrese kontakta';
 $messages['movingmessage'] = 'Premještanje poruke...';
 $messages['copyingmessage'] = 'Kopiranje poruke...';
+$messages['copyingcontact'] = 'Kopiram kontakt(e)...';
 $messages['deletingmessage'] = 'Brisanje poruke...';
 $messages['markingmessage'] = 'Označavanje poruke...';
+$messages['addingmember'] = 'Dodajem kontakt(e) u grupu...';
+$messages['removingmember'] = 'Izbacujem kontakt(e) iz groupe...';
 $messages['receiptsent'] = 'Uspješno poslana potvrda (pročitano)';
 $messages['errorsendingreceipt'] = 'Ne može poslati potvrdu';
+$messages['deleteidentityconfirm'] = 'Jeste li sigurni da želite obrisati profil?';
 $messages['nodeletelastidentity'] = 'Ne možete izbrisati zadnji identitet.';
 $messages['forbiddencharacter'] = 'Naziv mape sadrži zabranjene znakove';
 $messages['selectimportfile'] = 'Odaberite datoteku za prijenos';
@@ -123,17 +133,27 @@ $messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi preko maximum
 $messages['internalerror'] = 'Dogodila se interna greška. Molimo Vas pokušajte ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
 $messages['contactdeleted'] = 'Kontakti uspješno obrisani.';
+$messages['contactrestoreerror'] = 'Ne mogu vratiti obrisan(e) kontakt(e).';
+$messages['contactrestored'] = 'Kontakt(i) uspješno vraćeni .';
 $messages['groupdeleted'] = 'Grupa uspješno obrisana.';
 $messages['grouprenamed'] = 'Grupa uspješno preimenovana.';
 $messages['groupcreated'] = 'Grupa uspješno kreirana.';
+$messages['savedsearchdeleted'] = 'Pohranjena pretraga uspješno obrisana.';
+$messages['savedsearchdeleteerror'] = 'Ne mogu obrisati pohranjenu pretragu';
+$messages['savedsearchcreated'] = 'Pohranjena pretraga uspješno stvorena.';
+$messages['savedsearchcreateerror'] = 'Ne mogu stvoriti pohranjenu pretragu.';
 $messages['messagedeleted'] = 'Poruke uspješno obrisane.';
 $messages['messagemoved'] = 'Poruke uspješno pomjerene.';
 $messages['messagecopied'] = 'Poruke uspješno kopirane.';
 $messages['messagemarked'] = 'Poruke uspješno označene.';
 $messages['autocompletechars'] = 'Unesite barem $min znakova za auto-dopunjavanje.';
+$messages['autocompletemore'] = 'Više podudarajućih zapisa pronađeno. Molim upišite još znakova.';
 $messages['namecannotbeempty'] = 'Polje za ime ne može biti prazno.';
 $messages['nametoolong'] = 'Ime predugo.';
 $messages['folderupdated'] = 'Ažuriranje mape uspješno.';
 $messages['foldercreated'] = 'Kreiranje mape uspješno.';
 $messages['invalidimageformat'] = 'Format slike nije ispravan.';
+$messages['mispellingsfound'] = 'Greške pravopisa su pronađene u poruci.';
+$messages['parentnotwritable'] = 'Nije moguće stvoriti/pomaknuti mapu u odabranu mapu. Nemate prava pristupa.';
+$messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
 
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index ed8eeb5f5..db59ce88b 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: bela <Unknown>                                                |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
 $labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
 $labels['messagenrof'] = '$nr / $count üzenet';
+$labels['fromtoshort'] = '$from – $to / $count';
 $labels['copy'] = 'Másolás';
 $labels['move'] = 'Áthelyezés';
 $labels['moveto'] = 'Áthelyezés...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Október';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Ma';
+$labels['refresh'] = 'Frissítés';
 $labels['checkmail'] = 'Új üzenetek ellenőrzése';
 $labels['compose'] = 'Üzenet létrehozása';
 $labels['writenewmessage'] = 'Új üzenet';
+$labels['reply'] = 'Válasz';
 $labels['replytomessage'] = 'Válasz';
 $labels['replytoallmessage'] = 'Válasz a listának vagy a feladónak és az összes címzettnek';
 $labels['replyall'] = 'Válasz mindenkinek';
 $labels['replylist'] = 'Válasz a listának';
+$labels['forward'] = 'Továbbítás';
 $labels['forwardinline'] = 'Továbbítás beágyazva';
 $labels['forwardattachment'] = 'Továbbítás csatolmányként';
 $labels['forwardmessage'] = 'Továbbítás';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Következő levél mutatása';
 $labels['lastmessage'] = 'Utolsó levél mutatása';
 $labels['backtolist'] = 'Vissza az üzenetekhez';
 $labels['viewsource'] = 'Forrás megtekintése';
+$labels['mark'] = 'Jelölés';
 $labels['markmessages'] = 'Üzenetek megjelölése';
 $labels['markread'] = 'Olvasottként';
 $labels['markunread'] = 'Olvasatlanként';
 $labels['markflagged'] = 'Jelöltként';
 $labels['markunflagged'] = 'Jelöletlenként';
 $labels['moreactions'] = 'További műveletek...';
+$labels['more'] = 'Még egy';
+$labels['back'] = 'Vissza';
+$labels['options'] = 'Beállítások';
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Kézbesítési visszaigazolás';
 $labels['mailreplyintro'] = '$date időpontban $sender ezt írta:';
 $labels['originalmessage'] = 'Eredeti üzenet';
 $labels['editidents'] = 'Azonosítók szerkesztése';
+$labels['spellcheck'] = 'Helyesírás ellenőrzés';
 $labels['checkspelling'] = 'Helyesírás-ellenőrzés';
 $labels['resumeediting'] = 'Helyesírás-ellenőrzés vége';
 $labels['revertto'] = 'Visszaállítás erre';
+$labels['attach'] = 'Csatolás';
 $labels['attachments'] = 'Csatolmányok';
 $labels['upload'] = 'Feltöltés';
 $labels['uploadprogress'] = '$percent ($current / $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Házastárs';
 $labels['allfields'] = 'Összes mező';
 $labels['search'] = 'Keresés';
 $labels['advsearch'] = 'Részletes keresés';
+$labels['advanced'] = 'Haladó beállítások';
 $labels['other'] = 'Egyéb';
 $labels['typeother'] = 'Egyéb';
 $labels['typehome'] = 'Otthon';
@@ -374,6 +385,7 @@ $labels['reqdsn'] = 'Kézbesítési visszaigazolás megkövetelése';
 $labels['replysamefolder'] = 'Válaszok azonos mappába helyezése';
 $labels['defaultaddressbook'] = 'Új kapcsolatok hozzáadása a kiválasztott címjegyzékhez';
 $labels['autocompletesingle'] = 'TRANSLATE!';
+$labels['listnamedisplay'] = 'Névjegyek listázása';
 $labels['spellcheckbeforesend'] = 'Helyesírás-ellenőrzés az üzenet elküldése előtt';
 $labels['spellcheckoptions'] = 'Helyesírás-ellenőrzés opciók';
 $labels['spellcheckignoresyms'] = 'Speciális karaktereket tartalmazó szavak kihagyása';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index dd41c1c7d..9beec6c03 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: bela <Unknown>                                                |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Sikertelen belépés';
+$messages['loginfailed'] = 'Sikertelen bejelentkezés.';
 $messages['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
 $messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
 $messages['storageerror'] = 'Nem sikerült csatlakozni az IMAP szerverhez';
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Kapcsolat(ok) hozzáadása a csoporthoz...';
 $messages['removingmember'] = 'Kapcsolat(ok) törlése a csoportból...';
 $messages['receiptsent'] = 'Az olvasási visszaigazolás el lett küldve';
 $messages['errorsendingreceipt'] = 'Az olvasási visszaigazolást nem sikerült elküldeni';
+$messages['deleteidentityconfirm'] = 'Biztosan törli ezt az azonosítót?';
 $messages['nodeletelastidentity'] = 'Az azonosító nem törölhető, lennie kell legalább egy azonosítónak!';
 $messages['forbiddencharacter'] = 'A mappa neve tiltott karaktert tartalmaz';
 $messages['selectimportfile'] = 'Kérjük válassza ki a feltölteni kívánt fájlt';
@@ -117,7 +118,7 @@ $messages['importerror'] = 'Az importálás sikertelen! A feltöltött állomán
 $messages['importconfirm'] = '<b>Sikeresen importálásra került $inserted kapcsolat, kihagyva $skipped már létező bejegyzés</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Kihagyva $skipped már létező bejegyzés</b>';
 $messages['opnotpermitted'] = 'A művelet nem megengedett!';
-$messages['nofromaddress'] = 'A kiválasztott feladónál hiányzik az e-mail cím!';
+$messages['nofromaddress'] = 'A kiválasztott azonosítónál nincs  email beállítva.';
 $messages['editorwarning'] = 'Az egyszerű szöveges formátumra való váltás az összes formázás elvesztésével jár. Biztosan folytatja?';
 $messages['httpreceivedencrypterror'] = 'Végzetes konfigurációs hiba történt, azonnal lépjen kapcsolatba az üzemeltetővel. <b>Az üzenet nem küldhető el.</b>';
 $messages['smtpconnerror'] = 'SMTP hiba ($code): Sikertelen kapcsolódás a szerverhez';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 01a24f7be..48e5ccd6b 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -15,6 +15,9 @@
 */
 
 $labels = array();
+$labels['preferences'] = 'Նախընտրանքներ';
+$labels['userpreferences'] = 'Օգտվողի նախընտրանքներ';
+$labels['editpreferences'] = 'Խմբագրել օգտվողի նախընտրանքները';
 $labels['welcome'] = 'Բարի գալուստ $product';
 $labels['username'] = 'Օգտվող';
 $labels['password'] = 'Գաղտնաբառ';
@@ -38,7 +41,6 @@ $labels['replyto'] = 'Reply-To';
 $labels['date'] = 'Ամսաթիվ';
 $labels['size'] = 'Չափ';
 $labels['priority'] = 'Առավելություն';
-$labels['organization'] = 'Կազմակերպություն';
 $labels['mailboxlist'] = 'Դարակներ';
 $labels['folders'] = 'Դարակներ';
 $labels['messagesfromto'] = 'Նամակներ $from–ից $to–ը եղած $count–ից';
@@ -186,9 +188,6 @@ $labels['importreplace'] = 'Փոխել ողջ հասցեագիրքը';
 $labels['importtext'] = 'Դուք կարող եք ներկրել նոր հասցեներ առկա հասցեագրքից։ Համակարգը ընդունում է հասցեների ներկրումը <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> չափաձևով։';
 $labels['done'] = 'Ավարտված է';
 $labels['settingsfor'] = 'Նախասիրություններ';
-$labels['preferences'] = 'Ընդհանուր';
-$labels['userpreferences'] = 'Օգտվողի նախասիրություններ';
-$labels['editpreferences'] = 'Խմբագրել օգտվողի նախասիրությունները';
 $labels['identities'] = 'Անձիք';
 $labels['manageidentities'] = 'Կարգավորել անձանց';
 $labels['newidentity'] = 'Նոր անձ';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 94ffa543b..d647cae28 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -15,14 +15,13 @@
 */
 
 $messages = array();
+$messages['loading'] = 'Բեռնում...';
 $messages['loginfailed'] = 'Մուտքը ձախողվեց';
 $messages['cookiesdisabled'] = 'Сookies–ների ապահովվումը բացակայում է';
 $messages['sessionerror'] = 'Անվավեր կամ ժամկետանց սեսիա';
-$messages['storageerror'] = 'IMAP սերվերի հետ կապը ձախողվեց';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
 $messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
-$messages['loading'] = 'Բեռնավորում…';
 $messages['loadingdata'] = 'Տվյալների բեռնավորում…';
 $messages['checkingmail'] = 'Նոր նամակների ստուգում…';
 $messages['sendingmessage'] = 'Նամակի ուղարկում…';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 1aae6fa11..747be8609 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -385,6 +385,7 @@ $labels['reqdsn'] = 'Selalu meminta pemberitahuan status terkirim';
 $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yang dibalas';
 $labels['defaultaddressbook'] = 'Tambahkan kontak baru ke buku alamat terpilih';
 $labels['autocompletesingle'] = 'Lewatkan alamat email alternatif pada pelengkapan otomatis';
+$labels['listnamedisplay'] = 'Daftar kontak sebagai';
 $labels['spellcheckbeforesend'] = 'Periksa ejaan sebelum mengirimkan pesan';
 $labels['spellcheckoptions'] = 'Pilihan Ejaan';
 $labels['spellcheckignoresyms'] = 'Abaikan kata-kata yang bersimbol';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 958bd37f2..6f0c878b2 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -9,53 +9,58 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jóhannes Birgir Jensson <joi@betra.is>                       |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $labels = array();
-$labels['welcome'] = 'Vefpóstur';
+$labels['welcome'] = 'Velkomin í $product';
 $labels['username'] = 'Netfang';
 $labels['password'] = 'Lykilorð';
-$labels['server'] = 'Server';
+$labels['server'] = 'Póstþjónn';
 $labels['login'] = 'Innskrá';
 $labels['logout'] = 'Útskrá';
 $labels['mail'] = 'Tölvupóstur';
 $labels['settings'] = 'Stillingar';
-$labels['addressbook'] = 'Netfangaskrá';
+$labels['addressbook'] = 'Nafnaskrá';
 $labels['inbox'] = 'Innhólf';
 $labels['drafts'] = 'Drög';
 $labels['sent'] = 'Sent';
-$labels['trash'] = 'Eyddir hlutir';
+$labels['trash'] = 'Rusl';
 $labels['junk'] = 'Ruslpóstur';
-$labels['subject'] = 'Efni';
-$labels['from'] = 'Sendandi';
-$labels['to'] = 'Viðtakandi';
+$labels['subject'] = 'Titill';
+$labels['from'] = 'Frá';
+$labels['to'] = 'Til';
 $labels['cc'] = 'Afrit';
 $labels['bcc'] = 'Blint afrit';
-$labels['replyto'] = 'Reply-To';
-$labels['date'] = 'Dags';
+$labels['replyto'] = 'Svar til';
+$labels['followupto'] = 'Svar við';
+$labels['date'] = 'Dagsetning';
 $labels['size'] = 'Stærð';
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
+$labels['readstatus'] = 'Lesmerking';
 $labels['mailboxlist'] = 'Möppur';
 $labels['folders'] = 'Möppur';
 $labels['messagesfromto'] = 'Skeyti $from til $to af $count';
+$labels['threadsfromto'] = 'Þræðir $from til $to af $count';
 $labels['messagenrof'] = 'Skeyti $nr af $count';
+$labels['fromtoshort'] = '$from - $to af $count';
 $labels['copy'] = 'Afrit';
-$labels['moveto'] = 'færa í...';
-$labels['download'] = 'sækja';
-$labels['filename'] = 'Skrárnafn';
-$labels['filesize'] = 'Skrárstærð';
-$labels['addtoaddressbook'] = 'Bæta í netfangaskrá';
-$labels['sun'] = 'sun';
-$labels['mon'] = 'mán';
-$labels['tue'] = 'þri';
-$labels['wed'] = 'mið';
-$labels['thu'] = 'fim';
-$labels['fri'] = 'fös';
-$labels['sat'] = 'lau';
+$labels['move'] = 'Færa';
+$labels['moveto'] = 'Færa í...';
+$labels['download'] = 'Hlaða niður';
+$labels['filename'] = 'Skráarheiti';
+$labels['filesize'] = 'Skráarstærð';
+$labels['addtoaddressbook'] = 'Bæta í nafnaskrá';
+$labels['sun'] = 'sunn.';
+$labels['mon'] = 'mán.';
+$labels['tue'] = 'þrið.';
+$labels['wed'] = 'miðv.';
+$labels['thu'] = 'fimm.';
+$labels['fri'] = 'föst.';
+$labels['sat'] = 'laug.';
 $labels['sunday'] = 'sunnudagur';
 $labels['monday'] = 'mánudagur';
 $labels['tuesday'] = 'þriðjudagur';
@@ -63,59 +68,95 @@ $labels['wednesday'] = 'miðvikudagur';
 $labels['thursday'] = 'fimmtudagur';
 $labels['friday'] = 'föstudagur';
 $labels['saturday'] = 'laugardagur';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maí';
-$labels['longmay'] = 'Maí';
-$labels['jun'] = 'Jún';
-$labels['jul'] = 'Júl';
-$labels['aug'] = 'Ágú';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nóv';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Janúar';
-$labels['longfeb'] = 'Febrúar';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'Apríl';
-$labels['longjun'] = 'Júní';
-$labels['longjul'] = 'Júlí';
-$labels['longaug'] = 'Ágúst';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Október';
-$labels['longnov'] = 'Nóvember';
-$labels['longdec'] = 'Desember';
-$labels['today'] = 'í dag';
+$labels['jan'] = 'jan';
+$labels['feb'] = 'feb';
+$labels['mar'] = 'mar';
+$labels['apr'] = 'apr';
+$labels['may'] = 'maí';
+$labels['longmay'] = 'maí';
+$labels['jun'] = 'jún';
+$labels['jul'] = 'júl';
+$labels['aug'] = 'ágú';
+$labels['sep'] = 'sep';
+$labels['oct'] = 'okt';
+$labels['nov'] = 'nóv';
+$labels['dec'] = 'des';
+$labels['longjan'] = 'janúar';
+$labels['longfeb'] = 'febrúar';
+$labels['longmar'] = 'mars';
+$labels['longapr'] = 'apríl';
+$labels['longjun'] = 'júní';
+$labels['longjul'] = 'júlí';
+$labels['longaug'] = 'ágúst';
+$labels['longsep'] = 'september';
+$labels['longoct'] = 'október';
+$labels['longnov'] = 'nóvember';
+$labels['longdec'] = 'desember';
+$labels['today'] = 'Í dag';
+$labels['refresh'] = 'Endurhlaða';
 $labels['checkmail'] = 'Gá að nýjum skeytum';
 $labels['compose'] = 'Semja skeyti';
 $labels['writenewmessage'] = 'Búa til nýtt skeyti';
+$labels['reply'] = 'Svara';
 $labels['replytomessage'] = 'Svara skeyti';
-$labels['replytoallmessage'] = 'Svara sendanda og öllum viðtakendum';
-$labels['forwardmessage'] = 'Framsenda skeyti';
+$labels['replytoallmessage'] = 'Svar til lista eða sendanda og allra viðtakenda';
+$labels['replyall'] = 'Svara öllum';
+$labels['replylist'] = 'Svar til lista';
+$labels['forward'] = 'Áframsenda';
+$labels['forwardinline'] = 'Áframsenda innan skeytis';
+$labels['forwardattachment'] = 'Áframsenda sem viðhengi';
+$labels['forwardmessage'] = 'Áframsenda skeyti';
 $labels['deletemessage'] = 'Eyða skeyti';
-$labels['movemessagetotrash'] = 'Færa skeyti í rusl';
+$labels['movemessagetotrash'] = 'Færa skeyti í ruslið';
 $labels['printmessage'] = 'Prenta skeyti';
 $labels['previousmessage'] = 'Sýna fyrra skeyti';
 $labels['firstmessage'] = 'Sýna fyrsta skeyti';
 $labels['nextmessage'] = 'Sýna næsta skeyti';
-$labels['lastmessage'] = 'Sýna síðasta skeytið';
+$labels['lastmessage'] = 'Sýna síðasta skeyti';
 $labels['backtolist'] = 'Til baka í skeytalista';
 $labels['viewsource'] = 'Skoða kóða';
+$labels['mark'] = 'Merki';
 $labels['markmessages'] = 'Merkja skeyti';
 $labels['markread'] = 'Sem lesin';
 $labels['markunread'] = 'Sem ólesin';
 $labels['markflagged'] = 'Sem flögguð';
 $labels['markunflagged'] = 'Sem óflögguð';
+$labels['moreactions'] = 'Fleiri aðgerðir...';
+$labels['more'] = 'Meira';
+$labels['back'] = 'Til baka';
+$labels['options'] = 'Valkostir';
 $labels['select'] = 'Velja';
 $labels['all'] = 'Allt';
 $labels['none'] = 'Ekkert';
 $labels['nonesort'] = 'Ekkert';
+$labels['currpage'] = 'Núverandi síða';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
+$labels['deleted'] = 'Eytt';
+$labels['invert'] = 'Umhverfa';
 $labels['filter'] = 'Sía';
+$labels['list'] = 'Listi';
+$labels['threads'] = 'Þræðir';
+$labels['expand-all'] = 'Þenja allt út';
+$labels['expand-unread'] = 'Þenja ólesið';
+$labels['collapse-all'] = 'Fella allt saman';
+$labels['threaded'] = 'Þrætt';
+$labels['autoexpand_threads'] = 'Þenja skeytaþræði út';
+$labels['do_expand'] = 'allir þræðir';
+$labels['expand_only_unread'] = 'aðeins ólesin skeyti';
+$labels['fromto'] = 'Frá/Til';
+$labels['flag'] = 'Flagg';
+$labels['attachment'] = 'Viðhengi';
+$labels['sentdate'] = 'Sendingardagur';
+$labels['arrival'] = 'Komudagur';
+$labels['asc'] = 'hækkandi';
+$labels['desc'] = 'lækkandi';
+$labels['listcolumns'] = 'Listadálkar';
+$labels['listsorting'] = 'Röðunardálkur';
+$labels['listorder'] = 'Röðun';
+$labels['listmode'] = 'Listayfirlit';
+$labels['folderactions'] = 'Möppuaðgerðir...';
 $labels['compact'] = 'Pakka';
 $labels['empty'] = 'Tæma';
 $labels['quota'] = 'Gagnamagn';
@@ -123,79 +164,155 @@ $labels['unknown'] = 'óþekkt';
 $labels['unlimited'] = 'ótakmarkað';
 $labels['quicksearch'] = 'Flýtileit';
 $labels['resetsearch'] = 'Tæma leit';
+$labels['searchmod'] = 'Leitarskilyrði';
+$labels['msgtext'] = 'Allt skeytið';
 $labels['openinextwin'] = 'Opna í nýjum glugga';
+$labels['emlsave'] = 'Niðurhlaða (.eml)';
+$labels['editasnew'] = 'Breyta sem nýju';
 $labels['savemessage'] = 'Vista drög';
 $labels['sendmessage'] = 'Senda skeytið núna';
 $labels['addattachment'] = 'Hengja við';
 $labels['charset'] = 'Stafasett';
 $labels['editortype'] = 'Gerð ritils';
 $labels['returnreceipt'] = 'Kvittun við lestur';
-$labels['checkspelling'] = 'Villuleita';
+$labels['dsn'] = 'Afhendingarstaða';
+$labels['mailreplyintro'] = 'Þann $date, $sender reit:';
+$labels['originalmessage'] = 'Upprunalegt skeyti';
+$labels['editidents'] = 'Breyta sjálfum';
+$labels['spellcheck'] = 'Stafsetning';
+$labels['checkspelling'] = 'Athuga stafsetningu';
 $labels['resumeediting'] = 'Aftur í ritham';
 $labels['revertto'] = 'Hverfa til';
+$labels['attach'] = 'Viðhengi';
 $labels['attachments'] = 'Viðhengi';
-$labels['upload'] = 'Senda';
+$labels['upload'] = 'Hlaða upp';
+$labels['uploadprogress'] = '$percent ($current af $total)';
 $labels['close'] = 'Loka';
+$labels['messageoptions'] = 'Skeytisvalmöguleikar...';
 $labels['low'] = 'Lágt';
 $labels['lowest'] = 'Lægst';
 $labels['normal'] = 'Venjulegt';
 $labels['high'] = 'Hátt';
 $labels['highest'] = 'Hæst';
-$labels['nosubject'] = '(ekkert efni)';
-$labels['showimages'] = 'Birta myndir';
+$labels['nosubject'] = '(án titils)';
+$labels['showimages'] = 'Sýna myndir';
 $labels['alwaysshow'] = 'Sýna alltaf myndir frá $sender';
+$labels['isdraft'] = 'Þetta eru drög að skeyti';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Einfaldur';
+$labels['plaintoggle'] = 'Venjulegur texti';
 $labels['savesentmessagein'] = 'Vista send skeyti í';
 $labels['dontsave'] = 'ekki vista';
 $labels['maxuploadsize'] = 'Leyfileg hámarksstærð skjals er $size';
 $labels['addcc'] = 'Bæta við Cc';
 $labels['addbcc'] = 'Bæta við Bcc';
 $labels['addreplyto'] = 'Bæta við Reply-To';
+$labels['addfollowupto'] = 'Nýtt svar við';
 $labels['mdnrequest'] = 'Sendandi þessa skeytið hefur óskað þess að þú látir vita að þú hafir lesið þetta skeyti. Viltu láta hann vita?';
 $labels['receiptread'] = 'Kvittun (lesa)';
 $labels['yourmessage'] = 'Þetta er kvittun fyrir skeytið';
 $labels['receiptnote'] = 'ATH: Þessi kvittun segir aðeins til um að skeytið kom upp á skjánum á viðtakanda. Það er engin sönnun um að hann hafi lesið eða skilið innihaldið.';
-$labels['name'] = 'Nafn til birtingar';
-$labels['firstname'] = 'Fornafn';
+$labels['name'] = 'Skjánafn';
+$labels['firstname'] = 'Eiginnafn';
 $labels['surname'] = 'Eftirnafn';
+$labels['middlename'] = 'Millinafn';
+$labels['nameprefix'] = 'Forskeyti';
+$labels['namesuffix'] = 'Viðskeyti';
+$labels['nickname'] = 'Stuttnefni';
+$labels['jobtitle'] = 'Starfstitill';
+$labels['department'] = 'Deild';
+$labels['gender'] = 'Kyn';
+$labels['maidenname'] = 'Ættarnafn móður';
 $labels['email'] = 'Netfang';
-$labels['addcontact'] = 'Bæta við nýju';
+$labels['phone'] = 'Sími';
+$labels['address'] = 'Heimilisfang';
+$labels['street'] = 'Götuheiti';
+$labels['locality'] = 'Staður';
+$labels['zipcode'] = 'Póstnúmer';
+$labels['region'] = 'Ríki/Fylki';
+$labels['country'] = 'Land';
+$labels['birthday'] = 'Afmælisdagur';
+$labels['anniversary'] = 'Afmæli';
+$labels['website'] = 'Vefur';
+$labels['instantmessenger'] = 'Spjall';
+$labels['notes'] = 'Glósur';
+$labels['male'] = 'karlkyns';
+$labels['female'] = 'kvenkyns';
+$labels['manager'] = 'Stjórnandi';
+$labels['assistant'] = 'Aðstoðarmaður';
+$labels['typeassistant'] = 'Aðstoðarmaður';
+$labels['spouse'] = 'Maki';
+$labels['allfields'] = 'Öll svæði';
+$labels['search'] = 'Leit';
+$labels['advsearch'] = 'Ítarleg leit';
+$labels['advanced'] = 'Flóknari stillingar';
+$labels['other'] = 'Annað';
+$labels['typeother'] = 'Annað';
+$labels['typehome'] = 'Heimamappa';
+$labels['typework'] = 'Vinnusími';
+$labels['typemobile'] = 'Farsími';
+$labels['typemain'] = 'Aðalstillingar';
+$labels['typehomefax'] = 'Heimafax';
+$labels['typeworkfax'] = 'Vinnufax';
+$labels['typecar'] = 'Bíll';
+$labels['typepager'] = 'Friðþjófur';
+$labels['typevideo'] = 'Myndband';
+$labels['typehomepage'] = 'Vefur';
+$labels['typeblog'] = 'Blogg';
+$labels['typeprofile'] = 'Mannlýsing';
+$labels['addfield'] = 'Bæta við svæði...';
+$labels['addcontact'] = 'Nýr tengiliður';
 $labels['editcontact'] = 'Lagfæra';
-$labels['edit'] = 'Laga';
+$labels['contacts'] = 'Tengiliðir';
+$labels['contactproperties'] = 'Eiginleikar';
+$labels['personalinfo'] = 'Persónulegar upplýsingar';
+$labels['edit'] = 'Breyta';
 $labels['cancel'] = 'Hætta við';
 $labels['save'] = 'Vista';
 $labels['delete'] = 'Eyða';
+$labels['rename'] = 'Endurnefna';
+$labels['addphoto'] = 'Bæta við';
+$labels['replacephoto'] = 'Skipta út';
 $labels['newcontact'] = 'Búa til nýtt nafnspjald';
-$labels['deletecontact'] = 'Eyða völdum netföngum';
+$labels['deletecontact'] = 'Eyða völdum tengiliðum';
 $labels['composeto'] = 'Skrifa skeyti til';
 $labels['contactsfromto'] = 'Netföng $from til $to af $count';
 $labels['print'] = 'Prenta';
 $labels['export'] = 'Flytja út';
 $labels['exportvcards'] = 'Flytja út nafnspjöld á vCard formi';
-$labels['previouspage'] = 'Sýni fyrri skammt';
-$labels['firstpage'] = 'Sýna fyrsta skammt';
-$labels['nextpage'] = 'Sýna næsta skammt';
-$labels['lastpage'] = 'Sýna síðasta skammt';
+$labels['newcontactgroup'] = 'Nýr tengiliðahópur';
+$labels['grouprename'] = 'Breyta nafni hóps';
+$labels['groupdelete'] = 'Fjarlægja hóp';
+$labels['previouspage'] = 'Sýna fyrri síðu';
+$labels['firstpage'] = 'Sýna fyrstu síðu';
+$labels['nextpage'] = 'Sýna næstu síðu';
+$labels['lastpage'] = 'Sýna síðustu síðu';
+$labels['group'] = 'Hópur';
 $labels['groups'] = 'Hópar';
 $labels['personaladrbook'] = 'Persónuleg heimilisföng';
+$labels['searchsave'] = 'Vista leit';
+$labels['searchdelete'] = 'Eyða leit';
 $labels['import'] = 'Flytja inn';
 $labels['importcontacts'] = 'Flytja inn nafnspjöld';
 $labels['importfromfile'] = 'Flytja inn af skrá';
+$labels['importtarget'] = 'Bæta nýjum tengiliðum við:';
 $labels['importreplace'] = 'Skipta út allri netfangaskránni';
 $labels['importtext'] = 'Þú getur flutt inn nafnspjöld frá núverandi netfangaskrá. <br/>Nú styðjum við innflutning á netföngum á <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> formi.';
-$labels['done'] = 'Afgreitt';
+$labels['done'] = 'Búið';
 $labels['settingsfor'] = 'Stillingar fyrir';
+$labels['about'] = 'Um forritið';
 $labels['preferences'] = 'Stillingar';
 $labels['userpreferences'] = 'Notendastillingar';
 $labels['editpreferences'] = 'Breyta notendastillingum';
-$labels['identities'] = 'Identities';
-$labels['manageidentities'] = 'Manage identities for this account';
-$labels['newidentity'] = 'New identity';
+$labels['identities'] = 'Auðkenni';
+$labels['manageidentities'] = 'Stjórna auðkennum þessa reiknings';
+$labels['newidentity'] = 'Nýtt auðkenni';
 $labels['newitem'] = 'Nýtt';
-$labels['edititem'] = 'Laga';
+$labels['edititem'] = 'Breyta';
 $labels['preferhtml'] = 'Vil HTML';
+$labels['defaultcharset'] = 'Venjulegt stafasett';
 $labels['htmlmessage'] = 'HTML skeyti';
+$labels['dateformat'] = 'Snið dagsetningar';
+$labels['timeformat'] = 'Tímasnið';
 $labels['prettydate'] = 'Fallegar dagsetningar';
 $labels['setdefault'] = 'Gera sjálfgilt';
 $labels['autodetect'] = 'Sjálfvirkt';
@@ -205,21 +322,25 @@ $labels['pagesize'] = 'Línur á síðu';
 $labels['signature'] = 'Undirskrift';
 $labels['dstactive'] = 'Sumar-/vetratími';
 $labels['htmleditor'] = 'Skrifa HTML-skeyti';
+$labels['htmlonreply'] = 'sem svar við HTML-skeytum aðeins';
 $labels['htmlsignature'] = 'HTML-undirskrift';
 $labels['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
 $labels['logoutclear'] = 'Tæma rusl við útskráningu';
-$labels['logoutcompact'] = 'Þjappa Innhólfi við útskráningu';
-$labels['uisettings'] = 'Notendasniðmát';
+$labels['logoutcompact'] = 'Þjappa innhólf við útskráningu';
+$labels['uisettings'] = 'Notandaviðmót';
 $labels['serversettings'] = 'Stillingar þjóns';
-$labels['mailboxview'] = 'Pósthólfs útlit';
-$labels['mdnrequests'] = 'Viðvaranir sendanda';
+$labels['mailboxview'] = 'Útlit pósthólfs';
+$labels['mdnrequests'] = 'Við beiðni um kvittun skeytis';
 $labels['askuser'] = 'spyrja notanda';
-$labels['autosend'] = 'senda sjálfkrafa';
+$labels['autosend'] = 'senda kvittun';
+$labels['autosendknown'] = 'senda kvittun til tengiliða minna, spyrja mig ella';
+$labels['autosendknownignore'] = 'senda kvittun til tengiliða minna, hunsa ella';
 $labels['ignore'] = 'hunsa';
 $labels['readwhendeleted'] = 'Merkja skeyti sem lesið þegar því er hent';
 $labels['flagfordeletion'] = 'Merkja skeyti til eyðingar í stað þess að eyða';
 $labels['skipdeleted'] = 'Ekki sýna eydd skeyti';
+$labels['deletealways'] = 'Ef ekki er hægt að setja skeytið í ruslafötuna, henda þeim';
 $labels['showremoteimages'] = 'Sýna myndir annarsstaðar frá';
 $labels['fromknownsenders'] = 'frá þekktum sendendum';
 $labels['always'] = 'alltaf';
@@ -228,28 +349,97 @@ $labels['autosavedraft'] = 'Vista sjálfkrafa sem drög';
 $labels['everynminutes'] = '$n mínútu fresti';
 $labels['keepalive'] = 'Athuga ný skeyti á';
 $labels['never'] = 'aldrei';
+$labels['immediately'] = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
 $labels['messagescomposition'] = 'Semja skeyti';
 $labels['mimeparamfolding'] = 'Nafn á viðhengjum';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['advancedoptions'] = 'Frekari möguleikar';
+$labels['2047folding'] = 'Full RFC 2047 (annað)';
+$labels['force7bit'] = 'Nota MIME kóðun fyrir 8-bita stafi';
+$labels['advancedoptions'] = 'Ítarlegir valkostir';
 $labels['focusonnewmessage'] = 'Láta glugga beinast að nýju skeyti';
 $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
+$labels['displaynext'] = 'Að eyðingu/færslu lokinni sýna næsta skeyti';
+$labels['defaultfont'] = 'Sjálfgefið letur HTML-skeyta';
+$labels['mainoptions'] = 'Aðalstillingar';
+$labels['section'] = 'Hluti';
+$labels['maintenance'] = 'Viðhald';
+$labels['newmessage'] = 'Nýtt skeyti';
+$labels['signatureoptions'] = 'Valkostir undirskriftar';
+$labels['whenreplying'] = 'Þegar svarað';
+$labels['replytopposting'] = 'hefja nýtt skeyti fyrir ofan eldra';
+$labels['replybottomposting'] = 'hefja nýtt skeyti undir eldra';
+$labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskrift úr skeyti';
+$labels['autoaddsignature'] = 'Bæta undirskrift við sjálfkrafa';
+$labels['newmessageonly'] = 'ný skeyti eingöngu';
+$labels['replyandforwardonly'] = 'svör og áframsendingar eingöngu';
+$labels['replysignaturepos'] = 'Þegar skeytum er svarað eða áframsend setja undirskrift';
+$labels['belowquote'] = 'undir tilvitnun';
+$labels['abovequote'] = 'fyrir ofan tilvitnun';
+$labels['insertsignature'] = 'Bæta undirskrift við';
+$labels['previewpanemarkread'] = 'Merka forskoðuð skeyti sem lesin';
+$labels['afternseconds'] = 'eftir $n sekúndur';
+$labels['reqmdn'] = 'Biðja ávallt um kvittun';
+$labels['reqdsn'] = 'Biðja ávallt um sendingarstöðu';
+$labels['replysamefolder'] = 'Setja svarskeyti í möppu sem upphaflegt skeyti er í';
+$labels['defaultaddressbook'] = 'Bæta nýjum tengiliðum við valda netfangaskrá';
+$labels['autocompletesingle'] = 'Sleppa aukanetföngum í sjálfklárun';
+$labels['listnamedisplay'] = 'Lista tengiliði sem';
+$labels['spellcheckbeforesend'] = 'Athuga stafsetningu áður en skeyti er sent';
+$labels['spellcheckoptions'] = 'Stafsetningarvalkostir';
+$labels['spellcheckignoresyms'] = 'Hunsa orð með merki';
+$labels['spellcheckignorenums'] = 'Hunsa orð með tölum';
+$labels['spellcheckignorecaps'] = 'Hunsa orð sem eru í hástöfum';
+$labels['addtodict'] = 'Bæta við orðalista';
 $labels['folder'] = 'Mappa';
 $labels['foldername'] = 'Nafn möppu';
 $labels['subscribed'] = 'Valin';
 $labels['messagecount'] = 'Skeyti';
 $labels['create'] = 'Búa til';
 $labels['createfolder'] = 'Búa til nýja möppu';
-$labels['managefolders'] = 'Sýsla með möppum';
+$labels['managefolders'] = 'Sýsla með möppur';
 $labels['specialfolders'] = 'Sérstakar möppur';
+$labels['properties'] = 'Eiginleikar';
+$labels['folderproperties'] = 'Eiginleikar möppu';
+$labels['parentfolder'] = 'Yfirmappa';
+$labels['location'] = 'Staðsetning';
+$labels['info'] = 'Upplýsingar';
+$labels['getfoldersize'] = 'Smelltu til að sjá stærð möppu';
+$labels['changesubscription'] = 'Smelltu til að breyta áskrift';
+$labels['foldertype'] = 'Möpputegund';
+$labels['personalfolder'] = 'Einkamappa';
+$labels['otherfolder'] = 'Möppur annara notenda';
+$labels['sharedfolder'] = 'Opin mappa';
 $labels['sortby'] = 'Raða eftir';
 $labels['sortasc'] = 'Raða vaxandi';
 $labels['sortdesc'] = 'Raða minnkandi';
+$labels['undo'] = 'Taka til baka';
+$labels['plugin'] = 'Viðbætur';
+$labels['version'] = 'Útgáfa';
+$labels['source'] = 'Uppruni';
+$labels['license'] = 'Notkunarleyfi';
+$labels['support'] = 'Fá aðstoð';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Enska';
+$labels['westerneuropean'] = 'Vesturevrópskt';
+$labels['easterneuropean'] = 'Austurevrópskt';
+$labels['southeasterneuropean'] = 'Suðausturevrópskt';
+$labels['baltic'] = 'Eystrasalts';
+$labels['cyrillic'] = 'Kýrílíska';
+$labels['arabic'] = 'Arabíska';
+$labels['greek'] = 'Gríska';
+$labels['hebrew'] = 'Hebreska';
+$labels['turkish'] = 'Tyrkneska';
+$labels['nordic'] = 'Norðurlanda';
+$labels['thai'] = 'Tælenskt';
+$labels['celtic'] = 'Keltneskt';
+$labels['vietnamese'] = 'Víetnamskt';
+$labels['japanese'] = 'Japanskt';
+$labels['korean'] = 'Kóreska';
+$labels['chinese'] = 'Kínverska';
 
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index caee7139f..b11734355 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -9,49 +9,50 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Takahiro Kambe <Unknown>                                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $labels = array();
-$labels['welcome'] = 'ようこそ $product へ';
+$labels['welcome'] = '$productにようこそ';
 $labels['username'] = 'ユーザー名';
 $labels['password'] = 'パスワード';
 $labels['server'] = 'サーバー';
 $labels['login'] = 'ログイン';
 $labels['logout'] = 'ログアウト';
-$labels['mail'] = 'メール';
-$labels['settings'] = '個人設定';
+$labels['mail'] = '電子メール';
+$labels['settings'] = '設定';
 $labels['addressbook'] = 'アドレス帳';
-$labels['inbox'] = '受信トレイ';
+$labels['inbox'] = '受信箱';
 $labels['drafts'] = '下書き';
-$labels['sent'] = '送信済みアイテム';
+$labels['sent'] = '送信済み';
 $labels['trash'] = 'ごみ箱';
 $labels['junk'] = '迷惑メール';
 $labels['subject'] = '件名';
-$labels['from'] = '差出人';
+$labels['from'] = '発信者';
 $labels['to'] = '宛先';
-$labels['cc'] = 'コピー';
-$labels['bcc'] = 'Bcc';
-$labels['replyto'] = '返信先の指定';
+$labels['cc'] = '写し(Cc)';
+$labels['bcc'] = '隠した写し(Bcc)';
+$labels['replyto'] = '返信先';
 $labels['followupto'] = 'Followup-To';
 $labels['date'] = '日付';
-$labels['size'] = '容量';
+$labels['size'] = '大きさ';
 $labels['priority'] = '優先度';
 $labels['organization'] = '企業名';
 $labels['readstatus'] = '閲覧の状態';
-$labels['mailboxlist'] = 'フォルダー一覧';
-$labels['folders'] = 'フォルダー一覧';
-$labels['messagesfromto'] = '表示中のメール: $from ～ $to (全: $count 件)';
-$labels['threadsfromto'] = '表示中のスレッド: $from ～ $to (全: $count 件)';
-$labels['messagenrof'] = '現在のメール: $nr (全: $count 件)';
+$labels['mailboxlist'] = 'フォルダー';
+$labels['folders'] = 'フォルダー';
+$labels['messagesfromto'] = '$count通の$from通目から$to通目のメッセージ';
+$labels['threadsfromto'] = '$count通の$from通目から$to通目のスレッド';
+$labels['messagenrof'] = '$count通の$nr通目のメッセージ';
+$labels['fromtoshort'] = '$count通の$from通目から$to通目';
 $labels['copy'] = 'コピー';
 $labels['move'] = '移動';
-$labels['moveto'] = 'フォルダーの移動';
+$labels['moveto'] = 'フォルダーに移動';
 $labels['download'] = 'ダウンロード';
 $labels['filename'] = 'ファイル名';
-$labels['filesize'] = 'ファイル サイズ';
+$labels['filesize'] = 'ファイルの大きさ';
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
 $labels['sun'] = '日';
 $labels['mon'] = '月';
@@ -67,63 +68,70 @@ $labels['wednesday'] = '水曜日';
 $labels['thursday'] = '木曜日';
 $labels['friday'] = '金曜日';
 $labels['saturday'] = '土曜日';
-$labels['jan'] = '1 月';
-$labels['feb'] = '2 月';
-$labels['mar'] = '3 月';
-$labels['apr'] = '4 月';
-$labels['may'] = '5 月';
-$labels['longmay'] = '5 月';
-$labels['jun'] = '6 月';
-$labels['jul'] = '7 月';
-$labels['aug'] = '8 月';
-$labels['sep'] = '9 月';
-$labels['oct'] = '10 月';
-$labels['nov'] = '11 月';
-$labels['dec'] = '12 月';
-$labels['longjan'] = '1 月';
-$labels['longfeb'] = '2 月';
-$labels['longmar'] = '3 月';
-$labels['longapr'] = '4 月';
-$labels['longjun'] = '6 月';
-$labels['longjul'] = '7 月';
-$labels['longaug'] = '8 月';
-$labels['longsep'] = '9 月';
-$labels['longoct'] = '10 月';
-$labels['longnov'] = '11 月';
-$labels['longdec'] = '12 月';
+$labels['jan'] = '1月';
+$labels['feb'] = '2月';
+$labels['mar'] = '3月';
+$labels['apr'] = '4月';
+$labels['may'] = '5月';
+$labels['longmay'] = '5月';
+$labels['jun'] = '6月';
+$labels['jul'] = '7月';
+$labels['aug'] = '8月';
+$labels['sep'] = '9月';
+$labels['oct'] = '10月';
+$labels['nov'] = '11月';
+$labels['dec'] = '12月';
+$labels['longjan'] = '1月';
+$labels['longfeb'] = '2月';
+$labels['longmar'] = '3月';
+$labels['longapr'] = '4月';
+$labels['longjun'] = '6月';
+$labels['longjul'] = '7月';
+$labels['longaug'] = '8月';
+$labels['longsep'] = '9月';
+$labels['longoct'] = '10月';
+$labels['longnov'] = '11月';
+$labels['longdec'] = '12月';
 $labels['today'] = '今日';
-$labels['checkmail'] = '新着の確認';
-$labels['compose'] = 'メールの作成';
-$labels['writenewmessage'] = '新規メールの作成';
-$labels['replytomessage'] = '返信';
-$labels['replytoallmessage'] = '差出人とすべての宛先に返信';
+$labels['refresh'] = '再読込み';
+$labels['checkmail'] = '新しく届いたメッセージを確認';
+$labels['compose'] = 'メッセージを作成';
+$labels['writenewmessage'] = '新しいメッセージを作成';
+$labels['reply'] = '返信';
+$labels['replytomessage'] = '送信者に返信';
+$labels['replytoallmessage'] = 'メーリングリスト、または送信者とすべての宛先に返信';
 $labels['replyall'] = '全員に返信';
-$labels['replylist'] = 'ML に返信';
+$labels['replylist'] = 'メーリングリストに返信';
+$labels['forward'] = '転送';
 $labels['forwardinline'] = '本文に挿入して転送';
-$labels['forwardattachment'] = '添付形式で転送';
-$labels['forwardmessage'] = '転送';
-$labels['deletemessage'] = '削除';
+$labels['forwardattachment'] = '添付ファイルとして転送';
+$labels['forwardmessage'] = 'メッセージを転送';
+$labels['deletemessage'] = 'メッセージを削除';
 $labels['movemessagetotrash'] = 'ごみ箱に移動';
-$labels['printmessage'] = '印刷';
-$labels['previousmessage'] = '前のメールへ';
-$labels['firstmessage'] = '最初のメールへ';
-$labels['nextmessage'] = '次のメールへ';
-$labels['lastmessage'] = '最後のメールへ';
-$labels['backtolist'] = '一覧に戻る';
-$labels['viewsource'] = 'ソースの表示';
+$labels['printmessage'] = 'メッセージを印刷';
+$labels['previousmessage'] = '前のメッセージを表示';
+$labels['firstmessage'] = '最初のメッセージを表示';
+$labels['nextmessage'] = '次のメッセージを表示';
+$labels['lastmessage'] = '最後のメッセージを表示';
+$labels['backtolist'] = 'メッセージの一覧に戻る';
+$labels['viewsource'] = 'ソースを表示';
+$labels['mark'] = 'マーク';
 $labels['markmessages'] = 'マークを付ける';
-$labels['markread'] = '既読にする';
-$labels['markunread'] = '未読にする';
-$labels['markflagged'] = 'フラグを付ける';
-$labels['markunflagged'] = 'フラグを外す';
+$labels['markread'] = '既読に設定';
+$labels['markunread'] = '未読に設定';
+$labels['markflagged'] = 'フラグを設定';
+$labels['markunflagged'] = 'フラグを解除';
 $labels['moreactions'] = 'その他の操作...';
+$labels['more'] = '続く';
+$labels['back'] = '戻る';
+$labels['options'] = 'オプション';
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
 $labels['nonesort'] = 'なし';
 $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
-$labels['flagged'] = 'フラグあり';
+$labels['flagged'] = 'フラグ付き';
 $labels['unanswered'] = '未返信';
 $labels['deleted'] = '削除済み';
 $labels['invert'] = '反転';
@@ -131,283 +139,287 @@ $labels['filter'] = 'フィルター';
 $labels['list'] = '一覧';
 $labels['threads'] = 'スレッド';
 $labels['expand-all'] = 'すべて展開';
-$labels['expand-unread'] = '未開封のメールを展開';
+$labels['expand-unread'] = '未開封のメッセージを展開';
 $labels['collapse-all'] = 'すべて折りたたむ';
-$labels['threaded'] = 'スレッドにする';
-$labels['autoexpand_threads'] = 'スレッドの展開';
+$labels['threaded'] = 'スレッド化';
+$labels['autoexpand_threads'] = 'メッセージのスレッドを展開';
 $labels['do_expand'] = 'すべてのスレッド';
-$labels['expand_only_unread'] = '未開封のメールのみ';
-$labels['fromto'] = '送信者 / 宛先';
+$labels['expand_only_unread'] = '未読のメッセージだけ';
+$labels['fromto'] = '発信者/宛先';
 $labels['flag'] = 'フラグ';
 $labels['attachment'] = '添付ファイル';
 $labels['sentdate'] = '送信日';
 $labels['arrival'] = '受信日';
 $labels['asc'] = '昇順';
 $labels['desc'] = '降順';
-$labels['listcolumns'] = '列の一覧';
-$labels['listsorting'] = '整列基準';
-$labels['listorder'] = '整列順';
+$labels['listcolumns'] = '列を一覧';
+$labels['listsorting'] = '並べ替える列';
+$labels['listorder'] = '並べ替える順序';
 $labels['listmode'] = '一覧表示モード';
 $labels['folderactions'] = 'フォルダーの操作...';
-$labels['compact'] = 'コンパクト';
+$labels['compact'] = '圧縮';
 $labels['empty'] = '空';
-$labels['quota'] = 'ディスク使用量';
+$labels['quota'] = 'ディスクの使用状況';
 $labels['unknown'] = '不明';
 $labels['unlimited'] = '無制限';
-$labels['quicksearch'] = '検索';
-$labels['resetsearch'] = '検索解除';
-$labels['searchmod'] = '検索条件';
-$labels['msgtext'] = 'すべてのメール';
+$labels['quicksearch'] = '高速検索';
+$labels['resetsearch'] = '検索を解除';
+$labels['searchmod'] = '検索の条件';
+$labels['msgtext'] = 'メッセージの全体';
 $labels['openinextwin'] = '新しいウィンドウで開く';
-$labels['emlsave'] = 'eml 形式で保存する';
-$labels['editasnew'] = '新規として編集';
-$labels['savemessage'] = '下書きに保存';
-$labels['sendmessage'] = '今すぐ送信';
-$labels['addattachment'] = 'ファイルの添付';
-$labels['charset'] = '文字エンコード';
+$labels['emlsave'] = 'ダウンロード(.eml形式)';
+$labels['editasnew'] = '新しいメッセージとして編集';
+$labels['savemessage'] = '下書きとして保存';
+$labels['sendmessage'] = 'メッセージを送信';
+$labels['addattachment'] = 'ファイルを添付';
+$labels['charset'] = '文字セット';
 $labels['editortype'] = 'エディターの種類';
 $labels['returnreceipt'] = '開封確認';
-$labels['dsn'] = '配送状況の通知';
-$labels['mailreplyintro'] = '$date に $sender が書きました:';
+$labels['dsn'] = '配送状態通知';
+$labels['mailreplyintro'] = '$date に $sender さんは書きました:';
 $labels['originalmessage'] = '元のメッセージ';
-$labels['editidents'] = '個人情報の編集';
-$labels['checkspelling'] = 'スペル チェック';
-$labels['resumeediting'] = 'メール作成に戻る';
+$labels['editidents'] = '識別情報を編集';
+$labels['spellcheck'] = 'スペル';
+$labels['checkspelling'] = 'スペルチェック';
+$labels['resumeediting'] = '編集を再開';
 $labels['revertto'] = '元に戻す';
+$labels['attach'] = '添付';
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close'] = '閉じる';
 $labels['messageoptions'] = 'メッセージのオプション...';
-$labels['low'] = '低い';
+$labels['low'] = '低';
 $labels['lowest'] = '最低';
 $labels['normal'] = '通常';
-$labels['high'] = '高い';
+$labels['high'] = '高';
 $labels['highest'] = '最高';
 $labels['nosubject'] = '(件名なし)';
-$labels['showimages'] = '画像の表示';
+$labels['showimages'] = '画像を表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
 $labels['isdraft'] = 'これは下書きのメッセージです。';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
-$labels['savesentmessagein'] = '送信済みメールの保存先';
+$labels['savesentmessagein'] = '送信したメッセージの保存先';
 $labels['dontsave'] = '保存しない';
-$labels['maxuploadsize'] = '添付可能なファイルのサイズは最大 $size です。';
-$labels['addcc'] = 'Cc 追加';
-$labels['addbcc'] = 'Bcc 追加';
-$labels['addreplyto'] = 'Reply-To 追加';
-$labels['addfollowupto'] = 'Followup-To 追加';
-$labels['mdnrequest'] = 'メールの差出人は開封確認の送付を求めています。開封確認のメールを送付しますか?';
-$labels['receiptread'] = '開封確認 (表示済み)';
-$labels['yourmessage'] = 'これはあなたが送信したメールに対する開封確認です。';
-$labels['receiptnote'] = '注意: この開封確認はメールが受信者に表示されたことの通知です。受信者がメールを読んだこと、内容を理解したことを保証するものではありません。';
+$labels['maxuploadsize'] = '添付可能なファイルは最大で$sizeです。';
+$labels['addcc'] = '写し(Cc)を追加';
+$labels['addbcc'] = '隠した写し(Bcc)を追加';
+$labels['addreplyto'] = '返信先(Reply-To)を追加';
+$labels['addfollowupto'] = 'フォロー先(Followup-Toを追加';
+$labels['mdnrequest'] = 'このメッセージを読んだときに、送信者が通知を受けたいと依頼しています。開封確認の通知を送信しますか?';
+$labels['receiptread'] = '開封確認(表示済み)';
+$labels['yourmessage'] = 'これはあなたが送信したメッセージに対する開封確認です。';
+$labels['receiptnote'] = '注意: この開封確認は、メッセージが宛先のコンピューターで表示されたことだけを知らせるものです。受信者がメッセージを読んだり、内容を理解したと保証するものではありません。';
 $labels['name'] = '表示名';
-$labels['firstname'] = '名 (ファーストネーム)';
-$labels['surname'] = '姓 (ラストネーム)';
+$labels['firstname'] = '名';
+$labels['surname'] = '姓';
 $labels['middlename'] = 'ミドルネーム';
-$labels['nameprefix'] = '敬称 (名前の前)';
-$labels['namesuffix'] = '敬称 (名前の後)';
+$labels['nameprefix'] = '敬称(名前の前)';
+$labels['namesuffix'] = '敬称(名前の後)';
 $labels['nickname'] = 'ニックネーム';
-$labels['jobtitle'] = '肩書き';
+$labels['jobtitle'] = '職名';
 $labels['department'] = '部署名';
 $labels['gender'] = '性別';
 $labels['maidenname'] = '旧姓';
-$labels['email'] = 'メールアドレス';
+$labels['email'] = '電子メール';
 $labels['phone'] = '電話番号';
 $labels['address'] = '住所';
-$labels['street'] = '通り';
+$labels['street'] = '住所';
 $labels['locality'] = '都市';
 $labels['zipcode'] = '郵便番号';
-$labels['region'] = '州';
+$labels['region'] = '都道府県';
 $labels['country'] = '国';
 $labels['birthday'] = '誕生日';
 $labels['anniversary'] = '記念日';
 $labels['website'] = 'ウェブサイト';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'メモ';
+$labels['instantmessenger'] = 'インスタントメッセージ';
+$labels['notes'] = '注釈';
 $labels['male'] = '男性';
 $labels['female'] = '女性';
 $labels['manager'] = '管理者';
 $labels['assistant'] = 'アシスタント';
 $labels['typeassistant'] = 'アシスタント';
 $labels['spouse'] = '配偶者';
-$labels['allfields'] = '全項目';
+$labels['allfields'] = 'すべての項目';
 $labels['search'] = '検索';
 $labels['advsearch'] = '高度な検索';
-$labels['other'] = '他';
-$labels['typeother'] = '他';
+$labels['advanced'] = '高度';
+$labels['other'] = 'その他';
+$labels['typeother'] = 'その他';
 $labels['typehome'] = '自宅';
 $labels['typework'] = '職場';
 $labels['typemobile'] = 'モバイル';
-$labels['typemain'] = '主要回線';
-$labels['typehomefax'] = '自宅 Fax';
-$labels['typeworkfax'] = '職場 Fax';
+$labels['typemain'] = '主回線';
+$labels['typehomefax'] = '自宅ファクス';
+$labels['typeworkfax'] = '職場のFax';
 $labels['typecar'] = '車';
-$labels['typepager'] = 'ポケベル(ページャー)';
-$labels['typevideo'] = 'ビデオ';
+$labels['typepager'] = 'ページャー(ポケットベル)';
+$labels['typevideo'] = '動画';
 $labels['typehomepage'] = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
-$labels['addfield'] = '項目の追加...';
-$labels['addcontact'] = '連絡先の新規追加';
-$labels['editcontact'] = '連絡先の編集';
+$labels['addfield'] = '項目を追加...';
+$labels['addcontact'] = '新しい連絡先を追加';
+$labels['editcontact'] = '連絡先を編集';
 $labels['contacts'] = '連絡先';
-$labels['contactproperties'] = '連絡先のプロパティ';
+$labels['contactproperties'] = '連絡先の属性';
 $labels['personalinfo'] = '個人情報';
 $labels['edit'] = '編集';
-$labels['cancel'] = 'キャンセル';
+$labels['cancel'] = '取り消し';
 $labels['save'] = '保存';
 $labels['delete'] = '削除';
-$labels['rename'] = '名前の変更';
+$labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
-$labels['replacephoto'] = '置換';
-$labels['newcontact'] = '連絡先の新規作成';
-$labels['deletecontact'] = '連絡先の削除';
-$labels['composeto'] = 'この連絡先へメールの送信';
-$labels['contactsfromto'] = '連絡先: $from ～ $to (全: $count 件)';
+$labels['replacephoto'] = '置き換え';
+$labels['newcontact'] = '新しい連絡先カードを作成';
+$labels['deletecontact'] = '選択した連絡先を削除';
+$labels['composeto'] = 'この連絡先宛にメッセージを作成';
+$labels['contactsfromto'] = '$count件の連絡先の$from件目から$to件目';
 $labels['print'] = '印刷';
 $labels['export'] = 'エクスポート';
-$labels['exportvcards'] = 'vCard 形式でエクスポート';
-$labels['newcontactgroup'] = '連絡先グループの新規作成';
-$labels['grouprename'] = 'グループ名の変更';
-$labels['groupdelete'] = 'グループの削除';
-$labels['previouspage'] = '前のページへ';
-$labels['firstpage'] = '最初のページへ';
-$labels['nextpage'] = '次のページへ';
-$labels['lastpage'] = '最後のページへ';
+$labels['exportvcards'] = 'vCard形式でエクスポート';
+$labels['newcontactgroup'] = '連絡先グループを新しく作成';
+$labels['grouprename'] = 'グループ名を変更';
+$labels['groupdelete'] = 'グループを削除';
+$labels['previouspage'] = '前のページを表示';
+$labels['firstpage'] = '最初のページを表示';
+$labels['nextpage'] = '次のページを表示';
+$labels['lastpage'] = '最後のページを表示';
 $labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
-$labels['personaladrbook'] = '個人アドレス';
-$labels['searchsave'] = '検索情報の保存';
-$labels['searchdelete'] = '検索情報の削除';
+$labels['personaladrbook'] = '個人の住所';
+$labels['searchsave'] = '検索情報を保存';
+$labels['searchdelete'] = '検索情報を削除';
 $labels['import'] = 'インポート';
-$labels['importcontacts'] = '連絡先のインポート';
-$labels['importfromfile'] = 'インポートするファイル:';
-$labels['importtarget'] = 'アドレス帳へ新規連絡先の追加:';
-$labels['importreplace'] = '現在のアドレス帳と置き換える';
-$labels['importtext'] = '既存のアドレス帳の連絡先をアップロードできます。現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 形式からのインポートに対応しています。';
+$labels['importcontacts'] = '連絡先をインポート';
+$labels['importfromfile'] = 'ファイルからインポート';
+$labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
+$labels['importreplace'] = 'アドレス帳全体と置き換え';
+$labels['importtext'] = '既存のアドレス帳から連絡先をアップロードできます。現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 形式からのインポートに対応しています。';
 $labels['done'] = '完了';
 $labels['settingsfor'] = '次の設定:';
-$labels['about'] = 'Roundcube Webmail について';
+$labels['about'] = 'Roundcube Webmailについて';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = 'ユーザー設定';
-$labels['editpreferences'] = 'ユーザー設定の変更';
-$labels['identities'] = '個人情報';
-$labels['manageidentities'] = 'アカウントの個人情報管理';
-$labels['newidentity'] = '個人情報の新規作成';
+$labels['editpreferences'] = 'ユーザー設定を変更';
+$labels['identities'] = '識別情報';
+$labels['manageidentities'] = 'このアカウントの識別情報を管理';
+$labels['newidentity'] = '新しい識別情報';
 $labels['newitem'] = '新しい項目';
 $labels['edititem'] = '項目の編集';
-$labels['preferhtml'] = 'HTML を表示する';
-$labels['defaultcharset'] = '標準の文字セット';
-$labels['htmlmessage'] = 'HTML メール';
+$labels['preferhtml'] = 'HTMLを表示';
+$labels['defaultcharset'] = '初期設定の文字セット';
+$labels['htmlmessage'] = 'HTMLメッセージ';
 $labels['dateformat'] = '日付の書式';
-$labels['timeformat'] = '時間の書式';
+$labels['timeformat'] = '時刻の書式';
 $labels['prettydate'] = '短い日付で表示';
-$labels['setdefault'] = '標準の設定';
+$labels['setdefault'] = '初期値を設定';
 $labels['autodetect'] = '自動識別';
 $labels['language'] = '言語';
 $labels['timezone'] = 'タイムゾーン';
-$labels['pagesize'] = '1 ページの表示件数';
+$labels['pagesize'] = '1ページの表示件数';
 $labels['signature'] = '署名';
-$labels['dstactive'] = 'サマータイムを適用する';
-$labels['htmleditor'] = '新規メールでは HTML を標準にする';
-$labels['htmlonreply'] = 'メールの返信時は常に HTML を使用する';
-$labels['htmlsignature'] = '署名に HTML タグを使用する';
-$labels['previewpane'] = 'プレビュー ペインを表示する';
-$labels['skin'] = 'スキン';
-$labels['logoutclear'] = 'ログアウト時にごみ箱を空にする';
-$labels['logoutcompact'] = 'ログアウト時にフォルダーを整理する';
-$labels['uisettings'] = 'ユーザー インターフェース';
+$labels['dstactive'] = 'サマータイムを適用';
+$labels['htmleditor'] = '作成時にHTMLメッセージを使用';
+$labels['htmlonreply'] = '返信時にHTMLメッセージを使用';
+$labels['htmlsignature'] = 'HTMLの署名';
+$labels['previewpane'] = 'プレビュー枠の表示';
+$labels['skin'] = 'インターフェイスのスキン';
+$labels['logoutclear'] = 'ログアウト時にごみ箱の内容を消去';
+$labels['logoutcompact'] = 'ログアウト時にフォルダーを整理';
+$labels['uisettings'] = 'ユーザーインターフェイス';
 $labels['serversettings'] = 'サーバーの設定';
 $labels['mailboxview'] = '受信箱';
-$labels['mdnrequests'] = '開封確認の送信要求時';
-$labels['askuser'] = '開封確認メールの送信を確認する';
-$labels['autosend'] = '開封確認メールを送信する';
-$labels['autosendknown'] = '差出人が連絡先に登録されていれば開封確認を送信し、それ以外は問い合わせる';
-$labels['autosendknownignore'] = '差出人が連絡先に登録されていれば開封確認を送信し、それ以外は無視する';
+$labels['mdnrequests'] = '開封確認の要求の処理';
+$labels['askuser'] = '開封確認の送信を確認';
+$labels['autosend'] = '開封確認を送信';
+$labels['autosendknown'] = '送信者が連絡先に登録されていれば送信、それ以外は確認';
+$labels['autosendknownignore'] = '送信者が連絡先に登録されていれば送信、それ以外は無視';
 $labels['ignore'] = '無視';
-$labels['readwhendeleted'] = '削除したメールを既読にする';
-$labels['flagfordeletion'] = '実際に削除せずに削除済みフラグを付ける';
-$labels['skipdeleted'] = '削除済みメールを表示しない';
-$labels['deletealways'] = 'ごみ箱への移動に失敗したメールはすぐに削除';
-$labels['showremoteimages'] = '外部 URL の画像をインライン表示する';
+$labels['readwhendeleted'] = '削除したメッセージを既読に設定';
+$labels['flagfordeletion'] = '削除する代わりに削除済みフラグを設定';
+$labels['skipdeleted'] = '削除済みのメッセージを表示しない';
+$labels['deletealways'] = 'ごみ箱への移動できなかったメッセージは削除';
+$labels['showremoteimages'] = '外部のインライン画像を表示';
 $labels['fromknownsenders'] = '送信者が知人の場合';
-$labels['always'] = '常に';
-$labels['showinlineimages'] = 'メールに添付された画像を表示する';
-$labels['autosavedraft'] = '自動的に下書きを保存する';
-$labels['everynminutes'] = '$n 分毎';
-$labels['keepalive'] = '新着メールの確認間隔';
+$labels['always'] = '常時';
+$labels['showinlineimages'] = 'メッセージに添付された画像を下に表示';
+$labels['autosavedraft'] = '自動的に下書きを保存';
+$labels['everynminutes'] = '$n分毎';
+$labels['keepalive'] = '新着メッセージを確認する間隔';
 $labels['never'] = 'しない';
-$labels['immediately'] = 'すぐに';
-$labels['messagesdisplaying'] = 'メールの表示';
-$labels['messagescomposition'] = 'メールの作成';
-$labels['mimeparamfolding'] = '添付ファイル名';
-$labels['2231folding'] = 'RFC 2231 準拠 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'RFC 2047 準拠 (他のメーラー)';
-$labels['force7bit'] = 'マルチバイト文字列を MIME エンコードする';
+$labels['immediately'] = '即時';
+$labels['messagesdisplaying'] = 'メッセージを表示';
+$labels['messagescomposition'] = 'メッセージを作成';
+$labels['mimeparamfolding'] = '添付ファイルの名前';
+$labels['2231folding'] = 'RFC 2231に完全準拠(Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231(MS Outlook)';
+$labels['2047folding'] = 'RFC 2047に完全準拠(その他)';
+$labels['force7bit'] = '8ビット文字列にMIMEエンコードを使用';
 $labels['advancedoptions'] = '高度な設定';
-$labels['focusonnewmessage'] = '新着メールが届いたらブラウザーをアクティブにする';
-$labels['checkallfolders'] = '全フォルダーで新着メールを表示する';
-$labels['displaynext'] = 'メールの削除や移動後に次のメールを表示する';
-$labels['defaultfont'] = 'HTML メッセージの初期フォント';
-$labels['mainoptions'] = '基本設定';
+$labels['focusonnewmessage'] = '新しいメッセージが届いたらブラウザーをアクティブ';
+$labels['checkallfolders'] = 'すべてのフォルダーで新着メールを表示';
+$labels['displaynext'] = 'メッセージを削除や移動した後で次のメッセージを表示';
+$labels['defaultfont'] = 'HTMLメッセージの初期フォント';
+$labels['mainoptions'] = '基本的な設定';
 $labels['section'] = '設定項目';
-$labels['maintenance'] = 'メンテナンス設定';
-$labels['newmessage'] = '新着メール設定';
+$labels['maintenance'] = '保守';
+$labels['newmessage'] = '新しいメッセージ';
 $labels['signatureoptions'] = '署名の設定';
 $labels['whenreplying'] = '返信時の本文';
-$labels['replytopposting'] = '元のメッセージ引用部の前に本文を作成する';
-$labels['replybottomposting'] = '元のメッセージ引用部の後に本文を作成する';
-$labels['replyremovesignature'] = '返信時にメッセージからオリジナルの署名を除去する';
-$labels['autoaddsignature'] = '自動的に署名を付加する';
-$labels['newmessageonly'] = '新規作成時のみ';
-$labels['replyandforwardonly'] = '返信・転送時のみ';
-$labels['replysignaturepos'] = '返信・転送時に署名を挿入する位置';
-$labels['belowquote'] = '引用部の後';
-$labels['abovequote'] = '引用部の前';
-$labels['insertsignature'] = '署名の挿入';
-$labels['previewpanemarkread'] = '開封済みにする';
-$labels['afternseconds'] = '$n 秒後';
-$labels['reqmdn'] = '常に開封確認通知を要求する';
-$labels['reqdsn'] = '常に配送状況の通知を要求する';
-$labels['replysamefolder'] = '返信されたメールを返信元メールと同じフォルダに保存';
-$labels['defaultaddressbook'] = '次のアドレス帳に新規連絡先を追加する';
-$labels['autocompletesingle'] = '自動補完で代替メールアドレスを飛ばす';
-$labels['spellcheckbeforesend'] = 'メールの送信前にスペル チェック';
+$labels['replytopposting'] = '元のメッセージを引用した前に本文を作成';
+$labels['replybottomposting'] = '元のメッセージを引用した後に本文を作成';
+$labels['replyremovesignature'] = '返信時に元の署名をメッセージから削除';
+$labels['autoaddsignature'] = '自動的に署名を付加';
+$labels['newmessageonly'] = '新しいメッセージだけ';
+$labels['replyandforwardonly'] = '返信と転送だけ';
+$labels['replysignaturepos'] = '返信や転送で署名を挿入する位置';
+$labels['belowquote'] = '引用の後';
+$labels['abovequote'] = '引用の前';
+$labels['insertsignature'] = '署名を挿入';
+$labels['previewpanemarkread'] = 'プレビューしたメッセージを既読に設定';
+$labels['afternseconds'] = '$n秒後';
+$labels['reqmdn'] = '常に開封確認通知を要求';
+$labels['reqdsn'] = '常に配送状態通知を要求';
+$labels['replysamefolder'] = '返信したメッセージを元のメールと同じフォルダに保存';
+$labels['defaultaddressbook'] = '選択したアドレス帳に新しい連絡先を追加';
+$labels['autocompletesingle'] = '自動補完で代替のメールアドレスを飛ばして進める';
+$labels['listnamedisplay'] = '連絡先の一覧表示';
+$labels['spellcheckbeforesend'] = 'メッセージを送信する前にスペルチェック';
 $labels['spellcheckoptions'] = 'スペルチェックのオプション';
-$labels['spellcheckignoresyms'] = '記号の単語を無視する';
-$labels['spellcheckignorenums'] = '数字の単語を無視する';
-$labels['spellcheckignorecaps'] = 'すべて大文字の単語を無視する';
+$labels['spellcheckignoresyms'] = '記号を含む単語を無視';
+$labels['spellcheckignorenums'] = '数字を含む単語を無視';
+$labels['spellcheckignorecaps'] = 'すべて大文字の単語を無視';
 $labels['addtodict'] = '辞書に追加';
 $labels['folder'] = 'フォルダー';
 $labels['foldername'] = 'フォルダー名';
 $labels['subscribed'] = '購読済み';
-$labels['messagecount'] = 'メール';
+$labels['messagecount'] = 'メッセージ';
 $labels['create'] = '作成';
-$labels['createfolder'] = 'フォルダーの新規作成';
-$labels['managefolders'] = 'フォルダーの管理';
+$labels['createfolder'] = '新しいフォルダーを作成';
+$labels['managefolders'] = 'フォルダーを管理';
 $labels['specialfolders'] = '特殊なフォルダー';
-$labels['properties'] = 'プロパティ';
-$labels['folderproperties'] = 'フォルダーのプロパティ';
-$labels['parentfolder'] = '親フォルダー';
+$labels['properties'] = '属性';
+$labels['folderproperties'] = 'フォルダーの属性';
+$labels['parentfolder'] = '親のフォルダー';
 $labels['location'] = '場所';
 $labels['info'] = '情報';
-$labels['getfoldersize'] = 'クリックでフォルダー サイズの取得';
-$labels['changesubscription'] = 'クリックで購読の変更';
+$labels['getfoldersize'] = 'クリックしてフォルダーの大きさを取得';
+$labels['changesubscription'] = 'クリックして購読状態を変更';
 $labels['foldertype'] = 'フォルダーの種類';
 $labels['personalfolder'] = '個人フォルダー';
 $labels['otherfolder'] = '他のユーザーのフォルダー';
 $labels['sharedfolder'] = '公開フォルダー';
-$labels['sortby'] = '並び替えの基準';
-$labels['sortasc'] = '昇順で並び替え';
-$labels['sortdesc'] = '降順で並び替え';
+$labels['sortby'] = '並べ替え';
+$labels['sortasc'] = '昇順で並べ替え';
+$labels['sortdesc'] = '降順で並べ替え';
 $labels['undo'] = '取り消し';
 $labels['plugin'] = 'プラグイン';
 $labels['version'] = 'バージョン';
 $labels['source'] = 'ソース';
 $labels['license'] = 'ライセンス';
-$labels['support'] = 'ヘルプを受ける';
+$labels['support'] = 'サポートを得る';
 $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -417,8 +429,8 @@ $labels['english'] = '英語';
 $labels['westerneuropean'] = '西ヨーロッパ言語';
 $labels['easterneuropean'] = '東ヨーロッパ言語';
 $labels['southeasterneuropean'] = '南東ヨーロッパ言語';
-$labels['baltic'] = 'バルト言語';
-$labels['cyrillic'] = 'キリル言語';
+$labels['baltic'] = 'バルト諸語';
+$labels['cyrillic'] = 'キリル文字';
 $labels['arabic'] = 'アラビア語';
 $labels['greek'] = 'ギリシャ語';
 $labels['hebrew'] = 'ヘブライ語';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 74a7e3755..09873ff74 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -9,127 +9,128 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Takahiro Kambe <Unknown>                                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ログインに失敗しました。';
-$messages['cookiesdisabled'] = 'ブラウザーで Cookie が無効に設定されています。';
-$messages['sessionerror'] = 'セッションが正しくないか期限切れです。';
+$messages['loginfailed'] = 'ログインできませんでした。';
+$messages['cookiesdisabled'] = 'ブラウザーがCookieを受け付けません。';
+$messages['sessionerror'] = 'セッションが正しくないか期限が切れています。';
 $messages['storageerror'] = 'IMAP サーバーへの接続に失敗しました。';
-$messages['servererror'] = 'サーバーでエラーが発生しました。';
-$messages['servererrormsg'] = 'サーバー エラー: $msg';
+$messages['servererror'] = 'サーバーでエラーです!';
+$messages['servererrormsg'] = 'サーバーエラー: $msg';
 $messages['dberror'] = 'データベースのエラーです!';
-$messages['errorreadonly'] = '実行に失敗しました。フォルダーは読み込み専用です。';
-$messages['errornoperm'] = '実行に失敗しました。権限がありません。';
-$messages['invalidrequest'] = '不正なリクエストです。データは保存されませんでした。';
-$messages['nomessagesfound'] = 'このフォルダーにはメールはありません。';
-$messages['loggedout'] = 'ログアウトしました。';
-$messages['mailboxempty'] = 'フォルダーは空です。';
-$messages['loading'] = '読み込んでいます...';
-$messages['uploading'] = 'ファイルをアップロードしています...';
-$messages['uploadingmany'] = 'ファイルをアップロードしています...';
-$messages['loadingdata'] = 'データを読み込んでいます...';
-$messages['checkingmail'] = 'メールを確認しています...';
-$messages['sendingmessage'] = 'メールを送信しています...';
-$messages['messagesent'] = 'メールを送信しました。';
-$messages['savingmessage'] = 'メールを保存しています...';
-$messages['messagesaved'] = 'メールを下書きに保存しました。';
+$messages['errorreadonly'] = '操作を実行できませんでした。フォルダーは読み込み専用です。';
+$messages['errornoperm'] = '操作を実行できませんでした。権限がありません。';
+$messages['invalidrequest'] = '不正なリクエストです!  データは保存していません。';
+$messages['nomessagesfound'] = 'このフォルダーにはメッセージはありません。';
+$messages['loggedout'] = 'ログアウトしました。さようなら!';
+$messages['mailboxempty'] = 'メールボックスは空です。';
+$messages['loading'] = '読み込み中...';
+$messages['uploading'] = 'ファイルをアップロード中...';
+$messages['uploadingmany'] = 'ファイルをアップロード中...';
+$messages['loadingdata'] = 'データを読み込み中...';
+$messages['checkingmail'] = '新しいメッセージを確認中...';
+$messages['sendingmessage'] = 'メッセージを送信中...';
+$messages['messagesent'] = 'メッセージを送信しました。';
+$messages['savingmessage'] = 'メッセージを保存中...';
+$messages['messagesaved'] = 'メッセージを下書きに保存しました。';
 $messages['successfullysaved'] = '保存しました。';
 $messages['addedsuccessfully'] = '連絡先をアドレス帳に追加しました。';
-$messages['contactexists'] = '同じメールアドレスの連絡先がすでに存在します。';
-$messages['contactnameexists'] = '同じ名前の連絡先がすでに存在します。';
-$messages['blockedimages'] = 'プライバシー保護のため、このメールに含まれるリモート画像をブロックしました。';
-$messages['encryptedmessage'] = 'このメールは暗号化されているため表示できません。';
+$messages['contactexists'] = '同じメールアドレスの連絡先が既に存在します。';
+$messages['contactnameexists'] = '同じ名前の連絡先が既に存在します。';
+$messages['blockedimages'] = 'あなたのプライバシーを守るため、このメッセージに含まれる外部画像を遮断しました。';
+$messages['encryptedmessage'] = 'このメッセージは暗号化されていて表示できません、ごめんなさい!';
 $messages['nocontactsfound'] = '連絡先がありません。';
 $messages['contactnotfound'] = '連絡先が見つかりません。';
-$messages['contactsearchonly'] = '連絡先の検索にはいくつかの単語を入力します';
-$messages['sendingfailed'] = 'メールの送信に失敗しました。';
-$messages['senttooquickly'] = 'このメールを送信するまで $sec 秒 お待ちください。';
-$messages['errorsavingsent'] = '送信メールの保存中にエラーが発生しました。';
+$messages['contactsearchonly'] = '連絡先を探すための検索語を入力してください';
+$messages['sendingfailed'] = 'メッセージを送信できませんでした。';
+$messages['senttooquickly'] = 'このメッセージを送信するまで、$sec秒お待ちください。';
+$messages['errorsavingsent'] = '送信メッセージの保存中にエラーが発生しました。';
 $messages['errorsaving'] = '保存中にエラーが発生しました。';
-$messages['errormoving'] = 'メールを移動できません。';
-$messages['errorcopying'] = 'メールをコピーできません。';
-$messages['errordeleting'] = 'メールを削除できません。';
-$messages['errormarking'] = 'メールのマークを設定できません。';
+$messages['errormoving'] = 'メッセージを移動できません。';
+$messages['errorcopying'] = 'メッセージをコピーできません。';
+$messages['errordeleting'] = 'メッセージを削除できません。';
+$messages['errormarking'] = 'メッセージにマークを設定できません。';
 $messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか?';
 $messages['deletegroupconfirm'] = 'このグループを本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
 $messages['deletefolderconfirm'] = 'このフォルダーを本当に削除しますか?';
-$messages['purgefolderconfirm'] = 'このフォルダーの全メールを本当に削除しますか?';
-$messages['contactdeleting'] = '連絡先を削除しています...';
-$messages['groupdeleting'] = 'グループを削除しています...';
-$messages['folderdeleting'] = 'フォルダーを削除しています...';
-$messages['foldermoving'] = 'フォルダーを移動しています...';
-$messages['foldersubscribing'] = 'フォルダーを購読しています...';
-$messages['folderunsubscribing'] = 'フォルダーの購読をやめています...';
-$messages['formincomplete'] = 'フォームの全項目を入力していません。';
-$messages['noemailwarning'] = '正しいメールアドレスを入力してください。';
+$messages['purgefolderconfirm'] = 'このフォルダーのすべてのメールを本当に削除しますか?';
+$messages['contactdeleting'] = '連絡先を削除中...';
+$messages['groupdeleting'] = 'グループを削除中...';
+$messages['folderdeleting'] = 'フォルダーを削除中...';
+$messages['foldermoving'] = 'フォルダーを移動中...';
+$messages['foldersubscribing'] = 'フォルダーを購読中...';
+$messages['folderunsubscribing'] = 'フォルダーの購読を解除中...';
+$messages['formincomplete'] = 'フォームに未記入の項目があります。';
+$messages['noemailwarning'] = '正しい電子メールアドレスを入力してください。';
 $messages['nonamewarning'] = '名前を入力してください。';
 $messages['nopagesizewarning'] = 'ページのサイズを入力してください。';
-$messages['nosenderwarning'] = '差出人のメールアドレスを入力してください。';
-$messages['norecipientwarning'] = '宛先は少なくともひとり分は入力してください。';
-$messages['nosubjectwarning'] = '件名が空です。今すぐ入力しますか?';
-$messages['nobodywarning'] = '本文が無いメールを送信しますか?';
-$messages['notsentwarning'] = 'メールは送信されませんでした。破棄しますか?';
-$messages['noldapserver'] = '検索する LDAP サーバーを選択してください。';
-$messages['nosearchname'] = '連絡先の名前かメールアドレスを入力してください。';
-$messages['notuploadedwarning'] = 'アップロードが完了していません。アップロードが完了するまで待つか、キャンセルしてください。';
-$messages['searchsuccessful'] = '$nr 件のメールが見つかりました。';
-$messages['contactsearchsuccessful'] = '$nr 件の連絡先が見つかりました。';
+$messages['nosenderwarning'] = '送信者の電子メールアドレスを入力してください。';
+$messages['norecipientwarning'] = '少なくとも1つ宛先を入力してください。';
+$messages['nosubjectwarning'] = '件名(Subject)の欄が空です。今、入力しますか?';
+$messages['nobodywarning'] = '本文の無いメッセージを送信しますか?';
+$messages['notsentwarning'] = 'メッセージを送信しませんでした。このメッセージを破棄しますか。';
+$messages['noldapserver'] = '検索するLDAPサーバーを選択してください。';
+$messages['nosearchname'] = '連絡先の名前か電子メールアドレスを入力してください。';
+$messages['notuploadedwarning'] = 'すべての添付ファイルのアップロードを完了していません。今しばらく待つか、取り消ししてください。';
+$messages['searchsuccessful'] = '$nr通のメッセージが見つかりました。';
+$messages['contactsearchsuccessful'] = '$nr件の連絡先が見つかりました。';
 $messages['searchnomatch'] = '一致するものが見つかりませんでした。';
-$messages['searching'] = '検索しています...';
-$messages['checking'] = '確認しています...';
-$messages['nospellerrors'] = 'スペル ミスは見つかりませんでした。';
+$messages['searching'] = '検索中...';
+$messages['checking'] = '確認中...';
+$messages['nospellerrors'] = 'スペルミスは見つかりませんでした。';
 $messages['folderdeleted'] = 'フォルダーを削除しました。';
 $messages['foldersubscribed'] = 'フォルダーを購読しました。';
-$messages['folderunsubscribed'] = 'フォルダーの購読をやめました。';
+$messages['folderunsubscribed'] = 'フォルダーの購読を解除しました。';
 $messages['folderpurged'] = 'フォルダーを空にしました。';
 $messages['folderexpunged'] = 'フォルダーを整理しました。';
 $messages['deletedsuccessfully'] = '削除しました。';
-$messages['converting'] = 'メールから書式を削除しています...';
-$messages['messageopenerror'] = 'サーバーからメールを取得できません。';
-$messages['fileuploaderror'] = 'ファイルのアップロードに失敗しました。';
-$messages['filesizeerror'] = 'アップロードするファイルのサイズが上限 ($size) を超えました。';
-$messages['copysuccess'] = '$nr 件のアドレスのコピーしました。';
-$messages['copyerror'] = 'いくつかのアドレスがコピーできません。';
-$messages['sourceisreadonly'] = 'この元アドレスは読み込み専用です。';
+$messages['converting'] = 'メールから書式を削除中...';
+$messages['messageopenerror'] = 'サーバーからメールを読み込めません。';
+$messages['fileuploaderror'] = 'ファイルをアップロードできませんでした。';
+$messages['filesizeerror'] = 'アップロードするファイルのサイズが上限($size)を超えました。';
+$messages['copysuccess'] = '$nr件のアドレスをコピーしました。';
+$messages['copyerror'] = 'どのアドレスもコピーできませんでした。';
+$messages['sourceisreadonly'] = 'このアドレスソースは読み込み専用です。';
 $messages['errorsavingcontact'] = '連絡先のアドレスを保存できません。';
-$messages['movingmessage'] = 'メールを移動しています...';
-$messages['copyingmessage'] = 'メールをコピーしています...';
-$messages['copyingcontact'] = '連絡先をコピーしています...';
-$messages['deletingmessage'] = 'メールを削除しています...';
-$messages['markingmessage'] = 'メールのマークを設定しています...';
-$messages['addingmember'] = 'グループへ連絡先をコピーしています...';
-$messages['removingmember'] = 'グループから連絡先を削除しています...';
+$messages['movingmessage'] = 'メッセージを移動中...';
+$messages['copyingmessage'] = 'メッセージをコピー中...';
+$messages['copyingcontact'] = '連絡先をコピー中...';
+$messages['deletingmessage'] = 'メッセージを削除中...';
+$messages['markingmessage'] = 'メッセージにマークを設定中...';
+$messages['addingmember'] = 'グループに連絡先をコピー中...';
+$messages['removingmember'] = 'グループから連絡先を削除中...';
 $messages['receiptsent'] = '開封通知を送信しました。';
-$messages['errorsendingreceipt'] = '開封通知の送信ができません。';
-$messages['nodeletelastidentity'] = '削除できません。少なくともひとつの個人情報が必要です。';
-$messages['forbiddencharacter'] = 'フォルダー名に利用できない文字が含まれています。';
+$messages['errorsendingreceipt'] = '開封通知を送信ができませんでした。';
+$messages['deleteidentityconfirm'] = 'この識別情報を本当に削除しますか?';
+$messages['nodeletelastidentity'] = 'この識別情報は最後の1つなので削除できません。';
+$messages['forbiddencharacter'] = 'フォルダー名に使用できない文字が含まれています。';
 $messages['selectimportfile'] = 'アップロードするファイルを選択してください。';
-$messages['addresswriterror'] = '選択したアドレス帳に書き込めません。';
-$messages['contactaddedtogroup'] = 'このグループへ連絡先を追加しました。';
+$messages['addresswriterror'] = '選択したアドレス帳は書き込みできないアドレス帳です。';
+$messages['contactaddedtogroup'] = 'このグループに連絡先を追加しました。';
 $messages['contactremovedfromgroup'] = 'このグループから連絡先を削除しました。';
 $messages['importwait'] = 'インポート中です。しばらくお待ちください...';
-$messages['importerror'] = 'インポートに失敗しました。アップロードしたファイルは不正な vCard ファイルです。';
-$messages['importconfirm'] = '<b>$inserted 件の連絡先をインポートしました。</b>';
-$messages['importconfirmskipped'] = '<b>$skipped 拳の既存エントリーをスキップしました</b>';
+$messages['importerror'] = 'インポートに失敗しました。アップロードしたファイルは不正なvCardファイルです。';
+$messages['importconfirm'] = '<b>$inserted件の連絡先をインポートしました。</b>';
+$messages['importconfirmskipped'] = '<b>$skipped件の既存する項目を飛ばした。</b>';
 $messages['opnotpermitted'] = '許可されていない操作です。';
-$messages['nofromaddress'] = '選択中の個人情報にメールアドレスが含まれていません。';
-$messages['editorwarning'] = 'テキスト エディターに切り替えるとすべての書式が失われます。よろしいですか?';
-$messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。<b>メッセージは送信されませんでした。</b>システム管理者に至急連絡してください。';
+$messages['nofromaddress'] = '選択している識別情報に電子メールアドレスが抜けています。';
+$messages['editorwarning'] = 'テキストエディターに切り替えると、すべての書式はなくなります。本当に続けますか?';
+$messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。システム管理者に至急連絡してください。<b>メッセージを送信できません。</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): サーバーへの接続に失敗しました。';
 $messages['smtpautherror'] = 'SMTP Error ($code): 認証に失敗しました。';
 $messages['smtpfromerror'] = 'SMTP Error ($code): 差出人 "$from" を設定できません ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): 宛先 "$to" を追加できません ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: 宛先の一覧を解析できません。';
 $messages['smtperror'] = 'SMTP エラー: $msg';
-$messages['emailformaterror'] = 'メールアドレスが正しくありません: $email';
-$messages['toomanyrecipients'] = '宛先が多すぎます。$max 件以内にしてください。';
+$messages['emailformaterror'] = '電子メールアドレスが正しくありません: $email';
+$messages['toomanyrecipients'] = '宛先が多すぎます。$max件以内にしてください。';
 $messages['maxgroupmembersreached'] = 'グループのメンバーが多すぎます。$max 件以内にしてください。';
-$messages['internalerror'] = '内部エラーが発生しました。もう一度やり直してください。';
+$messages['internalerror'] = '内部エラーが発生しました。もう一度試してください。';
 $messages['contactdelerror'] = '連絡先を削除できませんでした。';
 $messages['contactdeleted'] = '連絡先を削除しました。';
 $messages['contactrestoreerror'] = '削除した連絡先を復元できませんでした。';
@@ -141,18 +142,18 @@ $messages['savedsearchdeleted'] = '保存した検索情報を削除しました
 $messages['savedsearchdeleteerror'] = '保存した検索情報を削除できません。';
 $messages['savedsearchcreated'] = '検索情報を作成しました。';
 $messages['savedsearchcreateerror'] = '検索情報を削除できませんでした。';
-$messages['messagedeleted'] = 'メールを削除しました。';
-$messages['messagemoved'] = 'メールを移動しました。';
-$messages['messagecopied'] = 'メールをコピーしました。';
-$messages['messagemarked'] = 'メールのマークを設定しました。';
-$messages['autocompletechars'] = '自動補完には少なくとも $min 文字入力してください。';
+$messages['messagedeleted'] = 'メッセージを削除しました。';
+$messages['messagemoved'] = 'メッセージを移動しました。';
+$messages['messagecopied'] = 'メッセージをコピーしました。';
+$messages['messagemarked'] = 'メッセージにマークを設定しました。';
+$messages['autocompletechars'] = '自動補完には少なくとも$min文字入力してください。';
 $messages['autocompletemore'] = '多くのエントリーが見つかりました。もっと入力してください。';
-$messages['namecannotbeempty'] = '名前を空欄にできません。';
+$messages['namecannotbeempty'] = '名前は空にできません。';
 $messages['nametoolong'] = '名前が長すぎます。';
 $messages['folderupdated'] = 'フォルダーを更新しました。';
 $messages['foldercreated'] = 'フォルダーを作成しました。';
 $messages['invalidimageformat'] = '画像の形式が正しくありません。';
-$messages['mispellingsfound'] = 'メッセージにスペル エラーを見つけました。';
-$messages['parentnotwritable'] = '選択した親フォルダーへの作成、移動に失敗しました。アクセス権限がありません。';
+$messages['mispellingsfound'] = 'メッセージにスペルミスを見つけました。';
+$messages['parentnotwritable'] = '選択した親フォルダーに作成または移動をできませんでした。アクセス権限がありません。';
 $messages['messagetoobig'] = 'その処理をするにはメッセージ部分が大きすぎます。';
 
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 23c21c977..00ce9ab8b 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'វិច្ឆិកា';
 $labels['longdec'] = 'ធ្នូ';
 $labels['today'] = 'ថ្ងៃនេះ';
 $labels['checkmail'] = 'ពិនិត្យសំបុត្រថ្មី';
+$labels['compose'] = 'សរសេរសំបុត្រថ្មី';
 $labels['writenewmessage'] = 'សរសេរសំបុត្រថ្មី';
 $labels['replytomessage'] = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
 $labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
@@ -156,7 +157,6 @@ $labels['searchmod'] = 'កែសំរួលលក្ខខ័ណ្ឌស្�
 $labels['msgtext'] = 'សំបុត្រទាំងមូល';
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
-$labels['compose'] = 'សរសេរសំបុត្រថ្មី';
 $labels['editasnew'] = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
 $labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
 $labels['sendmessage'] = 'ផ្ញើសំបុត្រនេះ';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 57803118c..e2e21ca15 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Tomas D Davainis <tomasdd@gmail.com>                          |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -92,13 +92,16 @@ $labels['longoct'] = 'Spalis';
 $labels['longnov'] = 'Lapkritis';
 $labels['longdec'] = 'Gruodis';
 $labels['today'] = 'Šiandien';
+$labels['refresh'] = 'Atnaujinti';
 $labels['checkmail'] = 'Tikrinti, ar yra naujų laiškų';
 $labels['compose'] = 'Rašyti naują laišką';
 $labels['writenewmessage'] = 'Rašyti naują laišką';
+$labels['reply'] = 'Atsakyti';
 $labels['replytomessage'] = 'Atsakyti siuntėjui';
 $labels['replytoallmessage'] = 'Atsakyti el. pašto grupei arba laiško siuntėjui ir visiems jo gavėjams';
 $labels['replyall'] = 'Atsakyti visiems';
 $labels['replylist'] = 'Atsakyti el. pašto grupei';
+$labels['forward'] = 'Peradresuoti';
 $labels['forwardinline'] = 'Persiųsti cituojant';
 $labels['forwardattachment'] = 'Persiųsti priedu';
 $labels['forwardmessage'] = 'Persiųsti laišką';
@@ -117,6 +120,9 @@ $labels['markunread'] = 'Kaip neskaitytus';
 $labels['markflagged'] = 'Pažymėti gairele';
 $labels['markunflagged'] = 'Pašalinti gairelę';
 $labels['moreactions'] = 'Kiti veiksmai…';
+$labels['more'] = 'Daugiau';
+$labels['back'] = 'Grįžti';
+$labels['options'] = 'Parinktys';
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
 $labels['none'] = 'Nerūšiuoti';
@@ -174,6 +180,7 @@ $labels['editidents'] = 'Tvarkyti tapatybes';
 $labels['checkspelling'] = 'Tikrinti rašybą';
 $labels['resumeediting'] = 'Tęsti redagavimą';
 $labels['revertto'] = 'Atstatyti į';
+$labels['attach'] = 'Prisegti';
 $labels['attachments'] = 'Pridėti failai';
 $labels['upload'] = 'Įkelti';
 $labels['uploadprogress'] = '$percent ($current iš $total)';
@@ -234,6 +241,7 @@ $labels['spouse'] = 'Sutuoktinis';
 $labels['allfields'] = 'Visi laukai';
 $labels['search'] = 'Paieška';
 $labels['advsearch'] = 'Išplėstinė paieška';
+$labels['advanced'] = 'Išsamiau';
 $labels['other'] = 'Kitas';
 $labels['typeother'] = 'Kitas';
 $labels['typehome'] = 'Namų';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index e6e6d35fc..01d6079a9 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Tomas D Davainis <tomasdd@gmail.com>                          |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,7 +106,8 @@ $messages['addingmember'] = 'Adresatas(-ai) įtraukiamas(-i) į grupę…';
 $messages['removingmember'] = 'Adresatas(-ai) šalinamas(-i) iš grupės…';
 $messages['receiptsent'] = 'Laiško perskaitymo pažyma sėkmingai išsiųsta.';
 $messages['errorsendingreceipt'] = 'Laiško perskaitymo pažymos išsiųsti nepavyko.';
-$messages['nodeletelastidentity'] = 'Jūs negalite ištrinti šios tapatybės, nes ji yra vienintelė likusi.';
+$messages['deleteidentityconfirm'] = 'Ar tikrai norite ištrinti šią tapatybę?';
+$messages['nodeletelastidentity'] = 'Negalite ištrinti šios tapatybės, nes ji vienintelė likusi.';
 $messages['forbiddencharacter'] = 'Aplanko varde rasta neleistinų simbolių.';
 $messages['selectimportfile'] = 'Parinkite įkelti norimą failą.';
 $messages['addresswriterror'] = 'Pasirinktoji adresų knyga prieinama tik skaitymui.';
@@ -151,7 +152,7 @@ $messages['namecannotbeempty'] = 'Vardas negali būti tuščias.';
 $messages['nametoolong'] = 'Vardas yra per ilgas.';
 $messages['folderupdated'] = 'Aplanko savybės sėkmingai atnaujintos.';
 $messages['foldercreated'] = 'Aplankas sėkmingai sukurtas.';
-$messages['invalidimageformat'] = 'Paveikslo formatas netinkamas.';
+$messages['invalidimageformat'] = 'Paveikslo formatas yra netinkamas.';
 $messages['mispellingsfound'] = 'Laiške rasta rašybos klaidų.';
 $messages['parentnotwritable'] = 'Nepavyko sukurti arba perkelti aplanko į parinktą tėvinį aplanką. Trūksta prieigos teisių.';
 $messages['messagetoobig'] = 'Laiško dalis yra per didelė, kad galėtų būti apdorota.';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index ac8fb569e..e42998dd9 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Pievieno kontaktu(s) grupai...';
 $messages['removingmember'] = 'Atvieno kontaktu(s) no grupas...';
 $messages['receiptsent'] = 'Saņemšanas apstiprinājums nosūtīts';
 $messages['errorsendingreceipt'] = 'Neizdevās nosūtīt apstiprinājumu';
+$messages['deleteidentityconfirm'] = 'Vai tiešām vēlaties dzēst šo identitāti?';
 $messages['nodeletelastidentity'] = 'Šo identitāti nevar izdzēst, tā ir pati pēdējā.';
 $messages['forbiddencharacter'] = 'Mapes nosaukums satur aizliegtus simbolus';
 $messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšupielādēt';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 034968995..a66d7689a 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -39,8 +39,8 @@ $labels['date'] = 'Tarikh';
 $labels['size'] = 'Saiz';
 $labels['priority'] = 'Keutamaan';
 $labels['organization'] = 'Organisasi';
-$labels['mailboxlist'] = 'Kabinet Fail';
-$labels['folders'] = 'Kabinet Fail';
+$labels['mailboxlist'] = 'Folder';
+$labels['folders'] = 'Folder';
 $labels['messagesfromto'] = 'Mesej $from ke $to dari $count';
 $labels['messagenrof'] = 'Mesej $nr dari $count';
 $labels['copy'] = 'Salin';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index db222a383..3cf4b5a41 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: abuyop <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -56,7 +56,7 @@ $messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
 $messages['searchnomatch'] = 'Carian tiada padanan';
-$messages['searching'] = 'Mencari...';
+$messages['searching'] = 'Menggelintar...';
 $messages['checking'] = 'Menyemak...';
 $messages['nospellerrors'] = 'Tiada kesalah ejaan dijumpai';
 $messages['folderdeleted'] = 'Kabinet fail berjaya dihapuskan';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index bfeb8ec35..e29c4ea30 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -9,46 +9,51 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Prasanna Singh <Unknown>                                      |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $labels = array();
 $labels['welcome'] = '$product मा स्वागत छ';
-$labels['username'] = 'युसरनेम';
-$labels['password'] = 'पासवर्ड';
+$labels['username'] = 'प्रयोगकर्ताको नाम';
+$labels['password'] = 'प्रवेश शब्द';
 $labels['server'] = 'सर्भर';
-$labels['login'] = 'लगईन';
-$labels['logout'] = 'लगआउट';
+$labels['login'] = 'लगइन गर्नुहोस्';
+$labels['logout'] = 'लगआउट गर्नुहोस्';
 $labels['mail'] = 'ई-मेल';
 $labels['settings'] = 'व्यक्तिगत रोजाईहरु';
-$labels['addressbook'] = 'ठेगाना किताब';
-$labels['inbox'] = 'इनबक्स';
-$labels['drafts'] = 'ड्राफ्ट';
+$labels['addressbook'] = 'ठेगाना पुस्तिका';
+$labels['inbox'] = 'प्राप्ति मञ्जूषा';
+$labels['drafts'] = 'ड्राफ्टहरू';
 $labels['sent'] = 'पठईएका मेलहरु';
 $labels['trash'] = 'रद्दी टोकरी';
 $labels['junk'] = 'स्पाम';
 $labels['subject'] = 'विषय';
 $labels['from'] = 'प्रेषक';
 $labels['to'] = 'प्रापक';
-$labels['cc'] = 'कार्बन कपि';
-$labels['bcc'] = 'अंधो कार्बन कपि';
-$labels['replyto'] = 'पुन: जवाब';
+$labels['cc'] = 'बोधार्थ';
+$labels['bcc'] = 'गुप्त बोधार्थ';
+$labels['replyto'] = 'लाई-जवाफ';
+$labels['followupto'] = 'यसलाई अनुसरण गर्नुहोस्';
 $labels['date'] = 'तारिख';
 $labels['size'] = 'नाप';
-$labels['priority'] = 'मेलको प्राथमिकता';
+$labels['priority'] = 'प्राथमिकता';
 $labels['organization'] = 'संस्था';
+$labels['readstatus'] = 'पढेको अवस्था';
 $labels['mailboxlist'] = 'फोल्डरहरु';
 $labels['folders'] = 'फोल्डरहरु';
 $labels['messagesfromto'] = 'मेलहरु $from बाट $to सम्म, $count मध्यबाट';
+$labels['threadsfromto'] = 'थ्रेडहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count मध्यबाट';
-$labels['copy'] = 'कार्बन कपि';
-$labels['moveto'] = 'सार्नुहोस...';
+$labels['fromtoshort'] = '$from - $to, $count मध्यबाट';
+$labels['copy'] = 'प्रतिलिपि गर्नुहोस्';
+$labels['move'] = 'सार्नुहोस';
+$labels['moveto'] = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
-$labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा जोड्नुहोस';
+$labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा भर्नुहोस';
 $labels['sun'] = 'आइत';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगल';
@@ -63,23 +68,60 @@ $labels['wednesday'] = 'बुधवार';
 $labels['thursday'] = 'विहिवार';
 $labels['friday'] = 'शुक्रवार';
 $labels['saturday'] = 'शनिवार';
+$labels['jan'] = 'जनवरी';
+$labels['feb'] = 'फेब्रुवरी';
+$labels['mar'] = 'मार्च';
+$labels['apr'] = 'अप्रिल';
+$labels['may'] = 'मई';
+$labels['longmay'] = 'मई';
+$labels['jun'] = 'जुन';
+$labels['jul'] = 'जुलाई';
+$labels['aug'] = 'अगस्ट';
+$labels['sep'] = 'सेप्टेम्बर';
+$labels['oct'] = 'अक्टोबर';
+$labels['nov'] = 'नोभेम्बर';
+$labels['dec'] = 'डिसेम्बर';
+$labels['longjan'] = 'जनवरी';
+$labels['longfeb'] = 'फेब्रुवरी';
+$labels['longmar'] = 'मार्च';
+$labels['longapr'] = 'अप्रिल';
+$labels['longjun'] = 'जुन';
+$labels['longjul'] = 'जुलाई';
+$labels['longaug'] = 'अगस्ट';
+$labels['longsep'] = 'सेप्टेम्बर';
+$labels['longoct'] = 'अक्टोबर';
+$labels['longnov'] = 'नोभेम्बर';
+$labels['longdec'] = 'डिसेम्बर';
 $labels['today'] = 'आज';
+$labels['refresh'] = 'ताजा पार्नुहोस्';
 $labels['checkmail'] = 'नया मेल खोज्नुहोस';
-$labels['compose'] = 'मेल लखन गर्नुहोस';
-$labels['writenewmessage'] = 'नया मेल लेखनुहोस';
-$labels['replytomessage'] = 'मेलको जवाफ दिनुहोस';
+$labels['compose'] = 'रचना गर्नुहोस्';
+$labels['writenewmessage'] = 'नया मेल लेख्नुहोस';
+$labels['reply'] = 'जवाफ दिनुहोस्';
+$labels['replytomessage'] = 'प्रेषकलाई जवाफ दिनुहोस';
 $labels['replytoallmessage'] = 'प्रेषक लगायत सबैलाई जवाफ दिनुहोस';
+$labels['replyall'] = 'सबैलाई जवाफ दिनुहोस';
+$labels['replylist'] = 'जवाफ तालिका';
+$labels['forward'] = 'फरवार्ड गर्नुहोस्';
+$labels['forwardinline'] = 'आन्तरिक पंक्तिमा फरवार्ड गर्नुहोस';
+$labels['forwardattachment'] = 'एट्याचमेन्ट जसरी फरवार्ड गर्नुहोस';
 $labels['forwardmessage'] = 'मेल अगाडि पठाउनुहोस';
-$labels['deletemessage'] = 'रद्दी टोकरीमा सार्नुहोस';
-$labels['printmessage'] = 'मेल छाप्नुहोस';
-$labels['previousmessage'] = 'पछाडिको मेल देखाउनुहोस';
-$labels['firstmessage'] = 'पहलो मेल देखाउनुहोस';
-$labels['nextmessage'] = 'अगाडिको मेल देखाउनुहोस';
-$labels['lastmessage'] = 'अन्तिम मेल देखाउनुहोस';
-$labels['backtolist'] = 'मेल सूची देखाउनुहोस';
+$labels['deletemessage'] = 'रद्दी टोकरीमा हाल्नुहोस';
+$labels['movemessagetotrash'] = 'सन्देशलाई रद्दी टोकरीमा सार्नुहोस';
+$labels['printmessage'] = 'यो सन्देशलाई मुद्रण गर्नुहोस्';
+$labels['previousmessage'] = 'पछाडिको सन्देश देखाउनुहोस';
+$labels['firstmessage'] = 'पहलो सन्देश देखाउनुहोस';
+$labels['nextmessage'] = 'अगाडिको सन्देश देखाउनुहोस';
+$labels['lastmessage'] = 'अन्तिम सन्देश देखाउनुहोस';
+$labels['backtolist'] = 'सन्देश सूची देखाउनुहोस';
 $labels['viewsource'] = 'श्रोत देखाउनुहोस';
-$labels['select'] = 'चुन्नुहोस';
-$labels['all'] = 'सबै |';
+$labels['mark'] = 'चिन्ह लगाउनुहोस्';
+$labels['markmessages'] = 'सन्देशमा चिन्ह लगाउनुहोस्';
+$labels['more'] = 'अझ धेरै';
+$labels['back'] = 'पछाडि';
+$labels['options'] = 'विकल्पहरू';
+$labels['select'] = 'चयन गर्नुहोस्';
+$labels['all'] = 'सबै';
 $labels['none'] = 'हैन';
 $labels['nonesort'] = 'हैन';
 $labels['unread'] = 'नपढिएका |';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index e45727bdc..0bc38c125 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
+ | Author: Justin van Beusekom <Unknown>                                 |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -385,6 +385,7 @@ $labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
 $labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
 $labels['defaultaddressbook'] = 'Voeg nieuw contactpersoon toe aan geselecteerd adresboek';
 $labels['autocompletesingle'] = 'Sla alternatieve e-mailadressen over bij automatisch aanvullen';
+$labels['listnamedisplay'] = 'Contacten weergeven als';
 $labels['spellcheckbeforesend'] = 'Controleer spelling voor het versturen van een bericht';
 $labels['spellcheckoptions'] = 'Instellingen spellingscontrole';
 $labels['spellcheckignoresyms'] = 'Negeer woorden met symbolen';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 1ee7b711d..9c06906ff 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Foldery';
 $labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
 $labels['threadsfromto'] = 'Wątki od $from do $to z $count';
 $labels['messagenrof'] = 'Wiadomość $nr z $count';
+$labels['fromtoshort'] = '$from - $to z $count';
 $labels['copy'] = 'Kopiuj';
 $labels['move'] = 'Przenieś';
 $labels['moveto'] = 'Przenieś do...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'październik';
 $labels['longnov'] = 'listopad';
 $labels['longdec'] = 'grudzień';
 $labels['today'] = 'Dzisiaj';
+$labels['refresh'] = 'Odśwież';
 $labels['checkmail'] = 'Sprawdź skrzynkę';
 $labels['compose'] = 'Utwórz wiadomość';
 $labels['writenewmessage'] = 'Utwórz nową wiadomość';
+$labels['reply'] = 'Odpowiedz';
 $labels['replytomessage'] = 'Odpowiedz nadawcy';
 $labels['replytoallmessage'] = 'Odpowiedz wszystkim';
 $labels['replyall'] = 'Odpowiedz wszystkim';
 $labels['replylist'] = 'Odpowiedz na listę';
+$labels['forward'] = 'Przekaż';
 $labels['forwardinline'] = 'Prześlij w treści';
 $labels['forwardattachment'] = 'Prześlij jako załącznik';
 $labels['forwardmessage'] = 'Prześlij dalej';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Następna wiadomość';
 $labels['lastmessage'] = 'Ostatnia wiadomość';
 $labels['backtolist'] = 'Pokaż listę wiadomości';
 $labels['viewsource'] = 'Pokaż źródło';
+$labels['mark'] = 'Zaznacz';
 $labels['markmessages'] = 'Oznacz wiadomości';
 $labels['markread'] = 'Jako przeczytane';
 $labels['markunread'] = 'Jako nieprzeczytane';
 $labels['markflagged'] = 'Jako oflagowane';
 $labels['markunflagged'] = 'Jako nieoflagowane';
 $labels['moreactions'] = 'Więcej akcji...';
+$labels['more'] = 'Więcej';
+$labels['back'] = 'Wstecz';
+$labels['options'] = 'Ustawienia';
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Status dostarczenia (DSN)';
 $labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
 $labels['originalmessage'] = 'Wiadomość oryginalna';
 $labels['editidents'] = 'Edytuj tożsamości';
+$labels['spellcheck'] = 'Pisownia';
 $labels['checkspelling'] = 'Sprawdź pisownię';
 $labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
 $labels['revertto'] = 'Powróć do';
+$labels['attach'] = 'Załącz';
 $labels['attachments'] = 'Załączniki';
 $labels['upload'] = 'Wyślij';
 $labels['uploadprogress'] = '$percent ($current z $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Małżonek';
 $labels['allfields'] = 'Wszystkie pola';
 $labels['search'] = 'Szukaj';
 $labels['advsearch'] = 'Wyszukiwanie zaawansowane';
+$labels['advanced'] = 'Zaawansowane';
 $labels['other'] = 'Inne';
 $labels['typeother'] = 'Inne';
 $labels['typehome'] = 'Dom';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 065760657..b8b8a0f2a 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Dodawanie kontaktów do grupy...';
 $messages['removingmember'] = 'Usuwanie kontaktów z grupy...';
 $messages['receiptsent'] = 'Pomyślnie wysłano potwierdzenie dostarczenia.';
 $messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia.';
+$messages['deleteidentityconfirm'] = 'Czy na pewno chcesz usunąć tą tożsamość?';
 $messages['nodeletelastidentity'] = 'Nie można skasować tej tożsamości, ponieważ jest ostatnią.';
 $messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak.';
 $messages['selectimportfile'] = 'Proszę wybrać plik do wysłania.';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index c72be33a6..9e3b01d97 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -41,6 +41,7 @@ $labels['size'] = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Status de leitura';
+$labels['listoptions'] = 'Lista de opções...';
 $labels['mailboxlist'] = 'Pastas';
 $labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
@@ -272,6 +273,7 @@ $labels['delete'] = 'Excluir';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
+$labels['uploadphoto'] = 'Enviar foto';
 $labels['newcontact'] = 'Criar novo contato';
 $labels['deletecontact'] = 'Exclui os contatos selecionados';
 $labels['composeto'] = 'Compor mensagem para';
@@ -363,6 +365,7 @@ $labels['checkallfolders'] = 'Verificar se há novas mensagens em todas as pasta
 $labels['displaynext'] = 'Exibir a mensagem seguinte após excluir/mover uma mensagem';
 $labels['defaultfont'] = 'Fonte padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções Principais';
+$labels['browseroptions'] = 'Opções de navegação';
 $labels['section'] = 'Seção';
 $labels['maintenance'] = 'Manutenção';
 $labels['newmessage'] = 'Nova mensagem';
@@ -385,12 +388,14 @@ $labels['reqdsn'] = 'Sempre pedir confirmação de entrega';
 $labels['replysamefolder'] = 'Colocar as respostas na mesma pasta da mensagem original';
 $labels['defaultaddressbook'] = 'Adicionar novos contatos para o catálogo de endereços selecionado';
 $labels['autocompletesingle'] = 'Ignorar endereços alternativos no autocompletar';
+$labels['listnamedisplay'] = 'Listar contatos como';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar uma mensagem';
 $labels['spellcheckoptions'] = 'Opções do Verificador Ortográfico';
 $labels['spellcheckignoresyms'] = 'Ignorar palavras com símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
 $labels['spellcheckignorecaps'] = 'Ignorar palavras toda em maiúsculo';
 $labels['addtodict'] = 'Adicionar ao dicionário';
+$labels['mailtoprotohandler'] = 'Registrar o tratador de protocolo para mailto: links';
 $labels['folder'] = 'Pasta';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Inscrito';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index dbf1b1e58..35adc1e0b 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -15,6 +15,7 @@
 */
 
 $messages = array();
+$messages['errortitle'] = 'Ocorreu um erro!';
 $messages['loginfailed'] = 'Falha no login';
 $messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
 $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 72ade764f..a67ca643d 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -41,6 +41,7 @@ $labels['size'] = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Estado de leitura';
+$labels['listoptions'] = 'Lista de opções...';
 $labels['mailboxlist'] = 'Pastas';
 $labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens de $from a $to de $count';
@@ -272,6 +273,7 @@ $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
+$labels['uploadphoto'] = 'Carregar foto';
 $labels['newcontact'] = 'Criar novo contacto';
 $labels['deletecontact'] = 'Eliminar contactos seleccionados';
 $labels['composeto'] = 'Escrever mensagem para';
@@ -363,6 +365,7 @@ $labels['checkallfolders'] = 'Verificar por novas mensagens em todas as pastas';
 $labels['displaynext'] = 'Depois de mover/eliminar uma mensagem, mostrar a próxima mensagem';
 $labels['defaultfont'] = 'Tipo de letra padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções';
+$labels['browseroptions'] = 'Opções do browser';
 $labels['section'] = 'Secção';
 $labels['maintenance'] = 'Manutenção';
 $labels['newmessage'] = 'Nova Mensagem';
@@ -385,12 +388,14 @@ $labels['reqdsn'] = 'Pedir sempre um recibo de entrega';
 $labels['replysamefolder'] = 'Guardar respostas na mesma pasta da mensagem original';
 $labels['defaultaddressbook'] = 'Adicionar novo contacto ao livro de endereços selecionado';
 $labels['autocompletesingle'] = 'Ignorar endereços de email alternativos no preenchimento automático';
+$labels['listnamedisplay'] = 'Listar contactos como';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar a mensagem';
 $labels['spellcheckoptions'] = 'Opções de verificação ortográfica';
 $labels['spellcheckignoresyms'] = 'Ignorar palavras com símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar palavras com números';
 $labels['spellcheckignorecaps'] = 'Ignorar palavras em maiúsculas';
 $labels['addtodict'] = 'Adicionar ao dicionário';
+$labels['mailtoprotohandler'] = 'Registar manipulador de protocolo para mailto: links';
 $labels['folder'] = 'Pasta';
 $labels['foldername'] = 'Nome da pasta';
 $labels['subscribed'] = 'Subscrita';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 8869bb722..fca3dfab2 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -15,6 +15,7 @@
 */
 
 $messages = array();
+$messages['errortitle'] = 'Ocorreu um erro!';
 $messages['loginfailed'] = 'O utilizador ou palavra-passe que introduziu não correspondem.';
 $messages['cookiesdisabled'] = 'O seu navegador não suporta cookies';
 $messages['sessionerror'] = 'A sua sessão é inválida ou expirou.';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 9663c62d4..962f8f853 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: tudor <tudor@starnet-alba.ro>                                 |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -35,15 +35,18 @@ $labels['to'] = 'Destinatar';
 $labels['cc'] = 'Copie (CC)';
 $labels['bcc'] = 'Copie oarbă (BCC)';
 $labels['replyto'] = 'Răspunde la';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Data';
 $labels['size'] = 'Mărime';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organizaţie';
+$labels['readstatus'] = 'Starea de citit';
 $labels['mailboxlist'] = 'Dosare';
 $labels['folders'] = 'Dosare';
 $labels['messagesfromto'] = 'Mesaje de la $from până la $to din $count';
 $labels['threadsfromto'] = 'Grupuri de la $from până la $to din $count';
 $labels['messagenrof'] = '$nr mesaje din $count';
+$labels['fromtoshort'] = '$from - $to din $count';
 $labels['copy'] = 'Copiază';
 $labels['move'] = 'Mută';
 $labels['moveto'] = 'Mută in...';
@@ -90,11 +93,18 @@ $labels['longoct'] = 'Octombrie';
 $labels['longnov'] = 'Noiembrie';
 $labels['longdec'] = 'Decembrie';
 $labels['today'] = 'Astăzi';
+$labels['refresh'] = 'Actualizează';
 $labels['checkmail'] = 'Verifică mesaje noi';
 $labels['compose'] = 'Scrie un mesaj';
 $labels['writenewmessage'] = 'Scrie mesaj nou';
+$labels['reply'] = 'Răspunde';
 $labels['replytomessage'] = 'Răspunde la mesaj';
 $labels['replytoallmessage'] = 'Răspunde la toţi';
+$labels['replyall'] = 'Răspunde la toţi';
+$labels['replylist'] = 'Lista de răspuns';
+$labels['forward'] = 'Înaintează';
+$labels['forwardinline'] = 'Înaintează ca citat';
+$labels['forwardattachment'] = 'Înaintează ca ataşament';
 $labels['forwardmessage'] = 'Trimite mesajul mai departe';
 $labels['deletemessage'] = 'Trimite mesajul la gunoi';
 $labels['movemessagetotrash'] = 'Mută mesajul la gunoi';
@@ -105,11 +115,16 @@ $labels['nextmessage'] = 'Afişează următorul mesaj';
 $labels['lastmessage'] = 'Afişează ultimul mesaj';
 $labels['backtolist'] = 'Înapoi la lista cu mesaje';
 $labels['viewsource'] = 'Afişează sursa';
+$labels['mark'] = 'Marchează';
 $labels['markmessages'] = 'Marchează mesajele';
 $labels['markread'] = 'Ca citit';
 $labels['markunread'] = 'Ca necitit';
 $labels['markflagged'] = 'Ca marcat';
 $labels['markunflagged'] = 'Ca nemarcat';
+$labels['moreactions'] = 'Mai multe acțiuni...';
+$labels['more'] = 'Mai multe';
+$labels['back'] = 'Înapoi';
+$labels['options'] = 'Opţiuni';
 $labels['select'] = 'Selectează';
 $labels['all'] = 'Toate';
 $labels['none'] = 'Fără sortare';
@@ -141,6 +156,7 @@ $labels['listcolumns'] = 'Arată coloane';
 $labels['listsorting'] = 'Sortează după';
 $labels['listorder'] = 'Ordinea de sortare';
 $labels['listmode'] = 'Mod de vizualizare';
+$labels['folderactions'] = 'Actiuni asupra folder-ului...';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
 $labels['quota'] = 'Spaţiu folosit';
@@ -159,12 +175,20 @@ $labels['addattachment'] = 'Ataşează fişier';
 $labels['charset'] = 'Set de caractere';
 $labels['editortype'] = 'Tip de editor';
 $labels['returnreceipt'] = 'Returnează confirmare de primire';
+$labels['dsn'] = 'Notificare despre starea trimiterii';
+$labels['mailreplyintro'] = 'În $date, $sender a scris:';
+$labels['originalmessage'] = 'Mesaj original';
+$labels['editidents'] = 'Editează identităţi';
+$labels['spellcheck'] = 'Ortografie';
 $labels['checkspelling'] = 'Verifică ortografie';
 $labels['resumeediting'] = 'Reia editarea';
 $labels['revertto'] = 'Revino la';
+$labels['attach'] = 'Ataşează';
 $labels['attachments'] = 'Ataşamente';
 $labels['upload'] = 'Încarcă';
+$labels['uploadprogress'] = '$percent ($current din $total)';
 $labels['close'] = 'Închide';
+$labels['messageoptions'] = 'Opţiuni mesaj...';
 $labels['low'] = 'Mică';
 $labels['lowest'] = 'Cea mai mică';
 $labels['normal'] = 'Normală';
@@ -173,6 +197,7 @@ $labels['highest'] = 'Cea mai mare';
 $labels['nosubject'] = '(fără subiect)';
 $labels['showimages'] = 'Afişează imagini';
 $labels['alwaysshow'] = 'Afişează întotdeauna imaginile de la $sender';
+$labels['isdraft'] = 'Acesta este un mesaj schiţă.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text simplu';
 $labels['savesentmessagein'] = 'Salvează mesajele în';
@@ -181,6 +206,7 @@ $labels['maxuploadsize'] = 'Mărimea maximă admisă a fişierului este $size';
 $labels['addcc'] = 'Adaugă Cc';
 $labels['addbcc'] = 'Adaugă Bcc';
 $labels['addreplyto'] = 'Adaugă Raspunde-La';
+$labels['addfollowupto'] = 'Adaugă Followup-To';
 $labels['mdnrequest'] = 'Expeditorul acestui mesaj a solicitat să fie notificat la cititrea mesajului. Doriţi să notificaţi expeditorul?';
 $labels['receiptread'] = 'Returnează confirmare (citit)';
 $labels['yourmessage'] = 'Aceasta este o confirmare de primire a mesajului dumneavoastră.';
@@ -188,13 +214,64 @@ $labels['receiptnote'] = 'Notă: Această confirmare doar vă informează că me
 $labels['name'] = 'Numele Contactului';
 $labels['firstname'] = 'Nume';
 $labels['surname'] = 'Prenume';
+$labels['middlename'] = 'Iniţiala tatălui';
+$labels['nameprefix'] = 'Prefix';
+$labels['namesuffix'] = 'Sufix';
+$labels['nickname'] = 'Poreclă';
+$labels['jobtitle'] = 'Funcția';
+$labels['department'] = 'Departament';
+$labels['gender'] = 'Sex';
+$labels['maidenname'] = 'Nume de fată';
 $labels['email'] = 'E-Mail';
+$labels['phone'] = 'Telefon';
+$labels['address'] = 'Adresă';
+$labels['street'] = 'Stradă';
+$labels['locality'] = 'Oraș';
+$labels['zipcode'] = 'Cod poştal';
+$labels['region'] = 'Stat/Judeţ';
+$labels['country'] = 'Țară';
+$labels['birthday'] = 'Ziua de naştere:';
+$labels['anniversary'] = 'Aniversare';
+$labels['website'] = 'Pagină web';
+$labels['instantmessenger'] = 'IM (Mesaj Instant)';
+$labels['notes'] = 'Notițe';
+$labels['male'] = 'masculin';
+$labels['female'] = 'feminin';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Asistent';
+$labels['typeassistant'] = 'Asistent';
+$labels['spouse'] = 'Soț/soție';
+$labels['allfields'] = 'Toate câmpurile';
+$labels['search'] = 'Căutare';
+$labels['advsearch'] = 'Căutare avansată';
+$labels['advanced'] = 'Avansat';
+$labels['other'] = 'Altele';
+$labels['typeother'] = 'Altele';
+$labels['typehome'] = 'Pagina Principală';
+$labels['typework'] = 'Servici';
+$labels['typemobile'] = 'Mobil';
+$labels['typemain'] = 'Principal';
+$labels['typehomefax'] = 'Fax acasă';
+$labels['typeworkfax'] = 'Fax serviciu';
+$labels['typecar'] = 'Mașină';
+$labels['typepager'] = 'Pager';
+$labels['typevideo'] = 'Video';
+$labels['typehomepage'] = 'Pagină de pornire';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
+$labels['addfield'] = 'Adaugă câmp...';
 $labels['addcontact'] = 'Adaugă contactul selectat în agendă';
 $labels['editcontact'] = 'Modifică contact';
+$labels['contacts'] = 'Contacte';
+$labels['contactproperties'] = 'Proprietăţile contactului...';
+$labels['personalinfo'] = 'Informații personale';
 $labels['edit'] = 'Editează';
 $labels['cancel'] = 'Renunţă';
 $labels['save'] = 'Salvează';
 $labels['delete'] = 'Şterge';
+$labels['rename'] = 'Redenumeşte';
+$labels['addphoto'] = 'Adaugă';
+$labels['replacephoto'] = 'Înlocuiește';
 $labels['newcontact'] = 'Creează contact nou';
 $labels['deletecontact'] = 'Şterge contactul selectat';
 $labels['composeto'] = 'Compune e-mail pentru';
@@ -203,6 +280,8 @@ $labels['print'] = 'Listează';
 $labels['export'] = 'Exportă';
 $labels['exportvcards'] = 'Exportă contactele în format vCard';
 $labels['newcontactgroup'] = 'Creează un nou grup de contacte';
+$labels['grouprename'] = 'Redenumește grupul';
+$labels['groupdelete'] = 'Șterge grupul';
 $labels['previouspage'] = 'Pagina anterioară';
 $labels['firstpage'] = 'Arată primul set';
 $labels['nextpage'] = 'Pagina următoare';
@@ -210,13 +289,17 @@ $labels['lastpage'] = 'Arată ultimul set';
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grupuri';
 $labels['personaladrbook'] = 'Adrese personale';
+$labels['searchsave'] = 'Salvează căutarea';
+$labels['searchdelete'] = 'Şterge căutarea';
 $labels['import'] = 'Importă';
 $labels['importcontacts'] = 'Importă contacte';
 $labels['importfromfile'] = 'Importă din fişier:';
+$labels['importtarget'] = 'Adaugă contactele noi în agenda:';
 $labels['importreplace'] = 'Înlocuieşte întreaga agendă';
 $labels['importtext'] = 'Puteţi încărca contacte dintr-o agendă existentă. Se pot importa adresele în format vCard.';
 $labels['done'] = 'Finalizat';
 $labels['settingsfor'] = 'Setări pentru';
+$labels['about'] = 'Despre';
 $labels['preferences'] = 'Preferinţe';
 $labels['userpreferences'] = 'Preferinţe utilizator';
 $labels['editpreferences'] = 'Modifică preferinţe utilizator';
@@ -228,6 +311,8 @@ $labels['edititem'] = 'Editează obiect';
 $labels['preferhtml'] = 'Format HTML';
 $labels['defaultcharset'] = 'Set implicit de caractere';
 $labels['htmlmessage'] = 'Mesaj HTML';
+$labels['dateformat'] = 'Format dată';
+$labels['timeformat'] = 'Format oră';
 $labels['prettydate'] = 'Dată formatată';
 $labels['setdefault'] = 'Setează implicit';
 $labels['autodetect'] = 'Automat';
@@ -237,6 +322,7 @@ $labels['pagesize'] = 'Rânduri pe pagină';
 $labels['signature'] = 'Semnătură';
 $labels['dstactive'] = 'Reglare automată oră de vară';
 $labels['htmleditor'] = 'Scrie mesaje HTML';
+$labels['htmlonreply'] = 'la răspunsul doar către un mesaj HTML';
 $labels['htmlsignature'] = 'Semnatură HTML';
 $labels['previewpane'] = 'Previzualizare mail';
 $labels['skin'] = 'Temă interfaţă';
@@ -248,6 +334,8 @@ $labels['mailboxview'] = 'Afişare căsuţă poştală';
 $labels['mdnrequests'] = 'Notificări expeditor';
 $labels['askuser'] = 'întreabă utilizatorul';
 $labels['autosend'] = 'trimite automat';
+$labels['autosendknown'] = 'trimite confirmarea de primire către contactele mele, în rest întreabă-mă';
+$labels['autosendknownignore'] = 'trimite confirmarea de primire către contactele mele, în rest ignoră';
 $labels['ignore'] = 'ignoră';
 $labels['readwhendeleted'] = 'Marchează mesajul ca şi citit la ştergere';
 $labels['flagfordeletion'] = 'Marchează mesajul pentru ştergere în loc de a-l şterge direct';
@@ -273,6 +361,7 @@ $labels['advancedoptions'] = 'Opţiuni avansate';
 $labels['focusonnewmessage'] = 'Focalizare pe fereastra browser-ului la mesaje noi';
 $labels['checkallfolders'] = 'Verifică toate dosarele pentru mesaje noi';
 $labels['displaynext'] = 'După ştergerea sau mutarea unui mesaj afişează-l pe următorul din listă';
+$labels['defaultfont'] = 'Font-ul implicit al mesajului HTML';
 $labels['mainoptions'] = 'Opţiuni principale';
 $labels['section'] = 'Secţiune';
 $labels['maintenance'] = 'Mentenanţă';
@@ -291,6 +380,17 @@ $labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnătură';
 $labels['previewpanemarkread'] = 'Marchează mesajele previzualizate ca citite';
 $labels['afternseconds'] = 'după $n secunde';
+$labels['reqmdn'] = 'Cere întotdeauna o confirmare de primire';
+$labels['reqdsn'] = 'Cere întotdeauna o notificare a stării de trimitere';
+$labels['replysamefolder'] = 'Pune răspunsurile în folder-ul mesajului la care se răspunde';
+$labels['defaultaddressbook'] = 'Adaugă noile contacte la agenda selectată';
+$labels['autocompletesingle'] = 'Sari peste adresele e-mail alternative la autocompletare';
+$labels['spellcheckbeforesend'] = 'Verifică ortografia înainte de a trimite un mesaj';
+$labels['spellcheckoptions'] = 'Opţiuni verificare ortografie';
+$labels['spellcheckignoresyms'] = 'Ignoră cuvintele cu simboluri';
+$labels['spellcheckignorenums'] = 'Ignoră cuvintele cu numere';
+$labels['spellcheckignorecaps'] = 'Ignoră cuvintele din litere mari';
+$labels['addtodict'] = 'Adaugă la dicţionar';
 $labels['folder'] = 'Dosar';
 $labels['foldername'] = 'Nume dosar';
 $labels['subscribed'] = 'Înscris';
@@ -299,9 +399,26 @@ $labels['create'] = 'Creează';
 $labels['createfolder'] = 'Creează dosar nou';
 $labels['managefolders'] = 'Administrează dosare';
 $labels['specialfolders'] = 'Dosare speciale';
+$labels['properties'] = 'Proprietăți';
+$labels['folderproperties'] = 'Proprietăţile folder-ului';
+$labels['parentfolder'] = 'Dosar părinte';
+$labels['location'] = 'Locație';
+$labels['info'] = 'Informații';
+$labels['getfoldersize'] = 'Click pentru dimensiunea dosarului';
+$labels['changesubscription'] = 'Click pentru a modifica abonarea';
+$labels['foldertype'] = 'Tip dosar';
+$labels['personalfolder'] = 'Dosar privat';
+$labels['otherfolder'] = 'Dosarul altui utilizator';
+$labels['sharedfolder'] = 'Dosar public';
 $labels['sortby'] = 'Sortează după';
 $labels['sortasc'] = 'Sortează ascendent';
 $labels['sortdesc'] = 'Sortează descendent';
+$labels['undo'] = 'Anulaţi/Revocați';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Versiune';
+$labels['source'] = 'Sursă';
+$labels['license'] = 'Licență';
+$labels['support'] = 'Cere asistenţă';
 $labels['B'] = 'O';
 $labels['KB'] = 'KO';
 $labels['MB'] = 'MO';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 777dc93ad..623c42bbd 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -20,12 +20,17 @@ $messages['cookiesdisabled'] = 'Browserul dumneavoastră nu acceptă cookies';
 $messages['sessionerror'] = 'Sesiunea dumneavoastră este invalidă sau a expirat';
 $messages['storageerror'] = 'Conectarea la serverul IMAP a eşuat';
 $messages['servererror'] = 'Eroare de server!';
+$messages['servererrormsg'] = 'Eroare Server: $msg';
+$messages['dberror'] = 'Eroare bază de date!';
+$messages['errorreadonly'] = 'Nu se poate efectua operaţia. Dosarul este doar-citire.';
+$messages['errornoperm'] = 'Nu se poate efectua operaţia. Acces interzis.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
 $messages['loading'] = 'Se încarcă...';
 $messages['uploading'] = 'Fişierul se încarcă...';
+$messages['uploadingmany'] = 'Încarc fişierele...';
 $messages['loadingdata'] = 'Se încarcă informaţiile...';
 $messages['checkingmail'] = 'Se caută mesaje noi...';
 $messages['sendingmessage'] = 'Trimitere mesaj...';
@@ -35,10 +40,12 @@ $messages['messagesaved'] = 'Mesajul a fost salvat în Ciorne';
 $messages['successfullysaved'] = 'Salvarea s-a efectuat cu succes';
 $messages['addedsuccessfully'] = 'Contactul a fost adăugat cu succes în agendă';
 $messages['contactexists'] = 'Mai există un contact cu această adresă de e-mail';
+$messages['contactnameexists'] = 'Există deja un contact cu acelaşi nume.';
 $messages['blockedimages'] = 'Pentru a vă proteja intimitatea, imaginile externe au fost blocate.';
 $messages['encryptedmessage'] = 'Acesta este un mesaj criptat şi nu poate fi afişat. Ne pare rău.';
 $messages['nocontactsfound'] = 'Nu s-a găsit nici un contact';
 $messages['contactnotfound'] = 'Contactul solicitat nu a fost găsit.';
+$messages['contactsearchonly'] = 'Introdu nişte termeni decăutare pentru a găsi contactele';
 $messages['sendingfailed'] = 'Nu s-a reuşit trimiterea mesajului';
 $messages['senttooquickly'] = 'Vă rugăm aşteptaţi $sec sec. înainte de a trimite acest mesaj';
 $messages['errorsavingsent'] = 'A intervenit o eroare în timp ce se efectua salvarea mesajului trimis';
@@ -48,11 +55,16 @@ $messages['errorcopying'] = 'Mesajul(e) nu a(u) putut fi copiat(e)';
 $messages['errordeleting'] = 'Mesajul(e) nu a(u) putut fi şters(e)';
 $messages['errormarking'] = 'Mesajul(e) nu a(u) putut fi marcat(e)';
 $messages['deletecontactconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
+$messages['deletegroupconfirm'] = 'Chiar vrei să ştergi grupul selectat?';
 $messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
 $messages['deletefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
 $messages['purgefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
+$messages['contactdeleting'] = 'Şterg contactul(ele)...';
+$messages['groupdeleting'] = 'Şterg grupul...';
 $messages['folderdeleting'] = 'Se şterge dosarul...';
 $messages['foldermoving'] = 'Se mută dosarul...';
+$messages['foldersubscribing'] = 'Abonez dosarul...';
+$messages['folderunsubscribing'] = 'Dezabonez dosarul...';
 $messages['formincomplete'] = 'Formularul nu a fost completat corect';
 $messages['noemailwarning'] = 'Vă rugăm să introduceţi o adresă de e-mail validă';
 $messages['nonamewarning'] = 'Vă rugăm să introduceţi un nume';
@@ -66,11 +78,16 @@ $messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căut
 $messages['nosearchname'] = 'Vă rugăm să introduceţi un nume de contact sau adresă de e-mail';
 $messages['notuploadedwarning'] = 'Nu toate fişierele au fost ataşate. Vă rugăm să aşteptaţi sau să anulaţi încărcarea acestora.';
 $messages['searchsuccessful'] = '$nr mesaje găsite';
+$messages['contactsearchsuccessful'] = '$nr contact(e) găsit(e).';
 $messages['searchnomatch'] = 'Căutarea nu a returnat niciun rezultat';
 $messages['searching'] = 'Se caută...';
 $messages['checking'] = 'Se verifică...';
 $messages['nospellerrors'] = 'Nu s-a găsit nicio greşeală de ortografie';
 $messages['folderdeleted'] = 'Dosarul a fost şters cu succes';
+$messages['foldersubscribed'] = 'Dosarul a fost abonat cu succes.';
+$messages['folderunsubscribed'] = 'Dosarul a fost dezabonat cu succes.';
+$messages['folderpurged'] = 'Dosarul a fost golit cu succes.';
+$messages['folderexpunged'] = 'Dosarul a fost comprimat cu succes.';
 $messages['deletedsuccessfully'] = 'Mesaj şters cu succes !';
 $messages['converting'] = 'Resetez mesajul la parametrii iniţiali...';
 $messages['messageopenerror'] = 'Nu s-a putut încărca mesajul din server';
@@ -82,8 +99,14 @@ $messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only"(se poate
 $messages['errorsavingcontact'] = 'Nu s-a putut salva adresa de contact';
 $messages['movingmessage'] = 'Mutare mesaj....';
 $messages['copyingmessage'] = 'Copiere mesaj...';
+$messages['copyingcontact'] = 'Copiez contact(ele)...';
+$messages['deletingmessage'] = 'Şterg mesaj(ele)...';
+$messages['markingmessage'] = 'Marchez mesaj(ele)...';
+$messages['addingmember'] = 'Adaug contact(ele) la grup...';
+$messages['removingmember'] = 'Şterg contact(ele) din grup...';
 $messages['receiptsent'] = 'Confirmarea de citire a fost trimisă cu succes';
 $messages['errorsendingreceipt'] = 'Confirmarea nu a putut fi trimisă';
+$messages['deleteidentityconfirm'] = 'Chiar vrei să ştergi aceasă identitate?';
 $messages['nodeletelastidentity'] = 'Nu puteţi şterge această identitate, este ultima.';
 $messages['forbiddencharacter'] = 'Numele dosarului conţine un caracter nepermis.';
 $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru încărcare';
@@ -93,6 +116,7 @@ $messages['contactremovedfromgroup'] = 'Contactele au fost şterse cu succes din
 $messages['importwait'] = 'Datele sunt importate, vă rugăm să aşteptaţi...';
 $messages['importerror'] = 'Importul a eşuat! Fişierul încărcat nu este un fişier vCard valid.';
 $messages['importconfirm'] = 'Contactele $inserted au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja:$names';
+$messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
 $messages['opnotpermitted'] = 'Operaţia nu este permisă!';
 $messages['nofromaddress'] = 'Nu există o adresă de e-mail în identitatea selectată';
 $messages['editorwarning'] = 'Trecerea în mod text a editorului va cauza pierderea formatării textului. Doriţi să continuaţi?';
@@ -106,4 +130,30 @@ $messages['smtperror'] = 'Eroare SMTP: $msg';
 $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
 $messages['toomanyrecipients'] = 'Prea mulţi destinatari. Reduceţi numărul de destinatari la $max.';
 $messages['maxgroupmembersreached'] = 'Numărul de membri ai grupului depăşeşte maximul de $max.';
+$messages['internalerror'] = 'A avut loc o eroare internă. Încearcă mai târziu.';
+$messages['contactdelerror'] = 'Nu am putut şterge contact(ele).';
+$messages['contactdeleted'] = 'Contact(ele) au fost şterse cu succes.';
+$messages['contactrestoreerror'] = 'Nu am putut restaura contact(ele) şterse.';
+$messages['contactrestored'] = 'Contact(ele) au fost restaurate cu succes.';
+$messages['groupdeleted'] = 'Grupul a fost şters cu succes.';
+$messages['grouprenamed'] = 'Grupul a fost redenumit cu succes.';
+$messages['groupcreated'] = 'Grupul a fost creat cu succes.';
+$messages['savedsearchdeleted'] = 'Căutarea salvată a fost ştearsă cu succes.';
+$messages['savedsearchdeleteerror'] = 'Nu a putut şterge căutarea salvată.';
+$messages['savedsearchcreated'] = 'Căutarea a fost salvată cu succes.';
+$messages['savedsearchcreateerror'] = 'Nu am putut salva căutarea.';
+$messages['messagedeleted'] = 'Mesaj(ele) a(u) fost şters(e) cu succes.';
+$messages['messagemoved'] = 'Mesaj(ele) a(u) fost mutat(e) cu succes.';
+$messages['messagecopied'] = 'Mesaj(ele) a(u) fost copiat(e) cu succes.';
+$messages['messagemarked'] = 'Mesaj(ele) a(u) fost marcat(e) cu succes.';
+$messages['autocompletechars'] = 'Introdu măcar $min caractere pentru autocompletare.';
+$messages['autocompletemore'] = 'Au fost găsite mai multe înregistrări. Introdu mai multe caractere.';
+$messages['namecannotbeempty'] = '"Nume" nu poate fi gol.';
+$messages['nametoolong'] = 'Numele este prea lung.';
+$messages['folderupdated'] = 'Dosar actualizat cu succes.';
+$messages['foldercreated'] = 'Dosar creat cu succes.';
+$messages['invalidimageformat'] = 'Tip invalid de imagine.';
+$messages['mispellingsfound'] = 'Au fost găsite greşeli de ortografie în mesaj.';
+$messages['parentnotwritable'] = 'Nu pot crea/muta dosarul în dosarul părinte selectat. Fără drepturi de acces.';
+$messages['messagetoobig'] = 'Partea de mesaj este prea mare pentru a o procesa.';
 
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index e1ec97e75..3abac46e3 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Vyacheslav Sharmanov <Unknown>                                |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -41,11 +41,13 @@ $labels['size'] = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статус прочтения';
+$labels['listoptions'] = 'Настройки списка...';
 $labels['mailboxlist'] = 'Папки';
 $labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Сообщения с $from по $to из $count';
 $labels['threadsfromto'] = 'Обсуждения с $from по $to из $count';
 $labels['messagenrof'] = 'Сообщение $nr из $count';
+$labels['fromtoshort'] = '$from – $to из $count';
 $labels['copy'] = 'Копировать';
 $labels['move'] = 'Переместить';
 $labels['moveto'] = 'Переместить в...';
@@ -92,13 +94,16 @@ $labels['longoct'] = 'Октябрь';
 $labels['longnov'] = 'Ноябрь';
 $labels['longdec'] = 'Декабрь';
 $labels['today'] = 'Сегодня';
+$labels['refresh'] = 'Обновить';
 $labels['checkmail'] = 'Доставить почту';
 $labels['compose'] = 'Написать сообщение';
 $labels['writenewmessage'] = 'Новое сообщение';
+$labels['reply'] = 'Ответить';
 $labels['replytomessage'] = 'Ответить';
 $labels['replytoallmessage'] = 'Ответить по списку или отправителю и всем получателям';
 $labels['replyall'] = 'Ответить всем';
 $labels['replylist'] = 'Ответить в список рассылки';
+$labels['forward'] = 'Вперёд';
 $labels['forwardinline'] = 'Переслать в теле письма';
 $labels['forwardattachment'] = 'Переслать как вложение';
 $labels['forwardmessage'] = 'Переслать';
@@ -111,12 +116,16 @@ $labels['nextmessage'] = 'Показать следующее сообщение
 $labels['lastmessage'] = 'Показать последнее сообщение';
 $labels['backtolist'] = 'К списку сообщений';
 $labels['viewsource'] = 'Исходный текст';
+$labels['mark'] = 'Пометить';
 $labels['markmessages'] = 'Пометить сообщение';
 $labels['markread'] = 'Как прочитанное';
 $labels['markunread'] = 'Как непрочитанное';
 $labels['markflagged'] = 'Установить флаг';
 $labels['markunflagged'] = 'Снять флаг';
 $labels['moreactions'] = 'Дополнительные действия...';
+$labels['more'] = 'Еще';
+$labels['back'] = 'Назад';
+$labels['options'] = 'Параметры';
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Отсутствует';
@@ -171,9 +180,11 @@ $labels['dsn'] = 'Уведомление о состоянии доставки'
 $labels['mailreplyintro'] = '$sender писал $date:';
 $labels['originalmessage'] = 'Исходное сообщение';
 $labels['editidents'] = 'Изменить данные';
+$labels['spellcheck'] = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
 $labels['resumeediting'] = 'Продолжить редактирование';
 $labels['revertto'] = 'Отменить правки';
+$labels['attach'] = 'Вложить';
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
 $labels['uploadprogress'] = '$percent ($current из $total)';
@@ -234,6 +245,7 @@ $labels['spouse'] = 'Супруг';
 $labels['allfields'] = 'Все поля';
 $labels['search'] = 'Поиск';
 $labels['advsearch'] = 'Расширенный поиск';
+$labels['advanced'] = 'Дополнительно';
 $labels['other'] = 'Другое';
 $labels['typeother'] = 'Другое';
 $labels['typehome'] = 'Дом';
@@ -261,6 +273,7 @@ $labels['delete'] = 'Удалить';
 $labels['rename'] = 'Переименовать';
 $labels['addphoto'] = 'Добавить';
 $labels['replacephoto'] = 'Заменить';
+$labels['uploadphoto'] = 'Загрузить фотографию';
 $labels['newcontact'] = 'Создать новый контакт';
 $labels['deletecontact'] = 'Удалить выбранные контакты';
 $labels['composeto'] = 'Создать сообщение для выбранных контактов';
@@ -352,6 +365,7 @@ $labels['checkallfolders'] = 'Проверять новые сообщения �
 $labels['displaynext'] = 'Показать следующее сообщение, после удаления или перемещения данного';
 $labels['defaultfont'] = 'Шрифт по умолчанию HTML сообщения';
 $labels['mainoptions'] = 'Основные настройки';
+$labels['browseroptions'] = 'Настройки обозревателя';
 $labels['section'] = 'Раздел';
 $labels['maintenance'] = 'Обслуживание';
 $labels['newmessage'] = 'Новое сообщение';
@@ -374,12 +388,14 @@ $labels['reqdsn'] = 'Всегда запрашивать уведомление
 $labels['replysamefolder'] = 'Помещать ответы в ту же папку, где находится оригинал';
 $labels['defaultaddressbook'] = 'Добавить новые контакты в выбранную адресную книгу';
 $labels['autocompletesingle'] = 'Пропускать дополнительные адреса в автозавершении';
+$labels['listnamedisplay'] = 'Выводить список контактов как';
 $labels['spellcheckbeforesend'] = 'Проверять орфографию перед отправкой';
 $labels['spellcheckoptions'] = 'Параметры проверки орфографии';
 $labels['spellcheckignoresyms'] = 'Пропускать слова с символами';
 $labels['spellcheckignorenums'] = 'Пропускать слова с цифрами';
 $labels['spellcheckignorecaps'] = 'Пропускать слова из прописных букв';
 $labels['addtodict'] = 'Добавить в словарь';
+$labels['mailtoprotohandler'] = 'Зарегистрировать обработчик для ссылок mailto:';
 $labels['folder'] = 'Папка';
 $labels['foldername'] = 'Имя папки';
 $labels['subscribed'] = 'Подписан';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index eb5609947..9dc0c7360 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nkolay Parukhin <parukhin@gmail.com>                          |
+ | Author: Vyacheslav Sharmanov <Unknown>                                |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Произошла ошибка!';
 $messages['loginfailed'] = 'Неудачная попытка входа';
 $messages['cookiesdisabled'] = 'Ваш броузер не принимает cookie';
 $messages['sessionerror'] = 'Ваша сессия устарела';
@@ -106,6 +107,7 @@ $messages['addingmember'] = 'Добавление контакта(ов) в гр
 $messages['removingmember'] = 'Удаление контакта(ов) из группы...';
 $messages['receiptsent'] = 'Уведомление о прочтении отправлено';
 $messages['errorsendingreceipt'] = 'Уведомление о прочтении не отправлено';
+$messages['deleteidentityconfirm'] = 'Вы на самом деле хотите удалить эту сущность?';
 $messages['nodeletelastidentity'] = 'Вы не можете удалить этот профиль, он у вас последний';
 $messages['forbiddencharacter'] = 'Имя папки содержит недопустимые символы';
 $messages['selectimportfile'] = 'Выберите файл для загрузки';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 62f2053c8..8f95c8881 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: panda <Unknown>                                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -41,11 +41,13 @@ $labels['size'] = 'Veľkosť';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizácia';
 $labels['readstatus'] = 'Čítať stav';
+$labels['listoptions'] = 'Nastavenia zoznamu...';
 $labels['mailboxlist'] = 'Priečinky';
 $labels['folders'] = 'Priečinky';
 $labels['messagesfromto'] = 'Správy od $from do $to z $count';
 $labels['threadsfromto'] = 'Konverzácie od $from do $to z $count';
 $labels['messagenrof'] = 'Správa $nr z $count';
+$labels['fromtoshort'] = '$from – $to z $count';
 $labels['copy'] = 'Kopírovať';
 $labels['move'] = 'Presunúť';
 $labels['moveto'] = 'presunúť do...';
@@ -92,13 +94,16 @@ $labels['longoct'] = 'Október';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Dnes';
+$labels['refresh'] = 'Obnoviť';
 $labels['checkmail'] = 'Skontrolovať nové správy';
 $labels['compose'] = 'Vytvoriť správu';
 $labels['writenewmessage'] = 'Vytvoriť novú správu';
+$labels['reply'] = 'Odpovedať';
 $labels['replytomessage'] = 'Odpovedať';
 $labels['replytoallmessage'] = 'Odpovedať všetkým';
 $labels['replyall'] = 'Odpovedať všetkým';
 $labels['replylist'] = 'Zoznam odpovedí';
+$labels['forward'] = 'Dopredu';
 $labels['forwardinline'] = 'Poslať ďalej';
 $labels['forwardattachment'] = 'Poslať ďalej ako prílohu';
 $labels['forwardmessage'] = 'Poslať ďalej';
@@ -111,12 +116,16 @@ $labels['nextmessage'] = 'Zobraziť ďalšiu správu';
 $labels['lastmessage'] = 'Zobraziť poslednú správu';
 $labels['backtolist'] = 'Späť na zoznam správ';
 $labels['viewsource'] = 'Ukázať zdroj správy';
+$labels['mark'] = 'Označiť';
 $labels['markmessages'] = 'Označiť správy';
 $labels['markread'] = 'Ako prečítané';
 $labels['markunread'] = 'Ako neprečítané';
 $labels['markflagged'] = 'Ako označené';
 $labels['markunflagged'] = 'Ako neoznačené';
 $labels['moreactions'] = 'Ďalšie akcie...';
+$labels['more'] = 'Ďalšie';
+$labels['back'] = 'Dozadu';
+$labels['options'] = 'Možnosti';
 $labels['select'] = 'Výber';
 $labels['all'] = 'Všetky';
 $labels['none'] = 'Nič';
@@ -171,9 +180,11 @@ $labels['dsn'] = 'Doručenie oznámenia o stave';
 $labels['mailreplyintro'] = '$date odosielateľ napísal:';
 $labels['originalmessage'] = 'Pôvodná správa';
 $labels['editidents'] = 'Editovať identity';
+$labels['spellcheck'] = 'Pravopis';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
 $labels['resumeediting'] = 'Pokračovať v úpravách';
 $labels['revertto'] = 'Vrátiť sa na';
+$labels['attach'] = 'Priložiť';
 $labels['attachments'] = 'Prílohy';
 $labels['upload'] = 'Nahrať';
 $labels['uploadprogress'] = '$percent ($current z $total)';
@@ -234,6 +245,7 @@ $labels['spouse'] = 'Partner';
 $labels['allfields'] = 'Všetky polia';
 $labels['search'] = 'Hľadať';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
+$labels['advanced'] = 'Rozšírené';
 $labels['other'] = 'Ostatné';
 $labels['typeother'] = 'Ostatné';
 $labels['typehome'] = 'Domov';
@@ -261,6 +273,7 @@ $labels['delete'] = 'Zmazať';
 $labels['rename'] = 'Premenovať';
 $labels['addphoto'] = 'Pridať';
 $labels['replacephoto'] = 'Nahradiť';
+$labels['uploadphoto'] = 'Nahrať fotku';
 $labels['newcontact'] = 'Vytvoriť nový kontakt';
 $labels['deletecontact'] = 'Zmazať zvolené kontakty';
 $labels['composeto'] = 'Vytvoriť správu pre';
@@ -352,6 +365,7 @@ $labels['checkallfolders'] = 'Kontrolovať nové správy vo všetkých zložkác
 $labels['displaynext'] = 'Zobraziť ďalšiu správu po zmazanie / prenosu správy';
 $labels['defaultfont'] = 'Prednastavený font HTML správ';
 $labels['mainoptions'] = 'Hlavné nastavenia';
+$labels['browseroptions'] = 'Nastavenia prehliadania';
 $labels['section'] = 'Sekcia';
 $labels['maintenance'] = 'Údržba';
 $labels['newmessage'] = 'Nová správa';
@@ -374,6 +388,7 @@ $labels['reqdsn'] = 'Vždy vyžadovať potvrdenie o doručení správy';
 $labels['replysamefolder'] = 'Umietniť odpoveď do adresára, kde je umiestnená správa, na ktorú sa odpovedalo';
 $labels['defaultaddressbook'] = 'Pridať nové kontakty do zvoleného adresára';
 $labels['autocompletesingle'] = 'Vynechať alternatívnu emailovú adresu pri automatickom dopĺňaní';
+$labels['listnamedisplay'] = 'Zobraziť kontakt ako';
 $labels['spellcheckbeforesend'] = 'Skontrolovať pravopis pred odoslaním správy';
 $labels['spellcheckoptions'] = 'Voľby kontroly pravopisu';
 $labels['spellcheckignoresyms'] = 'Ignorovať slová so symbolmi';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 828c69ce8..2defb2b37 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: panda <Unknown>                                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Vyskytla sa chyba!';
 $messages['loginfailed'] = 'Chybné prihlásenie';
 $messages['cookiesdisabled'] = 'Váš internetový prehliadač nepodporuje cookies, ktoré sú potrebné pre prihlásenie';
 $messages['sessionerror'] = 'Vaše prihlásenie je neplatné alebo vypršala jeho platnosť';
@@ -106,6 +107,7 @@ $messages['addingmember'] = 'Pridávam kontakt(y) do skupiny...';
 $messages['removingmember'] = 'Odoberám kontakt(y) zo skupiny';
 $messages['receiptsent'] = 'Potvrdenie o prijatí správy bolo odoslané';
 $messages['errorsendingreceipt'] = 'Potvrdenie o prijatí správy sa nedalo odoslať';
+$messages['deleteidentityconfirm'] = 'Skutočne chcete zmazať túto identitu?';
 $messages['nodeletelastidentity'] = 'Identita sa nedá odstrániť, je posledná a musí zostať.';
 $messages['forbiddencharacter'] = 'Názov priečinka obsahuje nepovolený znak';
 $messages['selectimportfile'] = 'Zvoľte súbor, ktorý chcete načítať';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index a08a419f6..506f358c3 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -350,6 +350,7 @@ $labels['advancedoptions'] = 'Dodatne možnosti';
 $labels['focusonnewmessage'] = 'Usmeri okno brskalnika na novo sporočilo';
 $labels['checkallfolders'] = 'Preglej nova sporočila za vse mape';
 $labels['displaynext'] = 'Po izbrisu/premikanju sporočila prikaži naslednje sporočilo';
+$labels['defaultfont'] = 'Privzeta pisava HTML sporočil';
 $labels['mainoptions'] = 'Osnovne nastavitve';
 $labels['section'] = 'Nastavitve';
 $labels['maintenance'] = 'Vzdrževanje';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 1bdaa1100..c5cc6b06c 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jure Kranjc <Unknown>                                         |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -20,7 +20,7 @@ $messages['cookiesdisabled'] = 'Vaš spletni brskalnik ne sprejema piškotkov.';
 $messages['sessionerror'] = 'Seja je neveljavna ali je potekla.';
 $messages['storageerror'] = 'Povezava z IMAP strežnikom je spodletela.';
 $messages['servererror'] = 'Napaka strežnika!';
-$messages['servererrormsg'] = 'Napaka strežnikaČ $msg';
+$messages['servererrormsg'] = 'Napaka strežnika $msg';
 $messages['dberror'] = 'Napaka v bazi';
 $messages['errorreadonly'] = 'Operacije ni bilo mogoče izvršiti. Mapa je na voljo samo za branje.';
 $messages['errornoperm'] = 'Operacije ni bilo mogoče izvršiti. Dostop zavrnjen.';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index f19c20f2e..a4328e53b 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jonas Nasholm <Unknown>                                       |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -41,11 +41,13 @@ $labels['size'] = 'Storlek';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Lässtatus';
+$labels['listoptions'] = 'Listalternativ...';
 $labels['mailboxlist'] = 'Kataloger';
 $labels['folders'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['threadsfromto'] = 'Tråd $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
+$labels['fromtoshort'] = '$from – $to av $count';
 $labels['copy'] = 'Kopiera';
 $labels['move'] = 'Flytta';
 $labels['moveto'] = 'Flytta till:';
@@ -92,13 +94,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Idag';
+$labels['refresh'] = 'Uppdatera';
 $labels['checkmail'] = 'Hämta nya meddelanden';
 $labels['compose'] = 'Nytt meddelande';
 $labels['writenewmessage'] = 'Nytt meddelande';
+$labels['reply'] = 'Svara';
 $labels['replytomessage'] = 'Svara avsändaren';
 $labels['replytoallmessage'] = 'Svara avsändaren och alla mottagare';
 $labels['replyall'] = 'Svara alla';
 $labels['replylist'] = 'Svara lista';
+$labels['forward'] = 'Vidarebefordra';
 $labels['forwardinline'] = 'Vidarebefordra infogat';
 $labels['forwardattachment'] = 'Vidarebefordra som bilaga';
 $labels['forwardmessage'] = 'Vidarebefordra meddelande';
@@ -111,12 +116,16 @@ $labels['nextmessage'] = 'Visa nästa meddelande';
 $labels['lastmessage'] = 'Visa sista meddelandet';
 $labels['backtolist'] = 'Tillbaka till meddelandelistan';
 $labels['viewsource'] = 'Visa källkod';
+$labels['mark'] = 'Märk';
 $labels['markmessages'] = 'Märk meddelande';
 $labels['markread'] = 'Läst';
 $labels['markunread'] = 'Oläst';
 $labels['markflagged'] = 'Flaggat';
 $labels['markunflagged'] = 'Oflaggat';
 $labels['moreactions'] = 'Ytterligare hantering...';
+$labels['more'] = 'Fler';
+$labels['back'] = 'Tillbaka';
+$labels['options'] = 'Alternativ';
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
@@ -171,9 +180,11 @@ $labels['dsn'] = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
 $labels['editidents'] = 'Ändra identiteter';
+$labels['spellcheck'] = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = 'Återuppta redigering';
 $labels['revertto'] = 'Återgå till';
+$labels['attach'] = 'Bifoga';
 $labels['attachments'] = 'Bilagor';
 $labels['upload'] = 'Bifoga';
 $labels['uploadprogress'] = '$percent ($current av $total)';
@@ -234,6 +245,7 @@ $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla fält';
 $labels['search'] = 'Sök';
 $labels['advsearch'] = 'Sök avancerat';
+$labels['advanced'] = 'Avancerad';
 $labels['other'] = 'Annat';
 $labels['typeother'] = 'Annat';
 $labels['typehome'] = 'Hem';
@@ -261,6 +273,7 @@ $labels['delete'] = 'Ta bort';
 $labels['rename'] = 'Ändra namn';
 $labels['addphoto'] = 'Lägg till';
 $labels['replacephoto'] = 'Ersätt';
+$labels['uploadphoto'] = 'Ladda upp foto';
 $labels['newcontact'] = 'Ny kontakt';
 $labels['deletecontact'] = 'Ta bort vald kontakt';
 $labels['composeto'] = 'Nytt meddelande till vald kontakt';
@@ -352,6 +365,7 @@ $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden
 $labels['displaynext'] = 'Visa nästa meddelande efter borttagning/flyttning av meddelande';
 $labels['defaultfont'] = 'Standardtypsnitt i HTML-meddelande';
 $labels['mainoptions'] = 'Huvudalternativ';
+$labels['browseroptions'] = 'Webbläsaralternativ';
 $labels['section'] = 'Avdelning';
 $labels['maintenance'] = 'Underhåll';
 $labels['newmessage'] = 'Nytt meddelande';
@@ -374,12 +388,14 @@ $labels['reqdsn'] = 'Begär alltid leveransstatusmeddelande';
 $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
 $labels['defaultaddressbook'] = 'Lägg till nya kontakter i vald adressbok';
 $labels['autocompletesingle'] = 'Hoppa över alternativa adresser vid automatisk komplettering';
+$labels['listnamedisplay'] = 'Lista kontakter som';
 $labels['spellcheckbeforesend'] = 'Kontrollera stavning innan meddelanden skickas';
 $labels['spellcheckoptions'] = 'Rättstavningsalternativ';
 $labels['spellcheckignoresyms'] = 'Ignorera ord med symboler';
 $labels['spellcheckignorenums'] = 'Ignorera ord med siffror';
 $labels['spellcheckignorecaps'] = 'Ignorera ord med enbart stora bokstäver';
 $labels['addtodict'] = 'Lägg till i ordlista';
+$labels['mailtoprotohandler'] = 'Ange program för hantering av mailto-länkar';
 $labels['folder'] = 'Katalog';
 $labels['foldername'] = 'Katalognamn';
 $labels['subscribed'] = 'Prenumererad';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index cf0846b88..0a5adfad4 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Jonas Nasholm <Unknown>                                       |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = 'Ett fel uppstod!';
 $messages['loginfailed'] = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
 $messages['sessionerror'] = 'Din inloggning är felaktig eller har gått ut';
@@ -106,6 +107,7 @@ $messages['addingmember'] = 'Lägger till kontakter i gruppen...';
 $messages['removingmember'] = 'Tar bort kontakter från gruppen...';
 $messages['receiptsent'] = 'Mottagarkvitto har skickats';
 $messages['errorsendingreceipt'] = 'Mottagarkvitto kunde inte skickas';
+$messages['deleteidentityconfirm'] = 'Vill du verkligen ta bort denna identitet?';
 $messages['nodeletelastidentity'] = 'Du kan inte ta bort identiteten, den är din sista.';
 $messages['forbiddencharacter'] = 'Katalognamnet innehåller otillåtna tecken';
 $messages['selectimportfile'] = 'Välj en fil att ladda upp';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index a3843c683..9e7cb2bf5 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Gökdeniz Karadağ <Unknown>                                  |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Klasörler';
 $labels['messagesfromto'] = 'Postalar: $from - $to , Toplam: $count';
 $labels['threadsfromto'] = 'Dizilmler: $from - $to, Toplam $count';
 $labels['messagenrof'] = 'Posta: $nr / $count';
+$labels['fromtoshort'] = '$from - $to , Toplam: $count';
 $labels['copy'] = 'Kopyala';
 $labels['move'] = 'Taşı';
 $labels['moveto'] = 'Buraya taşı...';
@@ -92,13 +93,16 @@ $labels['longoct'] = 'Ekim';
 $labels['longnov'] = 'Kasım';
 $labels['longdec'] = 'Aralık';
 $labels['today'] = 'Bugün';
+$labels['refresh'] = 'Yenile';
 $labels['checkmail'] = 'Yeni postaları kontrol et';
 $labels['compose'] = 'Yeni posta oluştur';
 $labels['writenewmessage'] = 'Yeni posta oluştur';
+$labels['reply'] = 'Yanıtla';
 $labels['replytomessage'] = 'Gönderene yanıtla';
 $labels['replytoallmessage'] = 'Gönderene ve tüm alıcılara yanıtla';
 $labels['replyall'] = 'Tümüne yanıtla';
 $labels['replylist'] = 'Listeye yanıtla';
+$labels['forward'] = 'İlet';
 $labels['forwardinline'] = 'Postanın içinde ilet';
 $labels['forwardattachment'] = 'Eklenti olarak ilet';
 $labels['forwardmessage'] = 'Postayı ilet';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = 'Sonraki postayı göster';
 $labels['lastmessage'] = 'Son postayı göster';
 $labels['backtolist'] = 'Posta listesine dön';
 $labels['viewsource'] = 'Kaynağı göster';
+$labels['mark'] = 'İşaretle';
 $labels['markmessages'] = 'Postaları işaretle';
 $labels['markread'] = 'okunmuş olarak';
 $labels['markunread'] = 'okunmamış olarak';
 $labels['markflagged'] = 'işaretli olarak';
 $labels['markunflagged'] = 'işaretsiz olarak';
 $labels['moreactions'] = 'Daha fazla eylem...';
+$labels['more'] = 'Daha Fazla';
+$labels['back'] = 'Geri';
+$labels['options'] = 'Seçenekler';
 $labels['select'] = 'Seç';
 $labels['all'] = 'Hepsini';
 $labels['none'] = 'Yok';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Teslimat durumu bildirisi';
 $labels['mailreplyintro'] = '$date, $sender yazmış:';
 $labels['originalmessage'] = 'Özgün ileti';
 $labels['editidents'] = 'Kimlikleri düzenle';
+$labels['spellcheck'] = 'Yazım denetimi';
 $labels['checkspelling'] = 'Yazım denetimi yap';
 $labels['resumeediting'] = 'Düzenlemeye devam et';
 $labels['revertto'] = 'Geri çevir:';
+$labels['attach'] = 'Ekle';
 $labels['attachments'] = 'Ekler';
 $labels['upload'] = 'Yükle';
 $labels['uploadprogress'] = '$percent ($current / $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Eş';
 $labels['allfields'] = 'Tüm alanlar';
 $labels['search'] = 'Ara';
 $labels['advsearch'] = 'Gelişmiş ara';
+$labels['advanced'] = 'Gelişmiş';
 $labels['other'] = 'Diğer';
 $labels['typeother'] = 'Diğer';
 $labels['typehome'] = 'Ev';
@@ -374,6 +385,7 @@ $labels['reqdsn'] = 'Her zaman teslimat durumu bildirisi iste';
 $labels['replysamefolder'] = 'Yanıtları, yanıtlanan postanın bulunduğu klasöre kaydet';
 $labels['defaultaddressbook'] = 'Yeni kişileri seçili adres defterine ekle';
 $labels['autocompletesingle'] = 'Otomatik tamamlamalarda alternatif e-posta adreslerini atla';
+$labels['listnamedisplay'] = 'Kişiyi görüntüle';
 $labels['spellcheckbeforesend'] = 'Posta göndermeden önce yazım denetimi yap';
 $labels['spellcheckoptions'] = 'Yazım denetimi seçenekleri';
 $labels['spellcheckignoresyms'] = 'İçinde sembol geçen kelimleri göz ardı et';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index f0d859055..89f9a4d06 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Gruba kişi(ler) ekleniyor...';
 $messages['removingmember'] = 'Gruptan kişi(ler) siliniyor...';
 $messages['receiptsent'] = 'Okundu onayı gönderildi';
 $messages['errorsendingreceipt'] = 'Okundu onayı gönderilemedi';
+$messages['deleteidentityconfirm'] = 'Bu kimliği silmek istediğinizden emin misiniz?';
 $messages['nodeletelastidentity'] = 'Son kimliğiniz olduğu için bu kimliği silemezsiniz';
 $messages['forbiddencharacter'] = 'Klasör ismi yasaklanmış bir karakter içeriyor';
 $messages['selectimportfile'] = 'Lütfen yüklenecek dosyayı seçin';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index ca74d816f..ecf0874bc 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = '目录管理';
 $labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
 $labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['fromtoshort'] = '自 $from – $to 统计 $count';
 $labels['copy'] = '复制';
 $labels['move'] = '移动';
 $labels['moveto'] = '移动到';
@@ -92,13 +93,16 @@ $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
 $labels['today'] = '今日';
+$labels['refresh'] = '刷新';
 $labels['checkmail'] = '收取新邮件';
 $labels['compose'] = '写新邮件';
 $labels['writenewmessage'] = '写新邮件';
+$labels['reply'] = '回复';
 $labels['replytomessage'] = '回复发件人';
 $labels['replytoallmessage'] = '回复所有';
 $labels['replyall'] = '回复全部';
 $labels['replylist'] = '回复列表';
+$labels['forward'] = '转发';
 $labels['forwardinline'] = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage'] = '转发邮件';
@@ -111,12 +115,16 @@ $labels['nextmessage'] = '下一封';
 $labels['lastmessage'] = '最后一封';
 $labels['backtolist'] = '返回邮件列表';
 $labels['viewsource'] = '显示邮件源文件';
+$labels['mark'] = '标记';
 $labels['markmessages'] = '标记邮件';
 $labels['markread'] = '已读';
 $labels['markunread'] = '未读';
 $labels['markflagged'] = '已标记';
 $labels['markunflagged'] = '未标记';
 $labels['moreactions'] = '更多动作...';
+$labels['more'] = '更多';
+$labels['back'] = '后退';
+$labels['options'] = '选项';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
@@ -171,9 +179,11 @@ $labels['dsn'] = '投递状态提示';
 $labels['mailreplyintro'] = '于 $date, $sender 回复:';
 $labels['originalmessage'] = '原始信件';
 $labels['editidents'] = '编辑身份';
+$labels['spellcheck'] = '拼写';
 $labels['checkspelling'] = '拼写检查';
 $labels['resumeediting'] = '重新编辑';
 $labels['revertto'] = '恢复至';
+$labels['attach'] = '附加';
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
 $labels['uploadprogress'] = '$percent ($current / $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有项目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
+$labels['advanced'] = '高级选项';
 $labels['other'] = '其他';
 $labels['typeother'] = '其他';
 $labels['typehome'] = '家庭';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index fe0e81da1..43c5dfb69 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen <Unknown>                                              |
+ | Author: Tenyi <tenyitseng@yahoo.com.tw>                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -22,7 +22,7 @@ $labels['server'] = '伺服器';
 $labels['login'] = '登入';
 $labels['logout'] = '登出';
 $labels['mail'] = '電子郵件';
-$labels['settings'] = '個人設定';
+$labels['settings'] = '設定';
 $labels['addressbook'] = '通訊錄';
 $labels['inbox'] = '收件匣';
 $labels['drafts'] = '草稿匣';
@@ -46,6 +46,7 @@ $labels['folders'] = '資料夾';
 $labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
 $labels['threadsfromto'] = '郵件串 $from 至 $to，共有 $count 個';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
+$labels['fromtoshort'] = '自 $from – $to 統計 $count';
 $labels['copy'] = '複製';
 $labels['move'] = '移動';
 $labels['moveto'] = '移至...';
@@ -175,15 +176,17 @@ $labels['charset'] = '郵件編碼';
 $labels['editortype'] = '編輯器類型';
 $labels['returnreceipt'] = '要求讀取回條';
 $labels['dsn'] = '傳送狀態通知';
-$labels['mailreplyintro'] = '$sender 於 $data 寫到:';
+$labels['mailreplyintro'] = '$sender 於 $date 寫到:';
 $labels['originalmessage'] = '郵件顯示設定';
 $labels['editidents'] = '編輯身份資訊';
+$labels['spellcheck'] = '拼字';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto'] = '恢復至';
 $labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
+$labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close'] = '關閉';
 $labels['messageoptions'] = '郵件選項...';
 $labels['low'] = '低';
@@ -285,7 +288,7 @@ $labels['nextpage'] = '顯示下一頁';
 $labels['lastpage'] = '顯示最後一頁';
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
-$labels['personaladrbook'] = '個人住址';
+$labels['personaladrbook'] = '個人通訊錄';
 $labels['searchsave'] = '儲存搜尋結果';
 $labels['searchdelete'] = '刪除搜尋結果';
 $labels['import'] = '匯入通訊錄';
@@ -381,6 +384,8 @@ $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
 $labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
+$labels['autocompletesingle'] = '在自動完成中略過另一個email';
+$labels['listnamedisplay'] = '標記聯絡人為';
 $labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
 $labels['spellcheckoptions'] = '拼字檢查選項';
 $labels['spellcheckignoresyms'] = '忽略符號';