From a5ee723f4254d8c7a4f8bf236c3e0a6bec8a5676 Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Fri, 03 Dec 2010 04:30:36 -0500
Subject: [PATCH] fr_FR cs_CZ id_ID en_GB et_EE ja_JP gl_ES zh_TW sv_SE cy_GB ru_RU es_ES bg_BG r_HR nl_NL uk_UA updates

---
 program/localization/fr_FR/messages.inc |   16 +
 program/localization/cy_GB/labels.inc   |    7 
 program/localization/fr_FR/labels.inc   |    9 
 program/localization/id_ID/messages.inc |   18 +
 program/localization/es_ES/labels.inc   |   20 +
 program/localization/en_GB/labels.inc   |   25 +
 program/localization/ja_JP/messages.inc |   65 ++--
 program/localization/zh_TW/messages.inc |    1 
 program/localization/cy_GB/messages.inc |   14 +
 program/localization/cs_CZ/messages.inc |   20 +
 program/localization/ja_JP/labels.inc   |  268 +++++++------------
 program/localization/ru_RU/labels.inc   |    8 
 program/localization/sv_SE/labels.inc   |    3 
 program/localization/et_EE/messages.inc |    3 
 program/localization/en_GB/messages.inc |   26 +
 program/localization/gl_ES/messages.inc |   24 +
 program/localization/gl_ES/labels.inc   |   40 ++
 program/localization/nl_NL/labels.inc   |    6 
 program/localization/sv_SE/messages.inc |   12 
 program/localization/uk_UA/labels.inc   |    7 
 program/localization/es_ES/messages.inc |   14 +
 program/localization/bg_BG/messages.inc |    2 
 program/localization/uk_UA/messages.inc |   13 +
 program/localization/hr_HR/labels.inc   |   87 ++++++
 program/localization/id_ID/labels.inc   |   24 +
 25 files changed, 481 insertions(+), 251 deletions(-)

diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index cf9acbf..187d0de 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -11,7 +11,7 @@
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Todor Dragnev <todor.dragnev@gmail.com>                       |
-|   Nickolay Bunev <just4nick@gmail.com>                                |
+|	  Nickolay Bunev <just4nick@gmail.com>								|
 +-----------------------------------------------------------------------+
 
 @version $Id$
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 4f806e1..b8f53af 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -26,6 +26,7 @@
 $messages['sessionerror'] = 'Vaše přihlášení je neplatné nebo vypršelo';
 $messages['imaperror'] = 'Připojení na IMAP server selhalo';
 $messages['servererror'] = 'Chyba serveru!';
+$messages['servererrormsg'] = 'Chyba serveru: $msg';
 $messages['invalidrequest'] = 'Nesprávný požadavek. Data nebyla uložena.';
 $messages['nomessagesfound'] = 'Ve schránce nebyla nalezena žádná zpráva';
 $messages['loggedout'] = 'Byli jste úspěšně odhlášeni. Nashledanou!';
@@ -91,6 +92,8 @@
 $messages['errorsavingcontact'] = 'Nemohu uložit adresu kontaktu';
 $messages['movingmessage'] = 'Přesouvám zprávu...';
 $messages['copyingmessage'] = 'Kopíruji zprávu...';
+$messages['deletingmessage'] = 'Odstraňuji zprávu...';
+$messages['markingmessage'] = 'Označuji zprávu...';
 $messages['receiptsent'] = 'Potvrzení o přřijetí zprávy odesláno';
 $messages['errorsendingreceipt'] = 'Potvrzení o přijetí zprávy nebylo možné odeslat';
 $messages['nodeletelastidentity'] = 'Alespoň jedna identita musí být ponechána. Identitu nelze odstranit.';
@@ -102,20 +105,31 @@
 $messages['contactremovedfromgroup'] = 'Kontakty byly odstraněny z této skupiny';
 $messages['importwait'] = 'Importuji, prosím čekejte...';
 $messages['importerror'] = 'Během importu nastala chyba! Nahraný soubor není ve formátu vCard.';
-$messages['importconfirm'] = '<b>Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno:$names';
 $messages['opnotpermitted'] = 'Operace není povolena!';
 $messages['nofromaddress'] = 'Chybějící e-mailová adresa v označeném profilu';
 $messages['editorwarning'] = 'Přepnutím do režimu prostého textu ztratíte veškeré formátování. Chcete pokračovat?';
-$messages['httpreceivedencrypterror'] = 'Vyskytla se vážná chyba v konfiguraci. Kontaktujte neprodleně administátora. <b>Vaše zpráva nemohla být odeslána.</b>';
+$messages['httpreceivedencrypterror'] = 'Vyskytla se vážná chyba v konfiguraci. Kontaktujte neprodleně administátora. Vaše zpráva nemohla být odeslána.';
 $messages['smtpconnerror'] = 'Chyba SMTP ($code): Připojení k serveru selhalo';
 $messages['smtpautherror'] = 'Chyba SMTP ($code): Chyba přihlášení';
 $messages['smtpfromerror'] = 'Chyba SMTP ($code): Nelze nastavit odesílatele "$from" ($msg)';
 $messages['smtptoerror'] = 'Chyba SMTP ($code): Nelze přidat příjemce "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Chyba SMTP: Nelze zpracovat seznam příjemců';
+$messages['smtpdsnerror'] = 'Chyba SMTP: Není podporováno oznamení o stavu doručení (DSN)';
 $messages['smtperror'] = 'Chyba SMTP: $msg';
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Příliš mnoho příjemců. Změňte počet příjemců na $max.';
 $messages['maxgroupmembersreached'] = 'Počet členských skupin dosáhl maximum z $max';
 $messages['internalerror'] = 'Došlo k interní chybě. Zkuste to znovu';
+$messages['contactdelerror'] = 'Kontakty nelze odstranit';
+$messages['contactdeleted'] = 'Kontakty byly odstraněny';
+$messages['groupdeleted'] = 'Skupina byla odstraněna';
+$messages['grouprenamed'] = 'Skupina byla přejmenována';
+$messages['groupcreated'] = 'Skupina vytvořena';
+$messages['messagedeleted'] = 'Zpráva odstraněna';
+$messages['messagemoved'] = 'Zpráva byla přesunuta';
+$messages['messagecopied'] = 'Zpráva byla zkopirována';
+$messages['messagemarked'] = 'Zpráva označena';
+$messages['autocompletechars'] = 'Napište alespoň $min znaků pro automatické doplnění';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 0f8e22c..d504673 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -41,6 +41,7 @@
 $labels['size'] = 'Maint';
 $labels['priority'] = 'Blaenoriaeth';
 $labels['organization'] = 'Enw\'r Sefydliad';
+$labels['readstatus'] = 'Statws darllen';
 $labels['reply-to'] = 'Ateb-I';
 $labels['mail-reply-to'] = 'Neges-Ateb-I';
 $labels['mail-followup-to'] = 'Neges-Ddilynol-I';
@@ -172,6 +173,7 @@
 $labels['charset'] = 'Set nodiau';
 $labels['editortype'] = 'Math golygydd';
 $labels['returnreceipt'] = 'Cadarnhau derbyn';
+$labels['dsn'] = 'Hysbysiad statws danfon';
 $labels['editidents'] = 'Golygu personoliaethau';
 $labels['checkspelling'] = 'Gwirio sillafu';
 $labels['resumeediting'] = 'Ail-ddechrau golygu';
@@ -209,6 +211,7 @@
 $labels['addcontact'] = 'Ychwanegu cyswllt newydd';
 $labels['editcontact'] = 'Golygu cyswllt';
 $labels['contacts'] = 'Cysylltiadau';
+$labels['contactproperties'] = 'Nodweddion cyswllt';
 $labels['edit'] = 'Golygu';
 $labels['cancel'] = 'Canslo';
 $labels['save'] = 'Cadw';
@@ -256,6 +259,7 @@
 $labels['signature'] = 'Llofnod';
 $labels['dstactive'] = 'Amser arbed golau ddydd';
 $labels['htmleditor'] = 'Ysgrifennu negeseuon HTML';
+$labels['htmlonreply'] = 'wrth ateb i neges HTML yn unig';
 $labels['htmlsignature'] = 'Llofnod HTML';
 $labels['previewpane'] = 'Dangos ffenest rhagolwg';
 $labels['skin'] = 'Croen rhyngwyneb';
@@ -268,6 +272,7 @@
 $labels['askuser'] = 'gofyn i\'r defnyddiwr';
 $labels['autosend'] = 'danfon yn awtomatig';
 $labels['autosendknown'] = 'danfon y derbynneb i fy nghsylltiadau yn unig';
+$labels['autosendknownignore'] = 'danfon derbynneb i fy nghysylltiadau, anwybyddu fel arall';
 $labels['ignore'] = 'anwybyddu';
 $labels['readwhendeleted'] = 'Nodi\'r neges fel darllenwyd wrth ddileu';
 $labels['flagfordeletion'] = 'Fflagio\'r neges i\'w ddileu yn hytrach na dileu yn syth';
@@ -313,6 +318,8 @@
 $labels['previewpanemarkread'] = 'Nodi negeseuon rhagolwg fel darllenwyd';
 $labels['afternseconds'] = 'ar ôl $n eiliad';
 $labels['reqmdn'] = 'Bob amser gofyn am dderbynneb danfon';
+$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['folder'] = 'Ffolder';
 $labels['folders'] = 'Ffolderi';
 $labels['foldername'] = 'Enw ffolder';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 4a20d30..9445eb4 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -20,6 +20,7 @@
 $messages['sessionerror'] = 'Mae\'r sesiwn yn anghywir neu wedi dod i ben';
 $messages['imaperror'] = 'Methwyd cysylltu a\'r gweinydd IMAP';
 $messages['servererror'] = 'Gwall Gweinydd!';
+$messages['servererrormsg'] = 'Gwall Gweinydd: $msg';
 $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
 $messages['loggedout'] = 'Rydych wedi gorffen y sesiwn yn llwyddianus. Hwyl fawr!';
@@ -85,6 +86,8 @@
 $messages['errorsavingcontact'] = 'Methwyd cadw cyfeiriad y cyswllt';
 $messages['movingmessage'] = 'Yn symud neges...';
 $messages['copyingmessage'] = 'Yn copïo\'r neges';
+$messages['deletingmessage'] = 'Yn dileu neges(euon)...';
+$messages['markingmessage'] = 'Yn marcio neges(euon)...';
 $messages['receiptsent'] = 'Danfonwyd cadarnhad derbyn yn llwyddiannus';
 $messages['errorsendingreceipt'] = 'Methwyd danfon cadarnhad derbyn';
 $messages['nodeletelastidentity'] = 'Allwch chi ddim dileu\'r personoliaeth yma, hwn yw\'r un olaf.';
@@ -106,10 +109,21 @@
 $messages['smtpfromerror'] = 'Gwall SMTP ($code): Methwyd gosod y danfonwr "$from" ($msg)';
 $messages['smtptoerror'] = 'Gwall SMTP ($code): Methwyd ychwanegu derbynwr "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Gwall SMTP: Nid oedd yn bosib darllen y rhestr o dderbynnwyr';
