Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision a5d3e661e46f18082821ad1731fece8cb3e72368)
+++ CHANGELOG	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -2,6 +2,12 @@
 ---------------------------
 
+2006/08/23 (thomasb)
+----------
+- Updated Polish, Portuguese, Latvian, Chinese and Japanese localization
+
+
 2006/08/20 (thomasb)
 ----------
+- Fixed wrong usage of mbstring (Bug #1462439)
 - Set default spelling language (Ticket #1483938)
 - Added support for Nox Spell Server
Index: ogram/localization/cn/labels.inc
===================================================================
--- program/localization/cn/labels.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | language/cn/labels.inc                                                |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2006/02/19                        |
- |  Author: winman rong  <winman.rong@gmail.com>                         |
- +-----------------------------------------------------------------------+
-
- $Id$
-
-*/
-
-$labels = array();
-
-// login page
-$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['drafts'] = 'èçš¿';
-$labels['junk']   = 'ååŸé®ä»¶';
-
-// message listing
-$labels['subject'] = 'é®ä»¶æ é¢';
-$labels['from']    = 'åä»¶äºº';
-$labels['to']      = 'æ¥æ¶äºº';
-$labels['cc']      = 'å¯æ¬';
-$labels['bcc']     = 'å¯é';
-$labels['replyto'] = 'åå€å°å';
-$labels['date']    = 'æ¥æ';
-$labels['size']    = 'æä»¶å€§å°';
-$labels['priority'] = 'äŒå
-çº§';
-$labels['organization'] = 'å¢äœ';
-
-// aliases
-$labels['reply-to'] = $labels['åå€å°'];
-
-$labels['mailboxlist'] = 'æä»¶å€¹';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['messagenrof'] = 'Message $nr of $count';
-
-$labels['moveto']   = 'ç§»åšå°...';
-$labels['download'] = 'äžèœœ';
-
-$labels['filename'] = 'æä»¶åç§°';
-$labels['filesize'] = 'æä»¶å€§å°';
-
-$labels['preferhtml'] = 'ä»¥HTMLæ ŒåŒæŸç€º';
-$labels['htmlmessage'] = 'HTMLæ ŒåŒé®ä»¶';
-$labels['prettydate'] = 'Pretty dates';
-
-$labels['addtoaddressbook'] = 'å å°å°åè';
-
-// weekdays short
-$labels['sun'] = 'æææ¥';
-$labels['mon'] = 'ææäž';
-$labels['tue'] = 'ææäº';
-$labels['wed'] = 'ææäž';
-$labels['thu'] = 'ææå';
-$labels['fri'] = 'ææäº';
-$labels['sat'] = 'ææå
-­';
-
-// weekdays long
-$labels['sunday']    = 'æææ¥';
-$labels['monday']    = 'ææäž';
-$labels['tuesday']   = 'ææäº';
-$labels['wednesday'] = 'ææäž';
-$labels['thursday']  = 'ææå';
-$labels['friday']    = 'ææäº';
-$labels['saturday']  = 'ææå
-­';
-
-$labels['today'] = 'ä»å€©';
-
-// toolbar buttons
-$labels['checkmail']        = 'æ£æ¥æ°æ¶æ¯';
-$labels['writenewmessage']  = 'åæ°é®ä»¶';
-$labels['replytomessage']   = 'åå€é®ä»¶';
-$labels['forwardmessage']   = 'èœ¬åé®ä»¶';
-$labels['deletemessage']    = 'æé®ä»¶ç§»åšå°ååŸæ¡¶';
-$labels['printmessage']     = 'æå°é®ä»¶';
-$labels['previousmessages'] = 'äžäžå°é®ä»¶';
-$labels['nextmessages']     = 'äžäžå°é®ä»¶';
-$labels['backtolist']       = 'è¿åæ¶ä»¶ç®±';
-$labels['viewsource']       = 'æŸç€ºæºä»£ç ';
-
-$labels['select'] = 'éæ©';
-$labels['all'] = 'å
-šéš';
-$labels['none'] = 'äžé';
-$labels['unread'] = 'æ²¡è¯»è¿ç';
-
-$labels['compact'] = 'Compact';
-$labels['empty'] = 'ç©ºç';
-$labels['purge'] = 'æž
-é€';
-
-$labels['quota'] = 'ç©ºéŽäœ¿çš';
-
-// message compose
-$labels['compose']  = 'åæ°é®ä»¶';
-$labels['savemessage']  = 'ä¿å­è¿ä»œèçš¿';
-$labels['sendmessage']  = 'ç«å»åéé®ä»¶';
-$labels['addattachment']  = 'æ·»å éä»¶';
-
-$labels['attachments'] = 'éä»¶';
-$labels['upload'] = 'äžäŒ ';
-$labels['close']  = 'å
-³é­';
-
-$labels['low']     = 'äœ';
-$labels['lowest']  = 'æäœ';
-$labels['normal']  = 'æ­£åžž';
-$labels['high']    = 'é«';
-$labels['highest'] = 'æé«';
-
-$labels['nosubject']  = '(æ²¡æäž»é¢)';
-$labels['showimages'] = 'æŸç€ºåŸç';
-
-
-// address boook
-$labels['name']      = 'æŸç€ºåå­';
-$labels['firstname'] = 'å';
-$labels['surname']   = 'å§';
-$labels['email']     = 'çµå­é®ä»¶';
-
-$labels['addcontact'] = 'å¢å æ°èç³»äºº';
-$labels['editcontact'] = 'çŒèŸèç³»ä¿¡æ¯';
-
-$labels['edit']   = 'çŒèŸ';
-$labels['cancel'] = 'åæ¶';
-$labels['save']   = 'ä¿å­';
-$labels['delete'] = 'å é€';
-
-$labels['newcontact']     = 'å»ºç«æ°çèç³»ä¿¡æ¯';
-$labels['addcontact']     = 'å°èç³»äººæ·»å å°å°åè';
-$labels['deletecontact']  = 'å é€éæ©çèç³»ä¿¡æ¯';
-$labels['composeto']      = 'ç»æéæ©çèç³»äººåéé®ä»¶';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
-$labels['print']          = 'æå°';
-$labels['export']         = 'å¯Œåº';
-
-
-// LDAP search
-$labels['ldapsearch'] = 'LDAP ç®åœæçŽ¢';
-
-$labels['ldappublicsearchname']    = 'èç³»äººåå­';
-$labels['ldappublicsearchtype'] = 'ç²Ÿç¡®å¹é
-?';
-$labels['ldappublicserverselect'] = 'éæ©æå¡åš';
-$labels['ldappublicsearchfield'] = 'Search on';
-$labels['ldappublicsearchform'] = 'Look for a contact';
-$labels['ldappublicsearch'] = 'æçŽ¢';
-
-
-// settings
-$labels['settingsfor']  = 'è®Ÿçœ®';
-
-$labels['preferences']  = 'åæ°éæ©';
-$labels['userpreferences']  = 'çšæ·åæ°';
-$labels['editpreferences']  = 'çŒèŸçšæ·åæ°';
-
-$labels['identities']  = 'åä»¶äººèº«ä»œ';
-$labels['manageidentities']  = 'ç®¡çåä»¶äººèµæ';
-$labels['newidentity']  = 'å»ºç«æ°èº«ä»œ';
-
-$labels['newitem']  = 'New item';
-$labels['edititem']  = 'Edit item';
-
-$labels['setdefault']  = 'è®Ÿçœ®äžºé»è®€';
-$labels['language']  = 'è¯­èš';
-$labels['timezone']  = 'æ¶åº';
-$labels['pagesize']  = 'æ¯é¡µè¡æ°';
-$labels['signature'] = 'ç­Ÿå';
-
-
-$labels['folder']  = 'æä»¶å€¹';
-$labels['folders']  = 'æä»¶å€¹';
-$labels['foldername']  = 'æä»¶å€¹åç§°';
-$labels['subscribed']  = 'æŸç€ºäžåŠ';
-$labels['create']  = 'åå»º';
-$labels['createfolder']  = 'å»ºç«æ°æä»¶å€¹';
-$labels['deletefolder']  = 'å é€æä»¶å€¹';
-$labels['managefolders']  = 'ç®¡çæä»¶å€¹';
-
-$labels['sortby'] = 'Sort by';
-$labels['sortasc']  = 'ç±å°å°å€§æå';
-$labels['sortdesc'] = 'ç±å€§å°å°æå';
-
-?>
Index: ogram/localization/cn/messages.inc
===================================================================
--- program/localization/cn/messages.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | language/cn/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2006/02/19                        |
- |  Author: winman rong  <winman.rong@gmail.com>                         |
- +-----------------------------------------------------------------------+
-
- $Id$
-
-*/
-
-$messages = array();
-
-$messages['loginfailed']  = 'ç»åœå€±èŽ¥';
-
-$messages['cookiesdisabled'] = 'äœ çæµè§åšç®åå
-³é­äºcookiesïŒè¯·æåŒcookiesåè¯';
-
-$messages['sessionerror'] = 'åœå session æ ææè
-è¶
-æ¶';
-
-$messages['imaperror'] = 'äžèœè¿æ¥IMAPæå¡åš';
-
-$messages['nomessagesfound'] = 'æ²¡æé®ä»¶åšè¿äžªé®ç®±é';
-
-$messages['loggedout'] = 'æåç»æåœåäŒè¯. åè§!';
-
-$messages['mailboxempty'] = 'é®ç®±æ¯ç©ºç';
-
-$messages['loading'] = 'è¯»å...';
-
-$messages['loadingdata'] = 'è¯»åæ°æ®...';
-
-$messages['checkingmail'] = 'æ£æ¥æ°æ¶æ¯...';
-
-$messages['sendingmessage'] = 'æ­£åšåéé®ä»¶...';
-
-$messages['messagesent'] = 'é®ä»¶åéæå';
-
-$messages['savingmessage'] = 'æœææ¶æ¯...';
-
-$messages['messagesaved'] = 'æ¶æ¯è¢«ä¿å­å¯¹èçš¿';
-
-$messages['successfullysaved'] = 'ä¿å­æå';
-
-$messages['addedsuccessfully'] = 'èç³»ä¿¡æ¯æåå¢å å°å°åè';
-
-$messages['contactexists'] = 'è¿äžªé®ä»¶å°åå·²ç»å­åš';
-
-$messages['blockedimages'] = 'äžºäºä¿éäœ çç§é, é»æ¡äºè¿äžªé®ä»¶éçåŸç.';
-
-$messages['encryptedmessage'] = 'è¿æ¯äžªå å¯çé®ä»¶å æ­€äžèœæŸç€º. æ±æ­!';
-
-$messages['nocontactsfound'] = 'æ²¡æåç°èç³»äºº';
-
-$messages['sendingfailed'] = 'é®ä»¶åéå€±èŽ¥';
-
-$messages['errorsaving'] = 'åœåçéè¯¯æ¶ä¿å­ä¿¡æ¯';
-
-$messages['errormoving'] = 'ç§»åšé®ä»¶åºé';
-
-$messages['errordeleting'] = 'å é€é®ä»¶åºé';
-
-$messages['deletecontactconfirm']  = 'äœ ç¡®å®èŠå é€æéæ©çèç³»äººä¿¡æ¯å?';
-
-$messages['deletefolderconfirm']  = 'äœ ç¡®å®èŠå é€æ­€æä»¶å€¹å?';
-
-$messages['purgefolderconfirm']  = 'äœ ç¡®å®èŠå é€æ­€æä»¶å€¹éææé®ä»¶å?';
-
-$messages['formincomplete'] = 'è¡šæ Œæ²¡æå¡«åå®å
-š';
-
-$messages['noemailwarning'] = 'è¯·èŸå
-¥ææççµå­é®ä»¶å°å';
-
-$messages['nonamewarning']  = 'è¯·èŸå
-¥åå­';
-
-$messages['nopagesizewarning'] = 'è¯·èŸå
-¥è¡æ°';
-
-$messages['norecipientwarning'] = 'è¯·èŸå
-¥è³å°äžäžªæ¶ä»¶äººå°å';
-
-$messages['nosubjectwarning']  = 'é®ä»¶äž»é¢è¿æ²¡èŸå
-¥. äœ æ³ç°åšèŸå
-¥å?';
-
-$messages['nobodywarning'] = 'é®ä»¶æ²¡åå
-å®¹,ç¡®å®åéå?';
-
-$messages['notsentwarning'] = 'é®ä»¶æ²¡æåé. äœ èŠåæ¶è¿å°é®ä»¶å?';
-
-$messages['noldapserver'] = 'è¯·éæ©èŠæçŽ¢çLDAPæå¡åš';
-
-$messages['nocontactsreturned'] = 'æ²¡æèç³»äººä¿¡æ¯';
-
-$messages['nosearchname'] = 'è¯·èŸå
-¥äžäžªèç³»äººåå­æè
-çµå­é®ä»¶å°å';
-
-
-?>
Index: program/localization/index.inc
===================================================================
--- program/localization/index.inc	(revision 6b6beac63d688cce5ed800a3c68777a49e65c013)
+++ program/localization/index.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -29,5 +29,5 @@
 	'bs_BA' => 'Bosnian (Bosanski)',
 	'tw'    => 'Chinese (BIG5)',
-	'cn'    => 'Chinese (GB2312)',
+	'zh_CN' => 'Chinese (GB2312)',
 	'cz'    => 'Czech',
  	'ca'    => 'CatalÃ ',
@@ -69,4 +69,5 @@
 	'ee' => 'et_EE',
 	'bs' => 'bs_BA',
+    'cn' => 'zh_CN',
 	'de' => 'de_DE',
 	'en' => 'en_US',
Index: program/localization/ja/labels.inc
===================================================================
--- program/localization/ja/labels.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ program/localization/ja/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -20,5 +20,5 @@
 
 // login page
-$labels['welcome']   = 'Welcome to Roundcube|Mail';
+$labels['welcome']   = 'ãããã $product ãž';
 $labels['username']  = 'ãŠãŒã¶ãŒå';
 $labels['password']  = 'ãã¹ã¯ãŒã';
@@ -37,5 +37,4 @@
 $labels['sent']   = 'éä¿¡ç®±';
 $labels['trash']  = 'ãã¿ç®±';
-$labels['drafts'] = 'èçš¿';
 $labels['junk']   = 'ãžã£ã³ã¯';
 
@@ -59,5 +58,5 @@
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Folders';
+$labels['mailboxlist'] = 'ãã©ã«ããŒäžèŠ§';
 $labels['messagesfromto'] = 'è¡šç€ºäž­ã®ã¡ãã»ãŒãž: $from ãã $to(å
 šã¡ãã»ãŒãž: $count)';
@@ -71,7 +70,7 @@
 $labels['filesize'] = 'ãã¡ã€ã«ãµã€ãº';
 
-$labels['preferhtml'] = 'Prefer HTML';
+$labels['preferhtml'] = 'HTML ãè¡šç€º';
 $labels['htmlmessage'] = 'HTML ã¡ãã»ãŒãž';
-$labels['prettydate'] = 'ç°¡æœãªæ¥ä»';
+$labels['prettydate'] = 'ç°¡åãªæ¥ä»è¡šç€º';
 
 $labels['addtoaddressbook'] = 'ã¢ãã¬ã¹åž³ã«è¿œå ãã';
@@ -98,5 +97,5 @@
 
 // toolbar buttons
-$labels['checkmail']        = 'æ°ããã¡ãã»ãŒãžãããããã«ç¢ºèª';
+$labels['checkmail']        = 'æ°ããã¡ãã»ãŒãžãç¢ºèª';
 $labels['writenewmessage']  = 'æ°èŠã¡ãã»ãŒãžãäœæãã';
 $labels['replytomessage']   = 'ã¡ãã»ãŒãžãè¿ä¿¡ãã';
@@ -122,4 +121,9 @@
 
 $labels['quota'] = 'ãã£ã¹ã¯äœ¿çšé';
+$labels['unknown']  = 'äžæ';
+$labels['unlimited']  = 'ç¡å¶é';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
 
 
@@ -130,4 +134,9 @@
 $labels['addattachment']  = 'ãã¡ã€ã«ãæ·»ä»ãã';
 $labels['charset']  = 'æå­ãšã³ã³ãŒã';
+$labels['returnreceipt'] = 'Return receipt';
+
+$labels['checkspelling'] = 'ã¹ãã«ã®ç¢ºèªããã';
+$labels['resumeediting'] = 'ç·šéã®äž­æ­ããã';
+$labels['revertto'] = 'Revert to';
 
 $labels['attachments'] = 'æ·»ä»ãã¡ã€ã«';
@@ -172,4 +181,8 @@
 $labels['export']         = 'ãšã¯ã¹ããŒããã';
 
+$labels['previouspage']   = 'åã®ã»ãããè¡šç€ºãã';
+$labels['nextpage']       = 'æ¬¡ã®ã»ãããè¡šç€ºãã';
+
+
 // LDAP search
 $labels['ldapsearch'] = 'LDAP ãã£ã¬ã¯ããªæ€çŽ¢';
@@ -208,4 +221,5 @@
 $labels['pagesize']  = 'ããŒãžèŸºãã®è¡æ°';
 $labels['signature'] = 'çœ²å';
+$labels['dstactive']  = 'å€æé';
 
 $labels['folder']  = 'ãã©ã«ããŒ';
@@ -215,4 +229,6 @@
 $labels['create']  = 'äœæ';
 $labels['createfolder']  = 'æ°èŠãã©ã«ããŒãäœæãã';
+$labels['rename'] = 'åç§°å€æŽ';
+$labels['renamefolder'] = 'ãã©ã«ããŒåãå€æŽãã';
 $labels['deletefolder']  = 'ãã©ã«ããŒãåé€ãã';
 $labels['managefolders']  = 'ãã©ã«ããŒç®¡ç';
Index: program/localization/ja/messages.inc
===================================================================
--- program/localization/ja/messages.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ program/localization/ja/messages.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -21,5 +21,5 @@
 $messages['loginfailed']  = 'ã­ã°ã€ã³ã«å€±æããŸããã';
 
-$messages['cookiesdisabled'] = 'ãã©ãŠã¶ãŒã Cookie ãèªããŠããŸããã';
+$messages['cookiesdisabled'] = 'ãã©ãŠã¶ãŒã Cookie ãåçããŸããã';
 
 $messages['sessionerror'] = 'ã»ãã·ã§ã³ãæ­£ãããªããæéåãã§ãã';
@@ -37,5 +37,5 @@
 $messages['loadingdata'] = 'ããŒã¿ãèª­ã¿èŸŒã¿äž­ã§ã...';
 
-$messages['checkingmail'] = 'æ°ããã¡ãã»ãŒãžãããããã«ç¢ºèª...';
+$messages['checkingmail'] = 'æ°ããã¡ãã»ãŒãžã®ç¢ºèªäž­ã§ã...';
 
 $messages['sendingmessage'] = 'ã¡ãã»ãŒãžã®éä¿¡äž­ã§ã...';
@@ -43,7 +43,7 @@
 $messages['messagesent'] = 'ã¡ãã»ãŒãžã®éä¿¡ã«æåããŸããã';
 
-$messages['savingmessage'] = 'ã»ãŒãã³ã°ã¡ãã»ãŒãž...';
+$messages['savingmessage'] = 'ã¡ãã»ãŒãžãä¿å­ããŠããŸã...';
 
-$messages['messagesaved'] = 'ã¡ãã»ãŒãžã¯èæ¡ã«æã£ã';
+$messages['messagesaved'] = 'ã¡ãã»ãŒãžãèçš¿ã«ä¿å­ããŸããã';
 
 $messages['successfullysaved'] = 'ä¿å­ã«æåããŸããã';
@@ -76,36 +76,49 @@
 $messages['purgefolderconfirm']  = 'æ¬åœã«ãã®ãã©ã«ããŒã®ãã¹ãŠã®ã¡ãã»ãŒãžãåé€ããŸãã?';
 
-$messages['formincomplete'] = 'ãã©ãŒã ã¯å®å
-šã«åããããŠããŸããã';
+$messages['formincomplete'] = 'ãã©ãŒã ãå®å
+šã«å
+¥åãããŠããŸããã';
 
 $messages['noemailwarning'] = 'æå¹ãªé»å­ã¡ãŒã«ã¢ãã¬ã¹ãå
-¥åããŠãã ãã';
+¥åããŠãã ããã';
 
 $messages['nonamewarning']  = 'ååãå
-¥åããŠãã ãã';
+¥åããŠãã ããã';
 
 $messages['nopagesizewarning'] = 'ããŒãžãµã€ãºãå
-¥åããŠãã ãã';
+¥åããŠãã ããã';
 
-$messages['norecipientwarning'] = 'å°ãªããšã 1 ã€åä¿¡è
+$messages['norecipientwarning'] = 'å°ãªããšã 1 ã€ã®åä¿¡è
 ãå
-¥åããŠãã ãã';
+¥åããŠãã ããã';
 
 $messages['nosubjectwarning']  = 'é 
-ç®ãä»¶åããç©ºã§ããä»å
+ç®ãä»¶åããç©ºã§ããä»ããå
 ¥åããŸãã?';
 
-$messages['nobodywarning'] = 'ãã­ã¹ãã®ç¡ãã¡ãã»ãŒãžãéä¿¡ããŸãã?';
+$messages['nobodywarning'] = 'æ¬æã®ç¡ãã¡ãã»ãŒãžãéä¿¡ããŸãã?';
 
 $messages['notsentwarning'] = 'ã¡ãã»ãŒãžã¯éä¿¡ãããŸããã§ãããã¡ãã»ãŒãžãç Žæ£ãããã§ãã?';
 
-$messages['noldapserver'] = 'æ€çŽ¢ãã LDAP ãµãŒããŒãéžæããŠãã ãã';
+$messages['noldapserver'] = 'æ€çŽ¢ãã LDAP ãµãŒããŒãéžæããŠãã ããã';
 
 $messages['nocontactsreturned'] = 'é£çµ¡å
-ãèŠã€ãããŸãã';
+ãèŠã€ãããŸããã';
 
 $messages['nosearchname'] = 'é£çµ¡å
 åãé»å­ã¡ãŒã«ã¢ãã¬ã¹ãå
-¥åããŠãã ãã';
+¥åããŠãã ããã';
+
+$messages['searchsuccessful'] = '$nr åã®ã¡ãã»ãŒãžãèŠã€ãããŸããã';
+
+$messages['searchnomatch'] = 'äžèŽãããã®ããããŸããã';
+
+$messages['searching'] = 'æ€çŽ¢äž­ã§ã...';
+
+$messages['checking'] = 'ç¢ºèªäž­ã§ã...';
+
+$messages['nospellerrors'] = 'ã¹ãã«ãšã©ãŒã¯ã¿ã€ãããŸããã§ããã';
+
+$messages['folderdeleted'] = 'ãã©ã«ããŒã®åé€ã«æåããŸããã';
 
 ?>
Index: program/localization/lv/labels.inc
===================================================================
--- program/localization/lv/labels.inc	(revision d1dfb1e65c593fcf3e5d5d0db6c386b89552f73f)
+++ program/localization/lv/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -20,5 +20,4 @@
 
 // login page
-$labels['welcome']   = 'Welcome to Roundcube|Mail';
 $labels['username']  = 'LietotÄjvÄrds';
 $labels['password']  = 'Parole';
@@ -93,4 +92,5 @@
 $labels['writenewmessage']  = 'RakstÄ«t jaunu vÄstuli';
 $labels['replytomessage']   = 'AtbildÄt uz vÄstuli';
+
 $labels['replytoallmessage'] = 'AtbildÄt sÅ«tÄ«tÄjam un visiem saÅÄmÄjiem';
 $labels['forwardmessage']   = 'PÄrsÅ«tÄ«t vÄstuli';
@@ -100,4 +100,5 @@
 $labels['nextmessages']     = 'ParÄdÄ«t nÄkamo vÄstuÄŒu kopu';
 $labels['backtolist']       = 'AtpakaÄŒ uz vÄstuÄŒu sarakstu';
+
 $labels['viewsource']       = 'RÄdÄ«t pirmtekstu';
 
@@ -107,4 +108,6 @@
 $labels['unread'] = 'NelasÄ«tÄs';
 
+
+
 $labels['compact'] = 'Saspiest';
 $labels['empty'] = 'IztukÅ¡ot';
@@ -118,4 +121,5 @@
 $labels['sendmessage']  = 'SÅ«tÄ«t vÄstuli';
 $labels['addattachment']  = 'Pievienot failu';
+
 $labels['charset']  = 'RakstzÄ«mju kopa';
 
@@ -130,4 +134,5 @@
 $labels['highest'] = 'AugstÄkÄ';
 
+
 $labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'RÄdÄ«t attÄlus';
@@ -149,4 +154,5 @@
 
 $labels['newcontact']     = 'Izveidot jaunu ierakstu adreÅ¡u grÄmatÄ';
+
 $labels['addcontact']     = 'Pievienot iezÄ«mÄto ierakstu adreÅ¡u grÄmatai';
 $labels['deletecontact']  = 'DzÄst iezÄ«mÄtos ierakstus';
@@ -156,4 +162,6 @@
 $labels['export']         = 'EksportÄt';
 
+
+
 // LDAP search
 $labels['ldapsearch'] = 'MeklÄÅ¡ana LDAP direktorijÄ';
@@ -167,4 +175,5 @@
 
 
+
 // settings
 $labels['settingsfor']  = 'IestatÄ«jumi';
@@ -186,4 +195,5 @@
 $labels['pagesize']  = 'Rindas lapÄ';
 $labels['signature'] = 'Paraksts';
+
 
 $labels['folder']  = 'Mape';
@@ -196,7 +206,31 @@
 $labels['managefolders']  = 'RediÄ£Ät mapes';
 
+
 $labels['sortby'] = 'KÄrtot pÄc';
 $labels['sortasc']  = 'KÄrtot augoÅ¡Ä secÄ«bÄ';
 $labels['sortdesc'] = 'KÄrtot dilstoÅ¡Ä secÄ«bÄ';
 
+$labels['welcome'] = 'Esiet laipni lÅ«gti $product';
+
+$labels['unknown'] = 'nezinÄms';
+$labels['unlimited'] = 'neierobeÅŸots';
+$labels['dstactive'] = 'Vasaras/ziemas laiks';
+
+$labels['previouspage'] = 'ParÄdÄ«t iepriekÅ¡Äjo kopu';
+$labels['nextpage']     = 'ParÄdÄ«t nÄkamo kopu';
+
+$labels['returnreceipt'] = 'SaÅemÅ¡anas apstiprinÄjums';
+
+$labels['checkmail'] = 'PÄrbaudÄ«t pastu';
+$labels['checkspelling'] = 'PÄrbaudÄ«t pareizrakstÄ«bu';
+$labels['resumeediting'] = 'TurpinÄt rediÄ£ÄÅ¡anu';
+$labels['revertto'] = 'Atgriezt uz';
+
+$labels['savemessage']  = 'SaglabÄt uzmetumu';
+$labels['rename'] = 'PÄrsaukt';
+$labels['renamefolder'] = 'PÄrsaukt mapi';
+
+# i use an additional description field - this might be used somewhere else
+$labels['description'] = 'Apraksts';
+
 ?>
Index: program/localization/lv/messages.inc
===================================================================
--- program/localization/lv/messages.inc	(revision 0615a69974d0101d3159511d416bb2c75ffa1ad9)
+++ program/localization/lv/messages.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -89,3 +89,15 @@
 $messages['nosearchname'] = 'LÅ«dzu ievadiet kontaktpersonas vÄrdu vai e-pasta adresi';
 
+$messages['checking'] = 'Notiek pÄrbaude...';
+
+$messages['nospellerrors'] = 'Netika atrastas pareizrakstÄ«bas kÄŒudas';
+
+$messages['checkingmail'] = 'Notiek pasta pÄrbaude...';
+
+$messages['savingmessage'] = 'VÄstule tiek saglabÄta...';
+
+$messages['messagesaved'] = 'VÄstule saglabÄta pie uzmetumiem';
+
+$messages['folderdeleted'] = 'Mape veiksmÄ«gi izdzÄsta';
+
 ?>
Index: program/localization/pl/labels.inc
===================================================================
--- program/localization/pl/labels.inc	(revision c0e9128e6c4b60ca5f283570cec366229f946435)
+++ program/localization/pl/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -210,5 +210,5 @@
 
 //RC 0.1B2
-$labels['welcome'] = 'Witaj $product';
+$labels['welcome'] = 'Witamy w $product';
 
 $labels['unknown'] = 'nieznane';
Index: program/localization/pt_PT/labels.inc
===================================================================
--- program/localization/pt_PT/labels.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ program/localization/pt_PT/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -6,10 +6,11 @@
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
+ |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pedro M. Gouveia <pbodymind@gmail.com>	                     |
+ | Author: Sergio Rocha <sergio.rocha@makeitsimple.pt>	                 |
  +-----------------------------------------------------------------------+
- 
+
  $Id$
 
@@ -28,13 +29,12 @@
 $labels['mail']     = 'E-mail';
 $labels['settings'] = 'ConfiguraÃ§Ãµes pessoais';
-$labels['addressbook'] = 'CatÃ¡logo de endereÃ§os';
+$labels['addressbook'] = 'Lista de Contactos';
 
 // Nome das pastas de correio
 $labels['inbox']  = 'Caixa de entrada';
-$labels['drafts'] = 'EsboÃ§os';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Lixeira';
 $labels['drafts'] = 'Rascunhos';
-$labels['junk']   = 'Spam';
+$labels['junk']   = 'Junk';
 
 // message listing
@@ -42,5 +42,5 @@
 $labels['from']    = 'Remetente';
 $labels['to']      = 'Para';
-$labels['cc']      = 'Cc';
+$labels['cc']      = 'CÃ³pia';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder para';
@@ -54,5 +54,5 @@
 
 $labels['mailboxlist'] = 'Pastas';
-$labels['messagesfromto'] = 'Mensagens de $from para $to $count';
+$labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 
@@ -67,5 +67,5 @@
 $labels['prettydate'] = 'Formatar datas';
 
-$labels['addtoaddressbook'] = 'Incluir no catÃ¡logo de endereÃ§os';
+$labels['addtoaddressbook'] = 'Adicionar ao catÃ¡logo de endereÃ§os';
 
 // Dias da semana abreviados
@@ -90,8 +90,7 @@
 
 // toolbar buttons
-$labels['checkmail']        = 'Verificar para ver se hÃ¡ mensagens novas';
 $labels['writenewmessage']  = 'Criar nova mensagem';
 $labels['replytomessage']   = 'Responder';
-$labels['replytoallmessage'] = 'Responder para todos';
+$labels['replytoallmessage'] = 'Responder a todos';
 $labels['forwardmessage']   = 'Encaminhar';
 $labels['deletemessage']    = 'Mover para lixeira';
@@ -100,7 +99,7 @@
 $labels['nextmessages']     = 'PrÃ³ximo';
 $labels['backtolist']       = 'Voltar';
-$labels['viewsource']       = 'Exibir cÃ³digo fonte';
-
-$labels['select'] = 'Selecionar';
+$labels['viewsource']       = 'Mostrar cÃ³digo fonte';
+
+$labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
@@ -111,10 +110,9 @@
 $labels['purge'] = 'Apagar';
 
-$labels['quota'] = 'Quota de espaÃ§o';
+$labels['quota'] = 'UtilizaÃ§Ã£o';
 
 
 // message compose
 $labels['compose']  = 'Escrever mensagem';
-$labels['savemessage']  = 'Excepto este esboÃ§o';
 $labels['sendmessage']  = 'Enviar';
 $labels['addattachment']  = 'Anexar';
@@ -125,11 +123,11 @@
 $labels['close']  = 'Fechar';
 
-$labels['low']     = 'Baixo';
-$labels['lowest']  = 'Muito Baixo';
+$labels['low']     = 'Mais baixo';
+$labels['lowest']  = 'Baixo';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alta';
-$labels['highest'] = 'Muito alta';
-
-$labels['nosubject']  = '(sem assunto)';
+$labels['highest'] = 'Mais alta';
+
+$labels['nosubject']  = '(no assunto)';
 $labels['showimages'] = 'Exibir imagens';
 
@@ -146,12 +144,11 @@
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save']   = 'Salvar';
+$labels['save']   = 'Gravar';
 $labels['delete'] = 'Apagar';
 
 $labels['newcontact']     = 'Criar novo contacto';
-$labels['addcontact']     = 'Adicionar contacto seleccionado ao catÃ¡logo de endereÃ§os';
-$labels['deletecontact']  = 'Apagar contactos seleccionados';
+$labels['deletecontact']  = 'Apagar contactos selecionados';
 $labels['composeto']      = 'Escrever mensagem para';
-$labels['contactsfromto'] = 'Contactos $from - $to de $count';
+$labels['contactsfromto'] = 'Contactos $from - $to of $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
@@ -161,8 +158,8 @@
 
 $labels['ldappublicsearchname']    = 'Nome do contacto';
-$labels['ldappublicsearchtype'] = 'Pesquisa certa?';
-$labels['ldappublicserverselect'] = 'Seleccionar servidores';
+$labels['ldappublicsearchtype'] = 'Pesquisa exacta?';
+$labels['ldappublicserverselect'] = 'Selecionar servidores';
 $labels['ldappublicsearchfield'] = 'Pesquisar em';
-$labels['ldappublicsearchform'] = 'Procurar por contacto';
+$labels['ldappublicsearchform'] = 'Procurar por um contacto';
 $labels['ldappublicsearch'] = 'Pesquisar';
 
@@ -172,9 +169,9 @@
 
 $labels['preferences']  = 'PreferÃªncias';
-$labels['userpreferences']  = 'PreferÃªncias do tilizador';
+$labels['userpreferences']  = 'PreferÃªncias do utilizador';
 $labels['editpreferences']  = 'Editar preferÃªncias do utilizador';
 
 $labels['identities']  = 'Identidades';
-$labels['manageidentities']  = 'Gerenciar identidades para a sua conta';
+$labels['manageidentities']  = 'Gerir identidades para esta conta';
 $labels['newidentity']  = 'Nova identidade';
 
@@ -182,7 +179,7 @@
 $labels['edititem']  = 'Editar item';
 
-$labels['setdefault']  = 'PadrÃ£o';
+$labels['setdefault']  = 'Principal';
 $labels['language']  = 'Idioma';
-$labels['timezone']  = 'Hora Local';
+$labels['timezone']  = 'Time zone';
 $labels['pagesize']  = 'Linhas por pÃ¡gina';
 $labels['signature'] = 'Assinatura';
@@ -191,9 +188,9 @@
 $labels['folders']  = 'Pastas';
 $labels['foldername']  = 'Nome da pasta';
-$labels['subscribed']  = 'Assinado';
+$labels['subscribed']  = 'Subscrito';
 $labels['create']  = 'Criar';
 $labels['createfolder']  = 'Criar nova pasta';
 $labels['deletefolder']  = 'Apagar pasta';
-$labels['managefolders']  = 'Gerenciar pastas';
+$labels['managefolders']  = 'Gerir pastas';
 
 $labels['sortby'] = 'Ordenado por';
@@ -201,3 +198,28 @@
 $labels['sortdesc'] = 'Descendente';
 
+// New labels since 0.1beta
+
+$labels['welcome'] = 'Bem-vindo ao $product';
+
+$labels['unknown'] = 'Desconhecido';
+$labels['unlimited'] = 'Ilimitado';
+$labels['dstactive'] = 'HorÃ¡rio de verÃ£o';
+
+$labels['previouspage'] = 'Exibir pÃ¡gina anterior';
+$labels['nextpage']     = 'Exibir prÃ³xima pÃ¡gina';
+
+$labels['returnreceipt'] = 'ConfirmaÃ§Ã£o de leitura';
+
+$labels['checkmail'] = 'Verificar novas mensagens';
+$labels['checkspelling'] = 'Verificar ortografia';
+$labels['resumeediting'] = 'Continuar a ediÃ§Ã£o';
+$labels['revertto'] = 'Reverter para';
+
+$labels['savemessage']  = 'Salvar rascunho';
+$labels['rename'] = 'Renomear';
+$labels['renamefolder'] = 'Renomear pasta';
+
+// I use an additional description field - this might be used somewhere else
+$labels['description'] = 'DescriÃ§Ã£o';
+
 ?>
Index: program/localization/pt_PT/messages.inc
===================================================================
--- program/localization/pt_PT/messages.inc	(revision c8c1e0ef3b229a82e74c70aeacc29f2ba021afbe)
+++ program/localization/pt_PT/messages.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -8,10 +8,11 @@
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
+ |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pedro M. Gouveia <pbodymind@gmail.com>	                     |
+ | Author: Sergio Rocha <sergio.rocha@makeitsimple.pt>	                 |
  +-----------------------------------------------------------------------+
 
  $Id$
- 
+
 */
 
@@ -20,9 +21,9 @@
 $messages['loginfailed']  = 'Falha no login';
 
-$messages['cookiesdisabled'] = 'O seu navegador nÃ£o suporta cookies';
+$messages['cookiesdisabled'] = 'Seu navegador nÃ£o suporta cookies';
 
-$messages['sessionerror'] = 'A sua sessÃ£o Ã© invÃ¡lida ou expirou';
+$messages['sessionerror'] = 'A sessÃ£o do seu navegador Ã© invÃ¡lida ou expirou';
 
-$messages['imaperror'] = 'O servidor IMAP falhou';
+$messages['imaperror'] = 'A conexÃ£o com o servidor IMAP falhou';
 
 $messages['nomessagesfound'] = 'Nenhuma mensagem foi encontrada na caixa postal';
@@ -32,27 +33,17 @@
 $messages['mailboxempty'] = 'A caixa postal estÃ¡ vazia';
 
-$messages['loading'] = 'Carregando...';
-
-$messages['loadingdata'] = 'Carregando InformaÃ§Ãµes...';
-
-$messages['checkingmail'] = 'Verificar para ver se hÃ¡ mensagens novas...';
-
-$messages['sendingmessage'] = 'A enviar mensagem...';
+$messages['loadingdata'] = 'A carregar informaÃ§Ãµes...';
 
 $messages['messagesent'] = 'Mensagem enviada';
 
-$messages['savingmessage'] = 'Mensagem do Saving...';
+$messages['successfullysaved'] = 'Gravado com sucesso';
 
-$messages['messagesaved'] = 'Mensagem conservada aos esboÃ§os';
+$messages['addedsuccessfully'] = 'Contacto incluÃ­do com sucesso';
 
-$messages['successfullysaved'] = 'Ficheiro gravado';
-
-$messages['addedsuccessfully'] = 'Contacto adicionado ao catÃ¡logo de endereÃ§os';
-
-$messages['contactexists'] = 'Um contacto com esse e-mail jÃ¡ existe';
+$messages['contactexists'] = 'JÃ¡ existe um contacto com esse e-mail';
 
 $messages['blockedimages'] = 'Para proteger sua privacidade, as imagens desta mensagem foram bloqueadas';
 
-$messages['encryptedmessage'] = 'Esta mensagem estÃ¡ criptografada e nÃ£o pode ser exibida. Desculpe.';
+$messages['encryptedmessage'] = 'Esta mensagem estÃ¡ cifrada e nÃ£o pode ser exibida. Desculpe.';
 
 $messages['nocontactsfound'] = 'Nenhum contacto encontrado';
@@ -66,25 +57,25 @@
 $messages['errordeleting'] = 'NÃ£o foi possÃ­vel apagar a mensagem';
 
-$messages['deletecontactconfirm']  = 'Deseja realmente excluir os contatos seleccionados?';
+$messages['deletecontactconfirm']  = 'Deseja realmente apagar os contactos selecionados?';
 
-$messages['deletefolderconfirm']  = 'Deseja realmente excluir esta pasta?';
+$messages['deletefolderconfirm']  = 'Deseja realmente apagar esta pasta?';
 
-$messages['purgefolderconfirm']  = 'Deseja realmente excluir todas mensagens desta pasta';
+$messages['purgefolderconfirm']  = 'Deseja realmente apagar todas mensagens desta pasta';
 
-$messages['formincomplete'] = 'Alguns campos nÃ£o foram preenchidos';
+$messages['formincomplete'] = 'Os campos nÃ£o foram completamente preenchidos';
 
-$messages['noemailwarning'] = 'Por favor, insira um endereÃ§o de e-mail vÃ¡lido';
+$messages['noemailwarning'] = 'Por favor, escreva um endereÃ§o de e-mail vÃ¡lido';
 
-$messages['nonamewarning']  = 'Por favor, insira o nome';
+$messages['nonamewarning']  = 'Por favor, escreva o nome';
 
-$messages['nopagesizewarning'] = 'Por favor, insira o tamanho da pÃ¡gina';
+$messages['nopagesizewarning'] = 'Por favor, escreva o tamanho da pÃ¡gina';
 
-$messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatÃ¡rio';
+$messages['norecipientwarning'] = 'Por favor, escreva pelo menos um destinatÃ¡rio';
 
-$messages['nosubjectwarning']  = 'O campo assunto nÃ£o foi preenchido. Deseja preenche-lo agora?';
+$messages['nosubjectwarning']  = 'O campo assunto nÃ£o foi preenchido. Deseja incluÃ­-lo agora?';
 
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 
-$messages['notsentwarning'] = 'A mensagem nÃ£o foi enviada, deseja excluÃ­-la?';
+$messages['notsentwarning'] = 'A mensegem nÃ£o foi enviada, deseja apagï¿œ-la?';
 
 $messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
@@ -92,5 +83,18 @@
 $messages['nocontactsreturned'] = 'Nenhum contacto foi encontrado';
 
-$messages['nosearchname'] = 'Por favor, informe o nome do contacto ou o seu endereÃ§o de e-mail';
+$messages['nosearchname'] = 'Por favor, escreva o nome do contacto ou seu endereÃ§o de e-mail';
+
+// New messages since 0.1beta
+$messages['checking'] = 'A Verificar...';
+
+$messages['nospellerrors'] = 'Nenhum erro ortogrÃ¡fico foi encontrado';
+
+$messages['checkingmail'] = 'Verificando novas mensagens...';
+
+$messages['savingmessage'] = 'A gravar a mensagem...';
+
+$messages['messagesaved'] = 'Mensagem salva como rascunho';
+
+$messages['folderdeleted'] = 'Pasta apagada com sucesso';
 
 ?>
Index: program/localization/zh_CN/labels.inc
===================================================================
--- program/localization/zh_CN/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
+++ program/localization/zh_CN/labels.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -0,0 +1,209 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/zh_CN/labels.inc                                             |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ |  Author: winman rong  <winman.rong@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page
+$labels['username']  = 'çšæ·å';
+$labels['password']  = 'å¯ç ';
+$labels['server']    = 'æå¡åš';
+$labels['login']     = 'ç»åœ';
+
+// taskbar
+$labels['logout']   = 'éåº';
+$labels['mail']     = 'çµå­é®ä»¶';
+$labels['settings'] = 'äžªäººè®Ÿçœ®';
+$labels['addressbook'] = 'å°åè';
+
+// mailbox names
+$labels['inbox']  = 'æ¶ä»¶ç®±';
+$labels['sent']   = 'åä»¶ç®±';
+$labels['trash']  = 'ååŸæ¡¶';
+$labels['drafts'] = 'æ©çš¿';
+$labels['junk']   = 'ååŸé®ä»¶';
+
+// message listing
+$labels['subject'] = 'é®ä»¶æ é¢';
+$labels['from']    = 'åä»¶äºº';
+$labels['to']      = 'æ¥æ¶äºº';
+$labels['cc']      = 'å¯æ¬';
+$labels['bcc']     = 'å¯é';
+$labels['replyto'] = 'åå€å°å';
+$labels['date']    = 'æ¥æ';
+$labels['size']    = 'æä»¶å€§å°';
+$labels['priority'] = 'äŒå
+æ';
+$labels['organization'] = 'æºæ';
+
+// aliases
+$labels['reply-to'] = $labels['åå€å°'];
+
+$labels['mailboxlist'] = 'æä»¶å€¹';
+$labels['messagesfromto'] = 'é®ä»¶ $from å° $to æ»å
+± $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+
+$labels['moveto']   = 'ç§»åšå°...';
+$labels['download'] = 'äžèœœ';
+
+$labels['filename'] = 'æä»¶åç§°';
+$labels['filesize'] = 'æä»¶å€§å°';
+
+$labels['preferhtml'] = 'å
+è®žä»¥HTMLæ ŒåŒæŸç€ºé®ä»¶å
+å®¹';
+$labels['htmlmessage'] = 'HTMLæ ŒåŒé®ä»¶';
+$labels['prettydate'] = 'Pretty dates';
+
+$labels['addtoaddressbook'] = 'å å°å°åè';
+
+// weekdays short
+$labels['sun'] = 'æææ¥';
+$labels['mon'] = 'ææäž';
+$labels['tue'] = 'ææäº';
+$labels['wed'] = 'ææäž';
+$labels['thu'] = 'ææå';
+$labels['fri'] = 'ææäº';
+$labels['sat'] = 'ææå
+­';
+
+// weekdays long
+$labels['sunday']    = 'æææ¥';
+$labels['monday']    = 'ææäž';
+$labels['tuesday']   = 'ææäº';
+$labels['wednesday'] = 'ææäž';
+$labels['thursday']  = 'ææå';
+$labels['friday']    = 'ææäº';
+$labels['saturday']  = 'ææå
+­';
+
+$labels['today'] = 'ä»å€©';
+
+// toolbar buttons
+$labels['writenewmessage']  = 'åæ°é®ä»¶';
+$labels['replytomessage']   = 'åå€é®ä»¶';
+$labels['forwardmessage']   = 'èœ¬åé®ä»¶';
+$labels['deletemessage']    = 'æé®ä»¶ç§»åšå°ååŸæ¡¶';
+$labels['printmessage']     = 'æå°è¿å°é®ä»¶';
+$labels['previousmessages'] = 'æ¥çäžäžå°é®ä»¶';
+$labels['nextmessages']     = 'æ¥çäžäžå°é®ä»¶';
+$labels['backtolist']       = 'è¿åé®ä»¶åè¡š';
+$labels['viewsource']       = 'æŸç€ºæºä»£ç ';
+
+$labels['select'] = 'éæ©';
+$labels['all'] = 'å
+šéš';
+$labels['none'] = 'æ²¡æ';
+$labels['unread'] = 'è¿æ²¡è¯»è¿ç';
+
+// message compose
+$labels['compose']  = 'åæ°é®ä»¶';
+$labels['sendmessage']  = 'ç«å»åéé®ä»¶';
+$labels['addattachment']  = 'éå äžäžªæä»¶';
+
+$labels['attachments'] = 'éä»¶';
+$labels['upload'] = 'äžäŒ ';
+$labels['close']  = 'å
+³é­';
+
+$labels['low']     = 'äœ';
+$labels['lowest']  = 'æäœ';
+$labels['normal']  = 'æ­£åžž';
+$labels['high']    = 'é«';
+$labels['highest'] = 'æé«';
+
+$labels['showimages'] = 'æŸç€ºåŸç';
+
+
+// address boook
+$labels['name']      = 'æŸç€ºåå­';
+$labels['firstname'] = 'å';
+$labels['surname']   = 'å§';
+$labels['email']     = 'çµå­é®ä»¶';
+
+$labels['addcontact'] = 'å¢å æ°èç³»äºº';
+$labels['editcontact'] = 'çŒèŸèç³»ä¿¡æ¯';
+
+$labels['edit']   = 'çŒèŸ';
+$labels['cancel'] = 'åæ¶';
+$labels['save']   = 'ä¿å­';
+$labels['delete'] = 'å é€';
+
+$labels['newcontact']     = 'å»ºç«æ°çèç³»ä¿¡æ¯';
+$labels['deletecontact']  = 'å é€æéæ©çèç³»ä¿¡æ¯';
+$labels['composeto']      = 'ç»æéæ©çèç³»äººåéé®ä»¶';
+$labels['contactsfromto'] = 'èç³»äºº $from å° $to æ»å
+± $count';
+$labels['print']          = 'æå°';
+$labels['export']         = 'å¯Œåº';
+
+
+// settings
+$labels['settingsfor']  = 'Settings for';
+
+$labels['preferences']  = 'äžªäººè®Ÿå®';
+$labels['userpreferences']  = 'çšæ·åå¥œè®Ÿå®';
+$labels['editpreferences']  = 'çŒèŸçšæ·è®Ÿå®';
+
+$labels['identities']  = 'åä»¶äººèº«ä»œ';
+$labels['manageidentities']  = 'ç®¡çåžå·èµæ';
+$labels['newidentity']  = 'å»ºç«æ°æ è¯';
+
+$labels['newitem']  = 'New item';
+$labels['edititem']  = 'Edit item';
+
+$labels['setdefault']  = 'è®Ÿçœ®äžºé»è®€';
+$labels['language']  = 'è¯­èš';
+$labels['timezone']  = 'æ¶åº';
+$labels['pagesize']  = 'æ¯é¡µé®ä»¶æ°';
+
+
+$labels['folders']  = 'æä»¶å€¹';
+$labels['foldername']  = 'æä»¶å€¹åç§°';
+$labels['subscribed']  = 'æŸç€ºäžåŠ';
+$labels['create']  = 'åå»º';
+$labels['createfolder']  = 'å»ºç«æ°æä»¶å€¹';
+$labels['deletefolder']  = 'å é€æä»¶å€¹';
+$labels['managefolders']  = 'ç®¡çæä»¶å€¹';
+
+// New Words since 0.1 beta
+$labels['welcome'] = 'æ¬¢è¿äœ¿çš $product';
+
+$labels['unknown'] = 'æªç¥';
+$labels['unlimited'] = 'æ éå¶';
+$labels['dstactive'] = 'Daylight savings';
+
+$labels['previouspage'] = 'äžäžé¡µ';
+$labels['nextpage']     = 'äžäžé¡µ';
+
+$labels['returnreceipt'] = 'è¿åé®ä»¶é
+è¯»åæ§';
+
+$labels['checkmail'] = 'æ£æ¥é®ä»¶';
+$labels['checkspelling'] = 'æŒåæ£æ¥';
+$labels['resumeediting'] = 'ç»§ç»­çŒèŸ';
+$labels['revertto'] = 'æ¢å€';
+
+$labels['savemessage']  = 'å­åšäžºèçš¿';
+$labels['rename'] = 'éåœå';
+$labels['renamefolder'] = 'éåœåæä»¶å€¹';
+
+$labels['description'] = 'æè¿°';
+
+
+?>
Index: program/localization/zh_CN/messages.inc
===================================================================
--- program/localization/zh_CN/messages.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
+++ program/localization/zh_CN/messages.inc	(revision 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b)
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/zh_CN/messages.inc                                           |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ |  Author: winman rong  <winman.rong@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'ç»åœå€±èŽ¥';
+
+$messages['cookiesdisabled'] = 'äœ çæµè§åšç®åå
+³é­äºcookiesïŒè¯·æåŒcookiesåè¯';
+
+$messages['sessionerror'] = 'åœå session æ ææè
+è¶
+æ¶ ';
+
+$messages['imaperror'] = 'äžèœè¿æ¥IMAPæå¡åš';
+
+$messages['nomessagesfound'] = 'æ²¡æé®ä»¶åšè¿äžªé®ç®±é';
+
+$messages['loggedout'] = 'æåç»æåœåäŒè¯. åè§!';
+
+$messages['mailboxempty'] = 'é®ç®±ç°åšæ¯ç©ºç';
+
+$messages['loadingdata'] = 'è¯»åæ°æ®...';
+
+$messages['messagesent'] = 'é®ä»¶åéæå';
+
+$messages['successfullysaved'] = 'ä¿å­æå';
+
+$messages['addedsuccessfully'] = 'èç³»ä¿¡æ¯å·²ç»æåå¢å å°å°åè';
+
+$messages['contactexists'] = 'è¿äžªé®ä»¶å°åå·²ç»å­åš';
+
+$messages['blockedimages'] = 'äžºäºä¿éäžªäººç§é, é»æ¡äºé®ä»¶éçåŸç.';
+
+$messages['encryptedmessage'] = 'æ±æ­!äžèœæŸç€ºå å¯é®ä»¶.';
+
+$messages['nocontactsfound'] = 'æ²¡æåç°èç³»äºº';
+
+$messages['sendingfailed'] = 'é®ä»¶åéå€±èŽ¥';
+
+$messages['errorsaving'] = 'åœåçéè¯¯æ¶ä¿å­ä¿¡æ¯';
+
+$messages['errormoving'] = 'ç§»åšé®ä»¶åºé';
+
+$messages['errordeleting'] = 'å é€é®ä»¶åºé';
+
+// New Words since 0.1 beta
+
+$messages['checking'] = 'æ£æ¥...';
+
+$messages['nospellerrors'] = 'æ²¡åç°æŒåéè¯¯';
+
+$messages['checkingmail'] = 'æ£æ¥æ°é®ä»¶...';
+
+$messages['savingmessage'] = 'ä¿å­é®ä»¶...';
+
+$messages['messagesaved'] = 'å°é®ä»¶ä¿å­äžºèçš¿';
+
+$messages['folderdeleted'] = 'æåå é€æä»¶å€¹';
+
+
+?>