+$messages['smtpdsnerror'] = 'Gwall SMTP: Dim cefnogaeth i Hysbysiadau Statws Danfon';
 $messages['smtperror'] = 'Gwall SMTP: $msg';
 $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email';
 $messages['toomanyrecipients'] = 'Gormod o dderbynnwyr. Lleihewch y nifer i $max';
 $messages['maxgroupmembersreached'] = 'Mae nifer o aelodau\'r grŵp yn fwy na\'r uchafswm o $max';
 $messages['internalerror'] = 'Fe gafwyd gwall mewnol. Rhowch gynnig arni eto.';
+$messages['contactdelerror'] = 'Methwyd dileu cyswllt';
+$messages['contactdeleted'] = 'Cyswllt wedi ei ddileu yn llwyddiannus';
+$messages['groupdeleted'] = 'Grŵp wedi ei ddileu yn llwyddiannus';
+$messages['grouprenamed'] = 'Grŵp wedi ei ailenwi yn llwyddiannus';
+$messages['groupcreated'] = 'Grŵp wedi ei greu yn llwyddiannus';
+$messages['messagedeleted'] = 'Neges(euon) wedi eu dileu yn llwyddiannus';
+$messages['messagemoved'] = 'Neges(euon) wedi eu symud yn llwyddiannus';
+$messages['messagecopied'] = 'Neges(euon) wedi eu copïo yn llwyddiannus';
+$messages['messagemarked'] = 'Neges(euon) wedi eu marcio yn llwyddiannus';
+$messages['autocompletechars'] = 'Rhowch o leia $min llythyren ar gyfer awto-gwblhau';
 
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 44f4d11..07ad87f 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -38,11 +38,16 @@
 $labels['cc'] = 'Copy';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Reply-To';
+$labels['mailreplyto'] = 'Mail-Reply-To';
+$labels['mailfollowupto'] = 'Mail-Followup-To';
 $labels['date'] = 'Date';
 $labels['size'] = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisation';
-$labels['reply-to'] = 'Reply-To';
+$labels['readstatus'] = 'Read status';
+$labels['reply-to'] = $labels['replyto'];
+$labels['mail-reply-to'] = $labels['mailreplyto'];
+$labels['mail-followup-to'] = $labels['mailfollowupto'];
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
@@ -96,7 +101,9 @@
 $labels['checkmail'] = 'Check for new messages';
 $labels['writenewmessage'] = 'Create a new message';
 $labels['replytomessage'] = 'Reply to sender';
-$labels['replytoallmessage'] = 'Reply to sender and all recipients';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']  = 'Reply all';
+$labels['replylist'] = 'Reply list';
 $labels['forwardmessage'] = 'Forward the message';
 $labels['deletemessage'] = 'Delete message';
 $labels['movemessagetotrash'] = 'Move message to "Deleted Items"';
@@ -169,6 +176,7 @@
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Editor type';
 $labels['returnreceipt'] = 'Return receipt';
+$labels['dsn'] = 'Delivery status notification';
 $labels['editidents'] = 'Edit identities';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
@@ -193,6 +201,8 @@
 $labels['addcc'] = 'Add Cc';
 $labels['addbcc'] = 'Add Bcc';
 $labels['addreplyto'] = 'Add Reply-To';
+$labels['addmailreplyto'] = 'Add Mail-Reply-To';
+$labels['addmailfollowupto'] = 'Add Mail-Followup-To';
 $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'Return Receipt (read)';
 $labels['yourmessage'] = 'This is a Return Receipt for your message';
@@ -204,6 +214,7 @@
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
 $labels['edit'] = 'Edit';
 $labels['cancel'] = 'Cancel';
 $labels['save'] = 'Save';
@@ -251,6 +262,7 @@
 $labels['signature'] = 'Signature';
 $labels['dstactive'] = 'Summer time';
 $labels['htmleditor'] = 'Compose HTML messages';
+$labels['htmlonreply'] = 'on reply to HTML message only';
 $labels['htmlsignature'] = 'HTML signature';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
@@ -259,10 +271,11 @@
 $labels['uisettings'] = 'User Interface';
 $labels['serversettings'] = 'Server Settings';
 $labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'Sender notifications';
-$labels['askuser'] = 'ask the user';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask each time';
 $labels['autosend'] = 'send automatically';
-$labels['autosendknown'] = 'send receipt to my contacts only';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignore';
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
@@ -308,6 +321,8 @@
 $labels['previewpanemarkread'] = 'Mark previewed messages as read';
 $labels['afternseconds'] = 'after $n seconds';
 $labels['reqmdn'] = 'Always request a return receipt';
+$labels['reqdsn'] = 'Always request a delivery status notification';
+$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index ec4f6e7..b33514d 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -23,6 +23,7 @@
 $messages['sessionerror'] = 'Your session is invalid or has expired';
 $messages['imaperror'] = 'Connection to IMAP server failed';
 $messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
@@ -46,10 +47,10 @@
 $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message';
 $messages['errorsavingsent'] = 'An error occurred while saving sent message';
 $messages['errorsaving'] = 'An error occurred while saving';
-$messages['errormoving'] = 'Could not move the message';
+$messages['errormoving'] = 'Could not move the message(s)';
 $messages['errorcopying'] = 'Could not copy the message(s)';
-$messages['errordeleting'] = 'Could not delete the message';
-$messages['errormarking'] = 'Could not mark the message';
+$messages['errordeleting'] = 'Could not delete the message(s)';
+$messages['errormarking'] = 'Could not mark the message(s)';
 $messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
 $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
 $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
@@ -86,8 +87,10 @@
 $messages['copyerror'] = 'Could not copy any addresses';
 $messages['sourceisreadonly'] = 'This address source is read-only';
 $messages['errorsavingcontact'] = 'Could not save the contact address';
-$messages['movingmessage'] = 'Moving message...';
-$messages['copyingmessage'] = 'Copying message...';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
 $messages['receiptsent'] = 'Successfully sent a read receipt';
 $messages['errorsendingreceipt'] = 'Could not send the receipt';
 $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
@@ -109,10 +112,21 @@
 $messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
+$messages['smtpdsnerror'] = 'SMTP Error: Server does not support Delivery Status Notifications';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
 $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max';
 $messages['internalerror'] = 'An internal error occured. Please try again';
+$messages['contactdelerror'] = 'Could not delete contact(s)';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully';
+$messages['groupdeleted'] = 'Group deleted successfully';
+$messages['grouprenamed'] = 'Group renamed successfully';
+$messages['groupcreated'] = 'Group created successfully';
+$messages['messagedeleted'] = 'Message(s) deleted successfully';
+$messages['messagemoved'] = 'Message(s) moved successfully';
+$messages['messagecopied'] = 'Message(s) copied successfully';
+$messages['messagemarked'] = 'Message(s) marked successfully';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion';
 
-?>
+?>
\ No newline at end of file
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 4e4829f..2d79ed5 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -40,11 +40,16 @@
 $labels['cc'] = 'Copia';
 $labels['bcc'] = 'Cco';
 $labels['replyto'] = 'Respuesta a';
+$labels['mailreplyto'] = 'Responder a';
+$labels['mailfollowupto'] = 'Seguir a';
 $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Leer estado';
 $labels['reply-to'] = 'Respuesta a';
+$labels['mail-reply-to'] = 'Responder a';
+$labels['mail-followup-to'] = 'Seguir a';
 $labels['mailboxlist'] = 'Bandejas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
@@ -99,6 +104,8 @@
 $labels['writenewmessage'] = 'Crear nuevo mensaje';
 $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['forwardmessage'] = 'Reenviar mensaje';
 $labels['deletemessage'] = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
@@ -171,13 +178,15 @@
 $labels['charset'] = 'Codificación';
 $labels['editortype'] = 'Tipo de editor';
 $labels['returnreceipt'] = 'Acuse de recibo';
+$labels['dsn'] = 'Entrega de notificaciones de estado';
+$labels['editidents'] = 'Editar identidades';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto'] = 'Revertir a';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['close'] = 'Cerrar';
-$labels['messageoptions']  = 'Opciones de mensaje...';
+$labels['messageoptions'] = 'Opciones de mensaje...';
 $labels['low'] = 'Bajo';
 $labels['lowest'] = 'Bajísimo';
 $labels['normal'] = 'Normal';
@@ -194,6 +203,8 @@
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
+$labels['addmailreplyto'] = 'Añadir Responder a';
+$labels['addmailfollowupto'] = 'Añadir Seguir a';
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
@@ -205,6 +216,7 @@
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades del contacto';
 $labels['edit'] = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save'] = 'Guardar';
@@ -252,6 +264,7 @@
 $labels['signature'] = 'Firma';
 $labels['dstactive'] = 'Cambio de horario';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
+$labels['htmlonreply'] = 'En respuesta al mensaje sólo HTML';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
@@ -263,6 +276,8 @@
 $labels['mdnrequests'] = 'Notificaciones de envío';
 $labels['askuser'] = 'preguntar al usuario';
 $labels['autosend'] = 'enviar automáticamente';
+$labels['autosendknown'] = 'Añade el destinatario a mis contacatos, sino pregunta me';
+$labels['autosendknownignore'] = 'Añade el destinatario a mis contacatos, ignoralo';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensaje como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensaje para borrarse en vez de borrarlo';
@@ -307,6 +322,9 @@
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread'] = 'Marcar mensaje previsualizado como leído';
 $labels['afternseconds'] = 'después de $n segundos';
+$labels['reqmdn'] = 'Solicitar siempre un acuse de recibo';
+$labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones de estado';
+$labels['replysamefolder'] = 'Coloque las respuestas en la carpeta del mensaje que se responde';
 $labels['folder'] = 'Bandeja';
 $labels['folders'] = 'Bandejas';
 $labels['foldername'] = 'Nombre de bandeja';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index d2d4a83..6749151 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -25,6 +25,7 @@
 $messages['sessionerror'] = 'Su sesión no existe o ha expirado';
 $messages['imaperror'] = 'Error de conexión con el servidor IMAP';
 $messages['servererror'] = '¡Error en el servidor!';
+$messages['servererrormsg'] = 'Error del Servidor: $msg';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
@@ -90,6 +91,8 @@
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
 $messages['copyingmessage'] = 'Copiando mensaje...';
+$messages['deletingmessage'] = 'Eliminando Mensaje(s)...';
+$messages['markingmessage'] = 'Marcando Mensaje(s)...';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
@@ -111,10 +114,21 @@
 $messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg)';
 $messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
+$messages['smtpdsnerror'] = 'Error SMTP: No hay soporte para las Notificaciones de Entrega';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
 $messages['internalerror'] = 'Ocurrió un error interno. Por favor intentalo de nuevo';
+$messages['contactdelerror'] = 'No se ha podido eliminar el contacto(s)';
+$messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente';
+$messages['groupdeleted'] = 'Grupo eliminado correctamente';
+$messages['grouprenamed'] = 'Grupo renombrado correctamente';
+$messages['groupcreated'] = 'Grupo creado correctamente';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) correctamente';
+$messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente';
+$messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente';
+$messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente';
+$messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar';
 
 ?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index f679277..2a84659 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -132,6 +132,3 @@
 $messages['autocompletechars'] = 'Sisesta vähemalt $min märki autocompleteks';
 
 ?>
-
-
-
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 09028f2..8c65a43 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -44,6 +44,7 @@
 $labels['size'] = 'Taille';
 $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
+$labels['readstatus'] = 'Status de lecture';
 $labels['reply-to'] = 'Répondre à';
 $labels['mailboxlist'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
@@ -99,6 +100,8 @@
 $labels['writenewmessage'] = 'Écrire un nouveau message';
 $labels['replytomessage'] = 'Répondre au message';
 $labels['replytoallmessage'] = 'Répondre à tous';
+$labels['replyall'] = 'Répondre à tous';
+$labels['replylist'] = 'Répondre à la liste';
 $labels['forwardmessage'] = 'Transmettre le message';
 $labels['deletemessage'] = 'Déplacer le message dans la corbeille';
 $labels['movemessagetotrash'] = 'Déplacer le message dans la corbeille';
@@ -171,6 +174,7 @@
 $labels['charset'] = 'Encodage';
 $labels['editortype'] = 'Type d\'éditeur';
 $labels['returnreceipt'] = 'Accusé de réception';
+$labels['dsn'] = 'Notification d\'état de distribution';
 $labels['editidents'] = 'Modifier les identités';
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
@@ -206,6 +210,7 @@
 $labels['addcontact'] = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
 $labels['editcontact'] = 'Modifier le contact';
 $labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Propriétés de contact';
 $labels['edit'] = 'Modifier';
 $labels['cancel'] = 'Annuler';
 $labels['save'] = 'Sauvegarder';
@@ -253,6 +258,7 @@
 $labels['signature'] = 'Signature';
 $labels['dstactive'] = 'Heure d\'été';
 $labels['htmleditor'] = 'Composer un message au format HTML';
+$labels['htmlonreply'] = 'en réponse aux messages HTML uniquement';
 $labels['htmlsignature'] = 'Signature HTML';
 $labels['previewpane'] = 'Afficher le panneau d\'aperçu';
 $labels['skin'] = 'Thème de l\'interface';
@@ -265,6 +271,7 @@
 $labels['askuser'] = 'demander à l\'utilisateur';
 $labels['autosend'] = 'envoyer automatiquement';
 $labels['autosendknown'] = 'Envoyer un avis de réception uniquement à mes contacts';
+$labels['autosendknownignore'] = 'envoie un accusé à mes contacts, sinon ignorer';
 $labels['ignore'] = 'ignorer';
 $labels['readwhendeleted'] = 'Marquer le message comme lu à la suppression';
 $labels['flagfordeletion'] = 'Mettre le drapeau de suppression au lieu de supprimer';
@@ -310,6 +317,8 @@
 $labels['previewpanemarkread'] = 'Marquer les messages prévisualisés comme lus';
 $labels['afternseconds'] = 'après $n secondes';
 $labels['reqmdn'] = 'Toujours demandé un avis de réception';
+$labels['reqdsn'] = 'Toujours demander une notification d\'état de distribution';
+$labels['replysamefolder'] = 'Placer les réponses dans le dossier du message étant répondu';
 $labels['folder'] = 'Dossier';
 $labels['folders'] = 'Dossiers';
 $labels['foldername'] = 'Nom du dossier';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index a3018fa..af812ea 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -25,6 +25,7 @@
 $messages['sessionerror'] = 'Votre session est invalide ou a expiré';
 $messages['imaperror'] = 'Erreur de connexion au serveur IMAP';
 $messages['servererror'] = 'Erreur Serveur !';
+$messages['servererrormsg'] = 'Erreur du serveur: $msg';
 $messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.';
 $messages['nomessagesfound'] = 'Aucun message trouvé dans cette boîte aux lettres';
 $messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
@@ -90,6 +91,8 @@
 $messages['errorsavingcontact'] = 'Ne peut pas enregistrer l\'adresse du contact';
 $messages['movingmessage'] = 'Déplacement du message...';
 $messages['copyingmessage'] = 'Copie du message ...';
+$messages['deletingmessage'] = 'Suppression des messages...';
+$messages['markingmessage'] = 'Marquage des messages...';
 $messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
 $messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
@@ -111,10 +114,21 @@
 $messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from" ($msg)';
 $messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destinataire "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erreur SMTP: Impossible de lire la liste des destinataires';
+$messages['smtpdsnerror'] = 'Erreur SMTP: Pas de support des notifications d\'état de distribution';
 $messages['smtperror'] = 'Erreur SMTP: $msg';
 $messages['emailformaterror'] = 'Adresse email incorrecte: $email';
 $messages['toomanyrecipients'] = 'Trop de destinataires. Réduisez leur nombre à $max maximum.';
 $messages['maxgroupmembersreached'] = 'Le nombre de membres du groupe dépasse le maximum de $max.';
 $messages['internalerror'] = 'Une erreur interne est survenue. Merci de réessayer';
+$messages['contactdelerror'] = 'Les contacts n\'ont pas pu être supprimés';
+$messages['contactdeleted'] = 'Les contacts ont bien été supprimés';
+$messages['groupdeleted'] = 'Le groupe a bien été supprimé';
+$messages['grouprenamed'] = 'Le groupe a bien été renommé';
+$messages['groupcreated'] = 'Le groupe a bien été créé';
+$messages['messagedeleted'] = 'Les messages ont bien été supprimés';
+$messages['messagemoved'] = 'Les messages ont bien été déplacés';
+$messages['messagecopied'] = 'Les messages ont bien été copiés';
+$messages['messagemarked'] = 'Les messages ont bien été marqués';
+$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 13e2a2c..1304ffc 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -28,18 +28,23 @@
 $labels['drafts'] = 'Borradores';
 $labels['sent'] = 'Enviado';
 $labels['trash'] = 'Cubo do Lixo';
-$labels['junk'] = 'Lixo';
+$labels['junk'] = 'Correo Lixo';
 $labels['subject'] = 'Asunto';
 $labels['from'] = 'Remitente';
 $labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia';
-$labels['bcc'] = 'Copia Oculta';
-$labels['replyto'] = 'Respostar a';
+$labels['cc'] = 'Copia (CC)';
+$labels['bcc'] = 'Copia Oculta (BCC)';
+$labels['replyto'] = 'Respostar a (Reply-To)';
+$labels['mailreplyto'] = 'Respostar ao autor (Mail-Reply-To)';
+$labels['mailfollowupto'] = 'Respostar a todos (Mail-Followup-To)';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Estado da lectura';
 $labels['reply-to'] = 'Respostar a';
+$labels['mail-reply-to'] = 'Respostar ao autor';
+$labels['mail-followup-to'] = 'Respostar a todos';
 $labels['mailboxlist'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes do $from ao $to de $count';
 $labels['threadsfromto'] = 'Fíos do $from ao $to de $count';
@@ -93,10 +98,12 @@
 $labels['checkmail'] = 'Procurar novas mensaxes';
 $labels['writenewmessage'] = 'Crear unha nova mensaxe';
 $labels['replytomessage'] = 'Respostar a mensaxe';
-$labels['replytoallmessage'] = 'Respostar a todos';
+$labels['replytoallmessage'] = 'Respostar á lista ou ao remitente e a tódolos destinatarios';
+$labels['replyall'] = 'Respostar a todos';
+$labels['replylist'] = 'Respostar á lista de correo';
 $labels['forwardmessage'] = 'Reenviar a mensaxe';
 $labels['deletemessage'] = 'Eliminar a mensaxe';
-$labels['movemessagetotrash'] = 'Mover a mensaxe ó cubo do lixo';
+$labels['movemessagetotrash'] = 'Mover a mensaxe ao cubo do lixo';
 $labels['printmessage'] = 'Imprimir esta mensaxe';
 $labels['previousmessage'] = 'Amosar a mensaxe anterior';
 $labels['previousmessages'] = 'Amosar o grupo anterior de mensaxes';
@@ -165,7 +172,9 @@
 $labels['addattachment'] = 'Anexar un ficheiro';
 $labels['charset'] = 'Codificación';
 $labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Notificación de disposición';
+$labels['returnreceipt'] = 'Notificación da entrega';
+$labels['dsn'] = 'Notificación do estado de envío (DSN)';
+$labels['editidents'] = 'Modificar identidades';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
 $labels['revertto'] = 'Voltar a';
@@ -189,9 +198,11 @@
 $labels['addcc'] = 'Engadir Copia (CC)';
 $labels['addbcc'] = 'Engadir Copia Oculta (BCC)';
 $labels['addreplyto'] = 'Engadir Respostar a (Reply-To)';
+$labels['addmailreplyto'] = 'Engadir Respostar ao autor (Mail-Reply-To)';
+$labels['addmailfollowupto'] = 'Engadir Respostar a todos (Mail-Followup-To)';
 $labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede a lea. Quere notificar ao remitente?';
-$labels['receiptread'] = 'Notificación da disposición da mensaxe (lectura)';
-$labels['yourmessage'] = 'Esta é unha notificación de disposición para a súa mensaxe';
+$labels['receiptread'] = 'Notificación da entrega da mensaxe (lectura)';
+$labels['yourmessage'] = 'Esta é unha notificación da entrega da súa mensaxe';
 $labels['receiptnote'] = 'Nota: Esta notificación só confirma que a mensaxe se abriu no computador do destinatario. Non asegura que o destinatario o lera ou entendera o seu contido.';
 $labels['name'] = 'Nome completo';
 $labels['firstname'] = 'Nome';
@@ -200,6 +211,7 @@
 $labels['addcontact'] = 'Engadir novo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades do contacto';
 $labels['edit'] = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save'] = 'Gardar';
@@ -247,6 +259,7 @@
 $labels['signature'] = 'Sinatura';
 $labels['dstactive'] = 'Cambio de hora';
 $labels['htmleditor'] = 'Redactar mensaxes HTML';
+$labels['htmlonreply'] = 'só cando se resposte a unha mensaxe HTML';
 $labels['htmlsignature'] = 'Sinatura HTML';
 $labels['previewpane'] = 'Amosar panel de previsualización';
 $labels['skin'] = 'Aspecto da interface';
@@ -255,9 +268,11 @@
 $labels['uisettings'] = 'Interface de usuario';
 $labels['serversettings'] = 'Axustes do servidor';
 $labels['mailboxview'] = 'Vista das caixas de correo';
-$labels['mdnrequests'] = 'Notificacións de envío';
-$labels['askuser'] = 'preguntar ao usuario';
+$labels['mdnrequests'] = 'Cando se solicitan notificacións da entrega';
+$labels['askuser'] = 'preguntarme qué facer';
 $labels['autosend'] = 'enviar automáticamente';
+$labels['autosendknown'] = 'enviar aos meus contactos, noutros casos preguntarme';
+$labels['autosendknownignore'] = 'enviar aos meus contactos, noutros casos ignorar';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar a mensaxe coma lida ao eliminar';
 $labels['flagfordeletion'] = 'Marcar a mensaxe para eliminar no canto de eliminar';
@@ -302,6 +317,9 @@
 $labels['insertsignature'] = 'Engadir firma';
 $labels['previewpanemarkread'] = 'Marcar como lidas as mensaxes previsualizadas';
 $labels['afternseconds'] = 'logo de $n segundos';
+$labels['reqmdn'] = 'Solicitar sempre unha notificación da entrega';
+$labels['reqdsn'] = 'Solicitar sempre unha notificación do estado de envío';
+$labels['replysamefolder'] = 'Deixar as respostas no cartafol onde está a mensaxe á que se responde';
 $labels['folder'] = 'Cartafol';
 $labels['folders'] = 'Cartafoles';
 $labels['foldername'] = 'Nome do cartafol';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 5eb5c89..2b5e09d 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -19,7 +19,8 @@
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas';
 $messages['sessionerror'] = 'A súa sesión non é válida ou expirou';
 $messages['imaperror'] = 'Fallou a conexión co servidor IMAP';
-$messages['servererror'] = 'Erro no servidor!';
+$messages['servererror'] = 'Erro do servidor!';
+$messages['servererrormsg'] = 'Erro do servidor: $msg';
 $messages['invalidrequest'] = 'Petición inválida!. Non se gardou ningún dato.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo';
 $messages['loggedout'] = 'Rematou correctamente a súa sesión. Ata logo!';
@@ -83,10 +84,12 @@
 $messages['copyerror'] = 'Non foi posible copiar ningún enderezo';
 $messages['sourceisreadonly'] = 'A orixe é de só lectura';
 $messages['errorsavingcontact'] = 'Non foi posible gardar o contacto';
-$messages['movingmessage'] = 'Movendo a mensaxe...';
-$messages['copyingmessage'] = 'Copiando a mensaxe...';
-$messages['receiptsent'] = 'A notificación de disposición enviouse correctamente';
-$messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación de disposición';
+$messages['movingmessage'] = 'Movendo a(s) mensaxe(s)...';
+$messages['copyingmessage'] = 'Copiando a(s) mensaxe(s)...';
+$messages['deletingmessage'] = 'Eliminando a(s) mensaxe(s)...';
+$messages['markingmessage'] = 'Marcando a(s) mensaxe(s)...';
+$messages['receiptsent'] = 'A notificación da entrega enviouse correctamente';
+$messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación da entrega';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última';
 $messages['addsubfolderhint'] = 'Este cartafol vaise crear coma un subcartafol do seleccionado';
 $messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido';
@@ -106,10 +109,21 @@
 $messages['smtpfromerror'] = 'Erro SMTP ($code): Non foi posible establecer o remitente "$from" ($msg)';
 $messages['smtptoerror'] = 'Erro SMTP ($code): Non foi posible engadir o destinatario "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Erro SMTP: Non se pode analizar a lista de destinatarios';
+$messages['smtpdsnerror'] = 'Erro SMTP: Non hai soporte para notificacións do estado de envío (DSN)';
 $messages['smtperror'] = 'Erro SMTP: $msg';
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email';
 $messages['toomanyrecipients'] = 'Especificou demasiados destinatarios. Por favor, redúzaos a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max.';
 $messages['internalerror'] = 'Ocurriu un erro interno. Por favor, probe outra vez.';
+$messages['contactdelerror'] = 'Non foi posible borrar o(s) contacto(s)';
+$messages['contactdeleted'] = 'Borráronse correctamente o(s) contacto(s)';
+$messages['groupdeleted'] = 'Borrouse correctamente o grupo';
+$messages['grouprenamed'] = 'Mudouse correctamente o nome do grupo';
+$messages['groupcreated'] = 'Creouse correctamente o grupo';
+$messages['messagedeleted'] = 'Borráronse correctamente a(s) mensaxe(s)';
+$messages['messagemoved'] = 'Movéronse correctamente a(s) mensaxe(s)';
+$messages['messagecopied'] = 'Copiáronse correctamente a(s) mensaxe(s)';
+$messages['messagemarked'] = 'Marcáronse correctamente a(s) mensaxe(s)';
+$messages['autocompletechars'] = 'Introduza polo menos $min caracteres para autocompletar';
 
 ?>
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 835159e..1e919db 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -38,21 +38,26 @@
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Odgovor-na';
+$labels['mailreplyto'] = 'Mail-Odogovori-na';
+$labels['mailfollowupto'] = 'Mail-Nastavi-na';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
+$labels['readstatus'] = 'Pročitano';
 $labels['reply-to'] = 'Odgovor-na';
+$labels['mail-reply-to'] = 'Mail-Odogovori-na';
+$labels['mail-followup-to'] = 'Mail-Nastavi-na';
 $labels['mailboxlist'] = '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['moveto'] = 'prebaci u...';
-$labels['download'] = 'preuzmi (download)';
+$labels['copy'] = 'Kopiraj';
+$labels['move'] = 'Premjesti';
+$labels['moveto'] = 'Premjesti u...';
+$labels['download'] = 'Preuzmi (download)';
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
-$labels['preferhtml'] = 'HTML format u prednosti';
-$labels['htmlmessage'] = 'HTML format poruke';
-$labels['prettydate'] = 'Formatiran datum';
 $labels['addtoaddressbook'] = 'Dodaj u imenik';
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
@@ -97,6 +102,8 @@
 $labels['writenewmessage'] = 'Nova poruka';
 $labels['replytomessage'] = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primateljima';
+$labels['replyall'] = 'Odgovori svima';
+$labels['replylist'] = 'Odgovori listi';
 $labels['forwardmessage'] = 'Prosljedi poruku';
 $labels['deletemessage'] = 'Prebaci poruku u mapu smeće';
 $labels['movemessagetotrash'] = 'Preseli poruke u smeće';
@@ -120,12 +127,35 @@
 $labels['select'] = 'Označi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Nijednu';
+$labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Markirane';
 $labels['unanswered'] = 'Neodgovrene';
 $labels['deleted'] = 'Obrisano';
 $labels['invert'] = 'Obrni';
 $labels['filter'] = 'Filtriraj';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Teme';
+$labels['expand-all'] = 'Proširi sve';
+$labels['expand-unread'] = 'Proširi nepročitane';
+$labels['collapse-all'] = 'Zatvori sve';
+$labels['threaded'] = 'Tematski prikaz';
+$labels['autoexpand_threads'] = 'Proširi teme poruka';
+$labels['do_expand'] = 'Sve teme';
+$labels['expand_only_unread'] = 'samo sa nepročitanim porukama';
+$labels['fromto'] = 'Pošiljatelj/Primatelj';
+$labels['flag'] = 'Zastava';
+$labels['attachment'] = 'Privitak';
+$labels['nonesort'] = 'Ništa';
+$labels['sentdate'] = 'Datum slanja';
+$labels['arrival'] = 'Datum primanja';
+$labels['asc'] = 'uzlazno';
+$labels['desc'] = 'silazno';
+$labels['listcolumns'] = 'Kolone';
+$labels['listsorting'] = 'Sortirajuća kolona';
+$labels['listorder'] = 'Sortirajući redoslijed';
+$labels['listmode'] = 'Model pregleda listi';
+$labels['folderactions'] = 'Akcije mapa';
 $labels['compact'] = 'Kompresiranje';
 $labels['empty'] = 'Isprazni ';
 $labels['purge'] = 'Očisti';
@@ -146,12 +176,15 @@
 $labels['charset'] = 'Charset';
 $labels['editortype'] = 'Tip editora';
 $labels['returnreceipt'] = 'Potvrda o primitku poruke';
+$labels['dsn'] = 'Potvrda o poslanoj poruci';
+$labels['editidents'] = 'Promijeni identitete';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Povratak u pisanje';
 $labels['revertto'] = 'Vrati na';
 $labels['attachments'] = 'Privitci (Attachments)';
 $labels['upload'] = 'Dodaj';
 $labels['close'] = 'Zatvori';
+$labels['messageoptions'] = 'Opcije poruka...';
 $labels['low'] = 'Nizak';
 $labels['lowest'] = 'Najniži';
 $labels['normal'] = 'Srednji';
@@ -168,6 +201,8 @@
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Odgovori-na';
+$labels['addmailreplyto'] = 'Dodaj Mail-Odgovori-na';
+$labels['addmailfollowupto'] = 'Dodaj Mail-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';
@@ -178,6 +213,8 @@
 $labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmjeni kontakt';
+$labels['contacts'] = 'Kontakti';
+$labels['contactproperties'] = 'Svojstva kontakta';
 $labels['edit'] = 'Izmjeni';
 $labels['cancel'] = 'Odustani';
 $labels['save'] = 'Spremi';
@@ -189,10 +226,13 @@
 $labels['print'] = 'Print';
 $labels['export'] = 'Export';
 $labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
+$labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
+$labels['groupactions'] = 'Akcije kontaktne grupe';
 $labels['previouspage'] = 'Prethodna strana';
 $labels['firstpage'] = 'Prva strana';
 $labels['nextpage'] = 'Slijedeća strana';
 $labels['lastpage'] = 'Zadnja strana';
+$labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Privatna adresa';
 $labels['import'] = 'Uvoz';
@@ -210,6 +250,10 @@
 $labels['newidentity'] = 'Dodaj identitet';
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Uredi';
+$labels['preferhtml'] = 'HTML format u prednosti';
+$labels['defaultcharset'] = 'Zadani skup znakova';
+$labels['htmlmessage'] = 'HTML format poruke';
+$labels['prettydate'] = 'Formatiran datum';
 $labels['setdefault'] = 'Postavi predodređeno';
 $labels['autodetect'] = 'Auto';
 $labels['language'] = 'Jezik';
@@ -218,6 +262,7 @@
 $labels['signature'] = 'Potpis';
 $labels['dstactive'] = 'Automatska promjena vremena';
 $labels['htmleditor'] = 'Sastavi HTML poruke';
+$labels['htmlonreply'] = 'odgovor samo na HTML poruke';
 $labels['htmlsignature'] = 'HTML potpis';
 $labels['previewpane'] = 'Prikaži područje pregleda';
 $labels['skin'] = 'Tema izgleda';
@@ -229,10 +274,13 @@
 $labels['mdnrequests'] = 'Obavijest pošiljatelja';
 $labels['askuser'] = 'pitaj korisnika';
 $labels['autosend'] = 'šalji automatski';
-$labels['ignore'] = 'ignoriraj';
+$labels['autosendknown'] = 'Dodaj primatelja u moje kontakte, u suprotnom me pitaj';
+$labels['autosendknownignore'] = 'Dodaj primatelja u moje kontakte, 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'] = 'Ukoliko premještanje poruka u mapu otpad ne uspije, izbrši poruku';
 $labels['showremoteimages'] = 'Prikaži slike s interneta';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
@@ -240,13 +288,15 @@
 $labels['autosavedraft'] = 'Automatski spremi draft';
 $labels['everynminutes'] = 'svakih $n minuta';
 $labels['keepalive'] = 'Provjeri nove poruke';
-$labels['never'] = 'Nikada';
+$labels['never'] = 'nikada';
+$labels['immediately'] = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
 $labels['messagescomposition'] = 'Komponiram poruke';
 $labels['mimeparamfolding'] = 'Nazivi privitaka';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (ostali)';
+$labels['force7bit'] = 'Koristi MIME postavke za 8-bitne znakove';
 $labels['advancedoptions'] = 'Napredne postavke';
 $labels['focusonnewmessage'] = 'Fokusiraj browser pri novoj poruci';
 $labels['checkallfolders'] = 'Provjeri nove poruke u svim mapama';
@@ -268,6 +318,11 @@
 $labels['belowquote'] = 'ispod citata';
 $labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
+$labels['previewpanemarkread'] = 'Obilježi pregledane 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'] = 'Mapa';
 $labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
@@ -287,5 +342,23 @@
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Engleski';
+$labels['westerneuropean'] = 'Zapadno Europski';
+$labels['easterneuropean'] = 'Istočno Europski';
+$labels['southeasterneuropean'] = 'Južno-Istočni Europski';
+$labels['baltic'] = 'Balitčki';
+$labels['cyrillic'] = 'Čirilčni';
+$labels['arabic'] = 'Arapski';
+$labels['greek'] = 'Grčki';
+$labels['hebrew'] = 'Hibru';
+$labels['turkish'] = 'Turski';
+$labels['nordic'] = 'Nordski';
+$labels['thai'] = 'Tajlandski';
+$labels['celtic'] = 'Keltski';
+$labels['vietnamese'] = 'Vijetnamski';
+$labels['japanese'] = 'Japanski';
+$labels['korean'] = 'Korejski';
+$labels['chinese'] = 'Kineski';
 
 ?>
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 854712d..9e1d556 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -10,7 +10,7 @@
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
-| Author: Putu Arya Sabda Wijaya <klunxer@gmail.com>                    |
+| Author: Putu Arya Sabda Wijaya <ptaryasw@isi-dps.ac.id>                    |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -38,11 +38,16 @@
 $labels['cc'] = 'Lampiran';
 $labels['bcc'] = 'Lampiran tersembunyi';
 $labels['replyto'] = 'Balas kepada';
+$labels['mailreplyto'] = 'Surat Balasan Untuk';
+$labels['mailfollowupto'] = 'Surat Tindak Lanjut Untuk';
 $labels['date'] = 'Tanggal';
 $labels['size'] = 'Ukuran';
 $labels['priority'] = 'Prioritas';
 $labels['organization'] = 'Organisasi';
+$labels['readstatus'] = 'Status Terbaca';
 $labels['reply-to'] = 'Balas kepada';
+$labels['mail-reply-to'] = 'Surat Balasan Untuk';
+$labels['mail-followup-to'] = 'Surat Tindak Lanjut Untuk';
 $labels['mailboxlist'] = 'Map';
 $labels['messagesfromto'] = 'Pesan ke $from sampai $to dari $count';
 $labels['threadsfromto'] = 'Untaian ke $from sampai $to dari $count';
@@ -97,6 +102,8 @@
 $labels['writenewmessage'] = 'Buat pesan baru';
 $labels['replytomessage'] = 'Balas pesan';
 $labels['replytoallmessage'] = 'Balas ke pengirim dan yang lain';
+$labels['replyall'] = 'Balas ke semua';
+$labels['replylist'] = 'Balas ke milis';
 $labels['forwardmessage'] = 'Teruskan pesan';
 $labels['deletemessage'] = 'Hapus pesan';
 $labels['movemessagetotrash'] = 'Pindahkan pesan ke tong sampah';
@@ -168,7 +175,9 @@
 $labels['addattachment'] = 'Sisipkan sebuah berkas';
 $labels['charset'] = 'Set karakter';
 $labels['editortype'] = 'Tipe penyunting';
-$labels['returnreceipt'] = 'Kembalikan penerima';
+$labels['returnreceipt'] = 'Tanda terima kembali';
+$labels['dsn'] = 'Pemberitahuan status terkirim';
+$labels['editidents'] = 'Ubah identitas';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
 $labels['revertto'] = 'Balikkan ke';
@@ -192,6 +201,8 @@
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Balas Ke';
+$labels['addmailreplyto'] = 'Tambahkan Balas-Ke';
+$labels['addmailfollowupto'] = 'Tambahkan Tindak-Lanjut-Ke';
 $labels['mdnrequest'] = 'Pengirim pesan ini telah meminta untuk diberitahu ketika Anda membaca pesan ini. Apakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Tanda Terima (baca)';
 $labels['yourmessage'] = 'Ini adalah Tanda Terima untuk pesan Anda';
@@ -203,6 +214,7 @@
 $labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
 $labels['contacts'] = 'Daftar kontak';
+$labels['contactproperties'] = 'Properti kontak';
 $labels['edit'] = 'Ubah';
 $labels['cancel'] = 'Batal';
 $labels['save'] = 'Simpan';
@@ -250,6 +262,7 @@
 $labels['signature'] = 'Tanda tangan';
 $labels['dstactive'] = 'Waktu Musim Panas';
 $labels['htmleditor'] = 'Tulis pesan HTML';
+$labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
 $labels['htmlsignature'] = 'Tandatangan HTML';
 $labels['previewpane'] = 'Perlihatkan tempat melihat';
 $labels['skin'] = 'Tampilan antarmuka';
@@ -258,9 +271,11 @@
 $labels['uisettings'] = 'Antarmuka pengguna';
 $labels['serversettings'] = 'Pengaturan Server';
 $labels['mailboxview'] = 'Tampilan Kotak Surat';
-$labels['mdnrequests'] = 'Pemberitahuan pada pengirim';
+$labels['mdnrequests'] = 'Sedang dimintakan tanda terima kembali';
 $labels['askuser'] = 'tanya pengguna';
 $labels['autosend'] = 'kirim otomatis';
+$labels['autosendknown'] = 'kirim tanda terima kepada kontak saya, selain itu tanyai saya';
+$labels['autosendknownignore'] = 'kirim tanda terima kepada kontak saya, selain acuhkan';
 $labels['ignore'] = 'acuhkan';
 $labels['readwhendeleted'] = 'Tandai pesan sebagai terbaca saat dihapus';
 $labels['flagfordeletion'] = 'Tandai pesan untuk penghapusan daripada dihapus';
@@ -305,6 +320,9 @@
 $labels['insertsignature'] = 'Isi tanda tangan';
 $labels['previewpanemarkread'] = 'Tandai pesan yang sudah dilihat ';
 $labels['afternseconds'] = 'setelah $n detik';
+$labels['reqmdn'] = 'Selalu meminta tanda terima kembali';
+$labels['reqdsn'] = 'Selalu meminta pemberitahuan status terkirim';
+$labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yang dibalas';
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Map-map';
 $labels['foldername'] = 'Nama map';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index f0b49e4..50393b8 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -10,7 +10,7 @@
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
-| Author: Putu Arya Sabda Wijaya <klunxer@gmail.com>                    |
+| Author: Putu Arya Sabda Wijaya <ptaryasw@isi-dps.ac.id>                    |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -23,6 +23,7 @@
 $messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa';
 $messages['imaperror'] = 'Koneksi ke IMAP server gagal';
 $messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersimpan.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
@@ -34,7 +35,7 @@
 $messages['sendingmessage'] = 'Mengirim pesan...';
 $messages['messagesent'] = 'Pesan terkirim';
 $messages['savingmessage'] = 'Menyimpan pesan...';
-$messages['messagesaved'] = 'MMenyimpan pesan ke daftar tunggu';
+$messages['messagesaved'] = 'Menyimpan pesan ke daftar tunggu';
 $messages['successfullysaved'] = 'Berhasil disimpan';
 $messages['addedsuccessfully'] = 'Kontak berhasil ditambahkan ke buku alamat';
 $messages['contactexists'] = 'Kontak dengan alamat e-mail ini sudah ada';
@@ -88,6 +89,8 @@
 $messages['errorsavingcontact'] = 'Tidak bisa menyimpan alamat kontak';
 $messages['movingmessage'] = 'Memindahkan pesan...';
 $messages['copyingmessage'] = 'Menyalin pesan...';
+$messages['deletingmessage'] = 'Menghapus pesan...';
+$messages['markingmessage'] = 'Menandai Pesan...';
 $messages['receiptsent'] = 'Berhasil mengirim pemberitahuan tanda terima telah terbaca';
 $messages['errorsendingreceipt'] = 'Tidak dapat mengirim tanda terima';
 $messages['nodeletelastidentity'] = 'Anda tidak bida mengapus identitas ini, ini identitas yang terakhir';
@@ -109,10 +112,21 @@
 $messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from" ($msg)';
 $messages['smtptoerror'] = 'SMTP Error ($code): Gagal menambah penerima "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Tidak dapat menguraikan daftar penerima';
+$messages['smtpdsnerror'] = 'SMTP Error: Tidak ada dukungan untuk pemberitahuan status terkirim';
 $messages['smtperror'] = 'SMTP Error : $msg';
 $messages['emailformaterror'] = 'Alamat e-mail salah: $email';
 $messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
 $messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max';
 $messages['internalerror'] = 'Terjadi kesalahan internal. Silahkan diulang kembali';
+$messages['contactdelerror'] = 'Kontak tidak bisa dihapus';
+$messages['contactdeleted'] = 'Kontak berhasil dihapus';
+$messages['groupdeleted'] = 'Grup berhasil dihapus';
+$messages['grouprenamed'] = 'Grup berhasil dinamai kembali';
+$messages['groupcreated'] = 'Grub berhasil dibuat';
+$messages['messagedeleted'] = 'Pesan berhasil dihapus';
+$messages['messagemoved'] = 'Pesan berhasil dipindahkan';
+$messages['messagecopied'] = 'Pesan berhasil disalin';
+$messages['messagemarked'] = 'Pesan berhasil ditandai';
+$messages['autocompletechars'] = 'Masukkan setidaknya $min karakter untuk swaparipurna';
 
 ?>
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index c8ff8ac..6edce9a 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -16,33 +16,25 @@
 
 @version $Id$
 
-EN-Revision: 4184
+EN-Revision: 3891
 
 */
 
 $labels = array();
-
-// login page
 $labels['welcome'] = 'ようこそ $product へ';
 $labels['username'] = 'ユーザー名';
 $labels['password'] = 'パスワード';
 $labels['server'] = 'サーバー';
 $labels['login'] = 'ログイン';
-
-// taskbar
 $labels['logout'] = 'ログアウト';
 $labels['mail'] = '電子メール';
 $labels['settings'] = '個人設定';
 $labels['addressbook'] = 'アドレス帳';
-
-// mailbox names
 $labels['inbox'] = '受信トレイ';
 $labels['drafts'] = '下書き';
 $labels['sent'] = '送信済みアイテム';
 $labels['trash'] = 'ごみ箱';
 $labels['junk'] = '迷惑メール';
-
-// message listing
 $labels['subject'] = '件名';
 $labels['from'] = '差出人';
 $labels['to'] = '宛先';
@@ -55,29 +47,21 @@
 $labels['size'] = '容量';
 $labels['priority'] = '優先度';
 $labels['organization'] = '所属';
-$labels['readstatus'] = '閲覧の状態';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-$labels['mail-reply-to'] = $labels['mailreplyto'];
-$labels['mail-followup-to'] = $labels['mailfollowupto'];
-
-$labels['mailboxlist'] = 'フォルダー一覧';
+$labels['readstatus'] = '閲覧状況';
+$labels['reply-to'] = '返信先';
+$labels['mail-reply-to'] = 'Mail-Reply-To (ML 投稿者)';
+$labels['mail-followup-to'] = 'Mail-Followup-To (ML の宛先)';
+$labels['mailboxlist'] = 'フォルダ一覧';
 $labels['messagesfromto'] = '表示中のメール: $from ~ $to (全: $count 件)';
 $labels['threadsfromto'] = '表示中のスレッド: $from ~ $to (全: $count 件)';
 $labels['messagenrof'] = '現在のメール: $nr (全: $count 件)';
-
-$labels['copy']     = 'コピー';
-$labels['move']     = '移動';
-$labels['moveto']   = 'フォルダーの移動';
+$labels['copy'] = 'コピー';
+$labels['move'] = '移動';
+$labels['moveto'] = 'フォルダの移動';
 $labels['download'] = 'ダウンロード';
-
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイル サイズ';
-
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
-
-// weekdays short
 $labels['sun'] = '日';
 $labels['mon'] = '月';
 $labels['tue'] = '火';
@@ -85,74 +69,64 @@
 $labels['thu'] = '木';
 $labels['fri'] = '金';
 $labels['sat'] = '土';
-
-// weekdays long
-$labels['sunday']    = '日曜日';
-$labels['monday']    = '月曜日';
-$labels['tuesday']   = '火曜日';
+$labels['sunday'] = '日曜日';
+$labels['monday'] = '月曜日';
+$labels['tuesday'] = '火曜日';
 $labels['wednesday'] = '水曜日';
-$labels['thursday']  = '木曜日';
-$labels['friday']    = '金曜日';
-$labels['saturday']  = '土曜日';
-
-// months short
-$labels['jan']	= '1 月';
-$labels['feb']	= '2 月';
-$labels['mar']	= '3 月';
-$labels['apr']	= '4 月';
-$labels['may']	= '5 月';
-$labels['jun']	= '6 月';
-$labels['jul']	= '7 月';
-$labels['aug']	= '8 月';
-$labels['sep']	= '9 月';
-$labels['oct']	= '10 月';
-$labels['nov']	= '11 月';
-$labels['dec']	= '12 月';
-
-// months long
-$labels['longjan']	= '1 月';
-$labels['longfeb']	= '2 月';
-$labels['longmar']	= '3 月';
-$labels['longapr']	= '4 月';
-$labels['longmay']	= '5 月';
-$labels['longjun']	= '6 月';
-$labels['longjul']	= '7 月';
-$labels['longaug']	= '8 月';
-$labels['longsep']	= '9 月';
-$labels['longoct']	= '10 月';
-$labels['longnov']	= '11 月';
-$labels['longdec']	= '12 月';
-
+$labels['thursday'] = '木曜日';
+$labels['friday'] = '金曜日';
+$labels['saturday'] = '土曜日';
+$labels['jan'] = '1 月';
+$labels['feb'] = '2 月';
+$labels['mar'] = '3 月';
+$labels['apr'] = '4 月';
+$labels['may'] = '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['longmay'] = '5 月';
+$labels['longjun'] = '6 月';
+$labels['longjul'] = '7 月';
+$labels['longaug'] = '8 月';
+$labels['longsep'] = '9 月';
+$labels['longoct'] = '10 月';
+$labels['longnov'] = '11 月';
+$labels['longdec'] = '12 月';
 $labels['today'] = '今日';
-
-// toolbar buttons
-$labels['checkmail']        = '新着の確認';
-$labels['writenewmessage']  = '新規メールの作成';
-$labels['replytomessage']   = '返信';
+$labels['checkmail'] = '新着の確認';
+$labels['writenewmessage'] = '新規メールの作成';
+$labels['replytomessage'] = '返信';
 $labels['replytoallmessage'] = '差出人とすべての宛先に返信';
-$labels['replyall']         = '全員に返信';
-$labels['replylist']        = 'ML に返信';
-$labels['forwardmessage']   = '転送';
-$labels['deletemessage']    = '削除';
+$labels['replyall'] = '全員に返信';
+$labels['replylist'] = 'ML に返信';
+$labels['forwardmessage'] = '転送';
+$labels['deletemessage'] = '削除';
 $labels['movemessagetotrash'] = 'ごみ箱に移動';
-$labels['printmessage']     = '印刷';
-$labels['previousmessage']  = '前のメールへ';
+$labels['printmessage'] = '印刷';
+$labels['previousmessage'] = '前のメールへ';
 $labels['previousmessages'] = '前の一覧へ';
-$labels['firstmessage']     = '最初のメールへ';
-$labels['firstmessages']    = '最初の一覧へ';
-$labels['nextmessage']      = '次のメールへ';
-$labels['nextmessages']     = '次の一覧へ';
-$labels['lastmessage']      = '最後のメールへ';
-$labels['lastmessages']     = '最後の一覧へ';
-$labels['backtolist']       = '一覧に戻る';
-$labels['viewsource']       = 'ソースの表示';
-$labels['markmessages']     = 'マークを付ける';
-$labels['markread']         = '既読にする';
-$labels['markunread']       = '未読にする';
-$labels['markflagged']      = 'フラグを付ける';
-$labels['markunflagged']    = 'フラグを外す';
+$labels['firstmessage'] = '最初のメールへ';
+$labels['firstmessages'] = '最初の一覧へ';
+$labels['nextmessage'] = '次のメールへ';
+$labels['nextmessages'] = '次の一覧へ';
+$labels['lastmessage'] = '最後のメールへ';
+$labels['lastmessages'] = '最後の一覧へ';
+$labels['backtolist'] = '一覧に戻る';
+$labels['viewsource'] = 'ソースの表示';
+$labels['markmessages'] = 'マークを付ける';
+$labels['markread'] = '既読にする';
+$labels['markunread'] = '未読にする';
+$labels['markflagged'] = 'フラグを付ける';
+$labels['markunflagged'] = 'フラグを外す';
 $labels['messageactions'] = 'その他の操作...';
-
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
@@ -163,14 +137,12 @@
 $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'] = '未開封のメールのみ';
@@ -186,89 +158,70 @@
 $labels['listsorting'] = '整列基準';
 $labels['listorder'] = '整列順';
 $labels['listmode'] = '一覧表示モード';
-
-$labels['folderactions'] = 'フォルダーの操作...';
+$labels['folderactions'] = 'フォルダの操作...';
 $labels['compact'] = 'コンパクト';
 $labels['empty'] = '空';
 $labels['purge'] = 'ごみ箱を空にする';
-
 $labels['quota'] = 'ディスク使用量';
-$labels['unknown']  = '不明';
-$labels['unlimited']  = '無制限';
-
+$labels['unknown'] = '不明';
+$labels['unlimited'] = '無制限';
 $labels['quicksearch'] = '検索';
 $labels['resetsearch'] = '検索解除';
-$labels['searchmod']  = '検索条件';
-$labels['msgtext']  = 'すべてのメール';
-
+$labels['searchmod'] = '検索条件';
+$labels['msgtext'] = 'すべてのメール';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'eml 形式で保存する';
-
-// message compose
-$labels['compose']        = 'メールの作成';
-$labels['editasnew']      = '新規として編集';
-$labels['savemessage']    = '下書きに保存';
-$labels['sendmessage']    = '今すぐ送信';
-$labels['addattachment']  = 'ファイルの添付';
-$labels['charset']        = '文字エンコード';
-$labels['editortype']     = 'エディターの種類';
-$labels['returnreceipt']  = '開封確認';
-$labels['dsn']            = '配送状況の通知';
-
-$labels['editidents']    = '個人情報の編集';
+$labels['compose'] = 'メールの作成';
+$labels['editasnew'] = '新規として編集';
+$labels['savemessage'] = '下書きに保存';
+$labels['sendmessage'] = '今すぐ送信';
+$labels['addattachment'] = 'ファイルの添付';
+$labels['charset'] = '文字エンコード';
+$labels['editortype'] = 'エディターの種類';
+$labels['returnreceipt'] = '開封確認';
+$labels['dsn'] = '配送状況通知';
+$labels['editidents'] = '個人情報の編集';
 $labels['checkspelling'] = 'スペル チェック';
 $labels['resumeediting'] = 'メール作成に戻る';
-$labels['revertto']      = '元に戻す';
-
+$labels['revertto'] = '元に戻す';
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
-$labels['close']  = '閉じる';
+$labels['close'] = '閉じる';
 $labels['messageoptions'] = 'メッセージのオプション...';
-
-$labels['low']     = '低い';
-$labels['lowest']  = '最低';
-$labels['normal']  = '通常';
-$labels['high']    = '高い';
+$labels['low'] = '低い';
+$labels['lowest'] = '最低';
+$labels['normal'] = '通常';
+$labels['high'] = '高い';
 $labels['highest'] = '最高';
-
 $labels['nosubject'] = '(件名なし)';
 $labels['showimages'] = '画像の表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
 $labels['savesentmessagein'] = '送信済みメールの保存先';
 $labels['dontsave'] = '保存しない';
 $labels['maxuploadsize'] = '添付可能なファイルのサイズは最大 $size です。';
-
 $labels['addcc'] = 'Cc 追加';
 $labels['addbcc'] = 'Bcc 追加';
 $labels['addreplyto'] = 'Reply-To 追加';
 $labels['addmailreplyto'] = 'Mail-Reply-To 追加';
 $labels['addmailfollowupto'] = 'Mail-Followup-To 追加';
-
-// mdn
 $labels['mdnrequest'] = 'メールの差出人は開封確認の送付を求めています。開封確認のメールを送付しますか?';
 $labels['receiptread'] = '開封確認 (表示済み)';
 $labels['yourmessage'] = 'これはあなたが送信したメールに対する開封確認です。';
 $labels['receiptnote'] = '注意: この開封確認はメールが受信者に表示されたことの通知です。受信者がメールを読んだこと、内容を理解したことを保証するものではありません。';
-
-// address boook
 $labels['name'] = '表示名';
 $labels['firstname'] = '名 (ファースト ネーム)';
 $labels['surname'] = '姓 (ラスト ネーム)';
 $labels['email'] = 'メールアドレス';
-
 $labels['addcontact'] = '連絡先の新規追加';
 $labels['editcontact'] = '連絡先の編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先のプロパティ';
-
 $labels['edit'] = '編集';
 $labels['cancel'] = 'キャンセル';
 $labels['save'] = '保存';
 $labels['delete'] = '削除';
-
 $labels['newcontact'] = '連絡先の新規作成';
 $labels['deletecontact'] = '連絡先の削除';
 $labels['composeto'] = 'この連絡先へメールの送信';
@@ -278,37 +231,28 @@
 $labels['exportvcards'] = 'vCard 形式でエクスポート';
 $labels['newcontactgroup'] = '連絡先グループの新規作成';
 $labels['groupactions'] = '連絡先グループの操作...';
-
 $labels['previouspage'] = '前の一覧へ';
 $labels['firstpage'] = '最初の一覧へ';
 $labels['nextpage'] = '次の一覧へ';
 $labels['lastpage'] = '最後の一覧へ';
-
 $labels['group'] = 'グループ';
 $labels['groups'] = 'グループ';
 $labels['personaladrbook'] = '個人アドレス';
-
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先のインポート';
 $labels['importfromfile'] = 'インポートするファイル:';
 $labels['importreplace'] = '現在のアドレス帳と置き換える';
 $labels['importtext'] = '既存のアドレス帳の連絡先をアップロードできます。現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a> 形式からのインポートに対応しています。';
 $labels['done'] = '完了';
-
-// settings
 $labels['settingsfor'] = '次の設定:';
-
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = 'ユーザー設定';
 $labels['editpreferences'] = 'ユーザー設定の変更';
-
 $labels['identities'] = '個人情報';
 $labels['manageidentities'] = 'アカウントの個人情報管理';
 $labels['newidentity'] = '個人情報の新規作成';
-
 $labels['newitem'] = '新しい項目';
 $labels['edititem'] = '項目の編集';
-
 $labels['preferhtml'] = 'HTML を表示する';
 $labels['defaultcharset'] = '標準の文字セット';
 $labels['htmlmessage'] = 'HTML メール';
@@ -320,19 +264,19 @@
 $labels['pagesize'] = '1 ページの表示件数';
 $labels['signature'] = '署名';
 $labels['dstactive'] = 'サマータイムを適用する';
-$labels['htmleditor'] = '新規メールでは HTML を標準にする';
-$labels['htmlonreply'] = 'メールの返信時は常に HTML を使用する';
+$labels['htmleditor'] = '新規メールは HTML を標準にする';
+$labels['htmlonreply'] = '返信メールでは常に HTML を使用';
 $labels['htmlsignature'] = '署名に HTML タグを使用する';
 $labels['previewpane'] = 'プレビュー ペインを表示する';
 $labels['skin'] = 'スキン';
 $labels['logoutclear'] = 'ログアウト時にごみ箱を空にする';
-$labels['logoutcompact'] = 'ログアウト時にフォルダーのコンパクト化を実行する';
+$labels['logoutcompact'] = 'ログアウト時にフォルダのコンパクト化を実行する';
 $labels['uisettings'] = 'ユーザー インターフェース';
 $labels['serversettings'] = 'サーバーの設定';
 $labels['mailboxview'] = '受信箱';
-$labels['mdnrequests'] = '開封確認の送信要求時';
-$labels['askuser'] = '開封確認メールの送信を確認する';
-$labels['autosend'] = '開封確認メールを送信する';
+$labels['mdnrequests'] = '差出人への通知';
+$labels['askuser'] = 'ユーザーに確認';
+$labels['autosend'] = '自動的に送信';
 $labels['autosendknown'] = '差出人が連絡先に登録されていれば開封確認を送信し、それ以外は問い合わせる';
 $labels['autosendknownignore'] = '差出人が連絡先に登録されていれば開封確認を送信し、それ以外は無視する';
 $labels['ignore'] = '無視';
@@ -358,7 +302,7 @@
 $labels['force7bit'] = 'マルチバイト文字列を MIME エンコードする';
 $labels['advancedoptions'] = '高度な設定';
 $labels['focusonnewmessage'] = '新着メールが届いたらブラウザーをアクティブにする';
-$labels['checkallfolders'] = 'すべてのフォルダーで新着メールを表示する';
+$labels['checkallfolders'] = 'すべてのフォルダで新着メールを表示する';
 $labels['displaynext'] = 'メールの削除や移動後に次のメールを表示する';
 $labels['mainoptions'] = '基本設定';
 $labels['section'] = '設定項目';
@@ -370,7 +314,7 @@
 $labels['replytopposting'] = '元のメッセージ引用部の前に本文を作成する';
 $labels['replybottomposting'] = '元のメッセージ引用部の後に本文を作成する';
 $labels['replyremovesignature'] = '返信時にメッセージからオリジナルの署名を除去する';
-$labels['autoaddsignature'] = '自動的に署名を付加する';
+$labels['autoaddsignature'] = '署名を自動的に付加する';
 $labels['newmessageonly'] = '新規作成時のみ';
 $labels['replyandforwardonly'] = '返信・転送時のみ';
 $labels['replysignaturepos'] = '返信・転送時に署名を挿入する位置';
@@ -379,34 +323,28 @@
 $labels['insertsignature'] = '署名の挿入';
 $labels['previewpanemarkread'] = '開封済みにする';
 $labels['afternseconds'] = '$n 秒後';
-$labels['reqmdn'] = '常に開封確認通知を要求する';
-$labels['reqdsn'] = '常に配送状況の通知を要求する';
-$labels['replysamefolder'] = '返信されたメールを返信元メールと同じフォルダに保存';
-
-$labels['folder']  = 'フォルダー';
-$labels['folders']  = 'フォルダー一覧';
-$labels['foldername']  = 'フォルダー名';
-$labels['subscribed']  = '購読済';
+$labels['reqmdn'] = '常に開封確認を要求';
+$labels['reqdsn'] = '常に配送状況通知を要求';
+$labels['replysamefolder'] = '返信されてきたメールを返信元メールと同じフォルダに保存';
+$labels['folder'] = 'フォルダ';
+$labels['folders'] = 'フォルダ一覧';
+$labels['foldername'] = 'フォルダ名';
+$labels['subscribed'] = '購読済';
 $labels['messagecount'] = 'メール';
-$labels['create']  = '作成';
-$labels['createfolder']  = 'フォルダーの新規作成';
+$labels['create'] = '作成';
+$labels['createfolder'] = 'フォルダの新規作成';
 $labels['rename'] = '名前の変更';
-$labels['renamefolder'] = 'フォルダー名の変更';
-$labels['deletefolder']  = 'フォルダーの削除';
-$labels['managefolders']  = 'フォルダーの管理';
-$labels['specialfolders'] = '特殊なフォルダー';
-
+$labels['renamefolder'] = 'フォルダ名の変更';
+$labels['deletefolder'] = 'フォルダの削除';
+$labels['managefolders'] = 'フォルダの管理';
+$labels['specialfolders'] = '特殊なフォルダ';
 $labels['sortby'] = '並び替えの基準';
 $labels['sortasc'] = '昇順で並び替え';
 $labels['sortdesc'] = '降順で並び替え';
-
-// units
 $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-
-// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西ヨーロッパ言語';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index b1b88b0..c1a79a8 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -2,21 +2,21 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/ja_JP/messages.inc                                           |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Tadashi Jokagi <elf2000@users.sourceforge.net>                |
- |         Takashi Takamatsu <taka717@gmail.com>                         |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/ja_JP/messages.inc                                           |
+|                                                                       |
+| Language file of the Roundcube Webmail client                         |
+| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Tadashi Jokagi <elf2000@users.sourceforge.net>                |
+|         Takashi Takamatsu <taka717@gmail.com>                         |
++-----------------------------------------------------------------------+
 
 @version $Id$
 
-//  EN-Revision: 4190
+//  EN-Revision: 3891
 
 */
 
@@ -26,7 +26,7 @@
 $messages['sessionerror'] = 'セッションが正しくないか期限切れです。';
 $messages['imaperror'] = 'IMAP サーバーへの接続に失敗しました。';
 $messages['servererror'] = 'サーバーでエラーが発生しました。';
-$messages['servererrormsg'] = 'サーバー エラー: $msg';
+$messages['servererrormsg'] = 'サーバーエラー: $msg';
 $messages['invalidrequest'] = '不正なリクエストです。データは保存されませんでした。';
 $messages['nomessagesfound'] = 'メールはありません。';
 $messages['loggedout'] = 'ログアウトしました。';
@@ -53,15 +53,15 @@
 $messages['errormoving'] = 'メールを移動できません。';
 $messages['errorcopying'] = 'メールをコピーできません。';
 $messages['errordeleting'] = 'メールを削除できません。';
-$messages['errormarking'] = 'メールのマークを設定できません。';
+$messages['errormarking'] = 'メールをマークできません。';
 $messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
-$messages['deletefolderconfirm'] = 'このフォルダーを本当に削除しますか?';
-$messages['purgefolderconfirm'] = 'このフォルダーの全メールを本当に削除しますか?';
-$messages['foldercreating'] = 'フォルダーを作成しています...';
-$messages['folderdeleting'] = 'フォルダーを削除しています...';
-$messages['folderrenaming'] = 'フォルダー名を変更しています...';
-$messages['foldermoving'] = 'フォルダーを移動しています...';
+$messages['deletefolderconfirm'] = 'このフォルダを本当に削除しますか?';
+$messages['purgefolderconfirm'] = 'このフォルダの全メールを本当に削除しますか?';
+$messages['foldercreating'] = 'フォルダを作成しています...';
+$messages['folderdeleting'] = 'フォルダを削除しています...';
+$messages['folderrenaming'] = 'フォルダ名を変更しています...';
+$messages['foldermoving'] = 'フォルダを移動しています...';
 $messages['formincomplete'] = 'すべてのフォームの項目を入力していません。';
 $messages['noemailwarning'] = '有効なメールアドレスを入力してください。';
 $messages['nonamewarning'] = '名前を入力してください。';
@@ -80,7 +80,7 @@
 $messages['searching'] = '検索しています...';
 $messages['checking'] = '確認しています...';
 $messages['nospellerrors'] = 'スペル ミスは見つかりませんでした。';
-$messages['folderdeleted'] = 'フォルダーを削除しました。';
+$messages['folderdeleted'] = 'フォルダを削除しました。';
 $messages['deletedsuccessfully'] = '削除しました。';
 $messages['converting'] = 'メールから書式を削除しています...';
 $messages['messageopenerror'] = 'サーバーからメールを取得できません。';
@@ -93,12 +93,12 @@
 $messages['movingmessage'] = 'メールを移動しています...';
 $messages['copyingmessage'] = 'メールをコピーしています...';
 $messages['deletingmessage'] = 'メールを削除しています...';
-$messages['markingmessage'] = 'メールのマークを設定しています...';
+$messages['markingmessage'] = 'メールをマークしています...';
 $messages['receiptsent'] = '開封確認を送信しました。';
 $messages['errorsendingreceipt'] = '開封確認を送信できません。';
 $messages['nodeletelastidentity'] = '削除できません。少なくとも 1 つの個人情報が必要です。';
-$messages['addsubfolderhint'] = '現在選択しているフォルダーのサブ フォルダーとして作成されます。';
-$messages['forbiddencharacter'] = 'フォルダー名に利用できない文字が含まれています。';
+$messages['addsubfolderhint'] = '現在選択しているフォルダのサブフォルダとして作成されます。';
+$messages['forbiddencharacter'] = 'フォルダ名に利用できない文字が含まれています。';
 $messages['selectimportfile'] = 'アップロードするファイルを選択してください。';
 $messages['addresswriterror'] = '選択したアドレス帳に書き込めません。';
 $messages['contactaddedtogroup'] = 'グループに連絡先を追加しました。';
@@ -110,26 +110,25 @@
 $messages['nofromaddress'] = '選択中の個人情報にメールアドレスが含まれていません。';
 $messages['editorwarning'] = 'テキスト エディターに切り替えるとすべての書式が失われます。よろしいですか?';
 $messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。<b>メッセージは送信されませんでした。</b>システム管理者に至急連絡してください。';
-$messages['smtpconnerror'] = 'SMTP Error ($code): サーバーへの接続に失敗しました。';
-$messages['smtpautherror'] = 'SMTP Error ($code): 認証に失敗しました。';
+$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['smtpdsnerror'] = 'SMTP エラー: 配送状況通知をサポートしていません。';
-$messages['smtperror'] = 'SMTP エラー: $msg';
+$messages['smtprecipientserror'] = 'SMTP Error: 宛先のリストを解析できません';
+$messages['smtpdsnerror'] = 'SMTP Error: 配送状況通知 (DSN) はサポートされていません';
+$messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'メールアドレスが正しくありません: $email';
 $messages['toomanyrecipients'] = '宛先が多すぎます。$max 件以内にしてください。';
 $messages['maxgroupmembersreached'] = 'グループのメンバーが多すぎます。$max 件以内にしてください。';
 $messages['internalerror'] = '内部エラーが発生しました。もう一度やり直してください。';
-$messages['contactdelerror'] = '連絡先を削除できませんでした。';
+$messages['contactdelerror'] = '連絡先を削除できません。';
 $messages['contactdeleted'] = '連絡先を削除しました。';
 $messages['groupdeleted'] = 'グループを削除しました。';
-$messages['grouprenamed'] = 'グループ名を変更しました.';
+$messages['grouprenamed'] = 'グループ名を変更しました。';
 $messages['groupcreated'] = 'グループを作成しました。';
 $messages['messagedeleted'] = 'メールを削除しました。';
 $messages['messagemoved'] = 'メールを移動しました。';
 $messages['messagecopied'] = 'メールをコピーしました。';
-$messages['messagemarked'] = 'メールのマークを設定しました。';
-$messages['autocompletechars'] = '自動補完には少なくとも $min 文字入力してください。';
+$messages['messagemarked'] = 'メールをマークしました。';
 
 ?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 97ad8cc..94f7b25 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -50,8 +50,8 @@
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['reply-to'] = 'Antwoord-aan';
-$labels['mailreply-to'] = 'Mail-Antwoord-Aan';
-$labels['mailfollowup-to'] = 'Mail-Followup-Aan';
+$labels['mail-reply-to'] = 'Mail-Antwoord-Aan';
+$labels['mail-followup-to'] = 'Mail-Followup-Aan';
 $labels['mailboxlist'] = 'Mappen';
 $labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
@@ -218,6 +218,7 @@
 $labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
 $labels['contacts'] = 'Contacten';
+$labels['contactproperties'] = 'Contact eigenschappen';
 $labels['edit'] = 'Wijzig';
 $labels['cancel'] = 'Annuleer';
 $labels['save'] = 'Opslaan';
@@ -325,6 +326,7 @@
 $labels['afternseconds'] = 'Na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd een afleverings status notificatie (DSN)';
+$labels['replysamefolder'] = 'Plaats antwoorden in de folder van het beantwoorde bericht';
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Mapnaam';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index d8e5ff8..922f71d 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -41,12 +41,15 @@
 $labels['bcc'] = 'Скрытая';
 $labels['replyto'] = 'Ответить';
 $labels['mailreplyto'] = 'Ответить в списке рассылки';
+$labels['mailfollowupto'] = 'Mail-Followup-To';
 $labels['date'] = 'Дата';
 $labels['size'] = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
+$labels['readstatus'] = 'Статус прочтения';
 $labels['reply-to'] = 'Ответить';
-$labels['mailreply-to'] = 'Ответить в списке рассылки';
+$labels['mail-reply-to'] = 'Mail-Reply-To';
+$labels['mail-followup-to'] = 'Mail-Followup-To';
 $labels['mailboxlist'] = 'Папки';
 $labels['messagesfromto'] = 'Сообщения с $from по $to из $count';
 $labels['threadsfromto'] = 'Обсуждения с $from по $to из $count';
@@ -201,6 +204,7 @@
 $labels['addbcc'] = 'Скрытая копия';
 $labels['addreplyto'] = 'Кому ответить';
 $labels['addmailreplyto'] = 'Кому ответить в списке рассылки';
+$labels['addmailfollowupto'] = 'Добавить Mail-Followup-To';
 $labels['mdnrequest'] = 'Отправитель этого сообщения запросил уведомление о прочтении. Отправить уведомление?';
 $labels['receiptread'] = 'Уведомление о прочтении';
 $labels['yourmessage'] = 'Это уведомление о прочтении вашего сообщения';
@@ -212,6 +216,7 @@
 $labels['addcontact'] = 'Добавить выбранные контакты в список контактов';
 $labels['editcontact'] = 'Редактировать контакт';
 $labels['contacts'] = 'Контакты';
+$labels['contactproperties'] = 'Свойства контакта';
 $labels['edit'] = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save'] = 'Сохранить';
@@ -319,6 +324,7 @@
 $labels['afternseconds'] = 'через $n секунд';
 $labels['reqmdn'] = 'Всегда запрашивать уведомление о доставке';
 $labels['reqdsn'] = 'Всегда запрашивать уведомление о состоянии доставки';
+$labels['replysamefolder'] = 'Помещать ответы в ту же папку, где находится оригинал';
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Имя папки';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 3519e2b..518c84e 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -46,6 +46,7 @@
 $labels['size'] = 'Storlek';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
+$labels['readstatus'] = 'Lässtatus';
 $labels['reply-to'] = 'Svara till';
 $labels['mail-reply-to'] = 'Mail-Reply-To';
 $labels['mail-followup-to'] = 'Mail-Followup-To';
@@ -215,6 +216,7 @@
 $labels['addcontact'] = 'Lägg till ny kontakt';
 $labels['editcontact'] = 'Redigera kontakt';
 $labels['contacts'] = 'Kontakter';
+$labels['contactproperties'] = 'Kontaktegenskaper';
 $labels['edit'] = 'Redigera';
 $labels['cancel'] = 'Avbryt';
 $labels['save'] = 'Spara';
@@ -322,6 +324,7 @@
 $labels['afternseconds'] = 'Efter $n sekunder';
 $labels['reqmdn'] = 'Begär alltid mottagningskvitto';
 $labels['reqdsn'] = 'Begär alltid leveransstatusmeddelande';
+$labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
 $labels['folder'] = 'Katalog';
 $labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 1933d73..49778b3 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -91,6 +91,8 @@
 $messages['errorsavingcontact'] = 'Kunde inte spara kontaktadressen';
 $messages['movingmessage'] = 'Flyttar meddelande...';
 $messages['copyingmessage'] = 'Kopierar meddelande...';
+$messages['deletingmessage'] = 'Raderar meddelande...';
+$messages['markingmessage'] = 'Markerar meddelande...';
 $messages['receiptsent'] = 'Mottagarkvitto har skickats';
 $messages['errorsendingreceipt'] = 'Kunde inte skicka mottagarkvitto';
 $messages['nodeletelastidentity'] = 'Du kan inte radera den här identiteten, det är din sista.';
@@ -118,5 +120,15 @@
 $messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max.';
 $messages['maxgroupmembersreached'] = 'Antalet gruppmedlemmar får inte överstiga $max';
 $messages['internalerror'] = 'Ett internt fel uppstod. Vänligen försök igen.';
+$messages['contactdelerror'] = 'Kunde inte radera kontakt';
+$messages['contactdeleted'] = 'Kontakt raderad';
+$messages['groupdeleted'] = 'Grupp raderad';
+$messages['grouprenamed'] = 'Gruppnamn ändrat';
+$messages['groupcreated'] = 'Grupp skapad';
+$messages['messagedeleted'] = 'Meddelande raderat';
+$messages['messagemoved'] = 'Meddelande flyttat';
+$messages['messagecopied'] = 'Meddelande kopierat';
+$messages['messagemarked'] = 'Meddelande markerat';
+$messages['autocompletechars'] = 'Ange minst $min tecken för automatisk komplettering';
 
 ?>
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index be69f41..224608f 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -44,9 +44,10 @@
 $labels['size'] = 'Розмір';
 $labels['priority'] = 'Пріоритет';
 $labels['organization'] = 'Організація';
+$labels['readstatus'] = 'Статус прочитання';
 $labels['reply-to'] = 'Відповісти';
-$labels['mailreply-to'] = 'Mail-Reply-To';
-$labels['mailfollowup-to'] = 'Mail-Followup-To';
+$labels['mail-reply-to'] = 'Mail-Reply-To';
+$labels['mail-followup-to'] = 'Mail-Followup-To';
 $labels['mailboxlist'] = 'Папки';
 $labels['messagesfromto'] = 'Повідомлення з $from по $to із $count';
 $labels['threadsfromto'] = 'Обговорення з $from по $to із $count';
@@ -213,6 +214,7 @@
 $labels['addcontact'] = 'Додати вибрані контакти до списку контактів';
 $labels['editcontact'] = 'Редагувати контакт';
 $labels['contacts'] = 'Контакти';
+$labels['contactproperties'] = 'Властивості контакта';
 $labels['edit'] = 'Правка';
 $labels['cancel'] = 'Скасувати';
 $labels['save'] = 'Зберегти';
@@ -320,6 +322,7 @@
 $labels['afternseconds'] = 'через $n секунд';
 $labels['reqmdn'] = 'Завжди вимагати повідомлення про доставку';
 $labels['reqdsn'] = 'Завжди вимагати повідомлення про статус доставки';
+$labels['replysamefolder'] = 'Розмістити відповіді у тій же папці, де знаходиться оригінал';
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Назва папки';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 6ec33e5..780e222 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -23,6 +23,7 @@
 $messages['sessionerror'] = 'Ваша сесія застаріла';
 $messages['imaperror'] = 'Невдале з`єднання з IMAP сервером';
 $messages['servererror'] = 'Помилка сервера!';
+$messages['servererrormsg'] = 'Помилка сервера: $msg';
 $messages['invalidrequest'] = 'Невірний запит! Дані не збережено.';
 $messages['nomessagesfound'] = 'Листів не знайдено';
 $messages['loggedout'] = 'Вашу сесію завершено. Всього найкращого!';
@@ -88,6 +89,8 @@
 $messages['errorsavingcontact'] = 'Неможливо зберегти адресу контакту';
 $messages['movingmessage'] = 'Переміщення листа...';
 $messages['copyingmessage'] = 'Копіювання листа...';
+$messages['deletingmessage'] = 'Видалення листа (ів)';
+$messages['markingmessage'] = 'Позначення листа (ів)';
 $messages['receiptsent'] = 'Повідомлення про прочитання відправлено';
 $messages['errorsendingreceipt'] = 'Не вдалося відправити повідомлення про прочитання';
 $messages['nodeletelastidentity'] = 'Ви не можете видалити цей профіль, він у Вас останній.';
@@ -115,5 +118,15 @@
 $messages['toomanyrecipients'] = 'Занадто багато отримувачів. Зменшіть їх число до $max.';
 $messages['maxgroupmembersreached'] = 'Число адрес у групі перевищило максимум у $max.';
 $messages['internalerror'] = 'Виникла внутрішня помилка. Будь ласка, спробуйте ще раз';
+$messages['contactdelerror'] = 'Неможливо видалити контакт(и)';
+$messages['contactdeleted'] = 'Контакт(и) видалено успішно';
+$messages['groupdeleted'] = 'Група видалена успішно';
+$messages['grouprenamed'] = 'Група перейменована успішно';
+$messages['groupcreated'] = 'Група створена успішно';
+$messages['messagedeleted'] = 'Лист(и) видалено успішно';
+$messages['messagemoved'] = 'Лист(и) переміщено успішно';
+$messages['messagecopied'] = 'Лист(и) скопійовано успішно';
+$messages['messagemarked'] = 'Лист(и) помічено успішно';
+$messages['autocompletechars'] = 'Введіть щонайменьше $min символів для автозаповнення';
 
 ?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index fc3ebbf..735fd50 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -129,5 +129,6 @@
 $messages['messagemoved'] = '訊息成功移動';
 $messages['messagecopied'] = '訊息成功複製';
 $messages['messagemarked'] = '訊息成功標示';
+$messages['autocompletechars'] = '輸入至少 $min 字元才能自動完成自動完成';
 
 ?>

--
Gitblit v1.9.1