Updated Polish, Portuguese, Latvian, Chinese and Japanese localization

11 files changed, 310 insertions, 239 deletions

diff --git a/program/localization/cn/messages.inc b/program/localization/cn/messages.inc
deleted file mode 100644
index 8ce103bff..000000000
--- a/program/localization/cn/messages.inc
+++ /dev/null
@@ -1,99 +0,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'] = '请输入一个联系人名字或者电子邮件地址';
-
-
-?>
\ No newline at end of file
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 38c464d50..b2f0696f5 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -28,7 +28,7 @@
 	'bg'    => 'Bulgarian',
 	'bs_BA' => 'Bosnian (Bosanski)',
 	'tw'    => 'Chinese (BIG5)',
-	'cn'    => 'Chinese (GB2312)',
+	'zh_CN' => 'Chinese (GB2312)',
 	'cz'    => 'Czech',
  	'ca'    => 'Català',
 	'da'    => 'Dansk',
@@ -68,6 +68,7 @@
 $rcube_language_aliases = array(
 	'ee' => 'et_EE',
 	'bs' => 'bs_BA',
+    'cn' => 'zh_CN',
 	'de' => 'de_DE',
 	'en' => 'en_US',
 	'nl' => 'nl_NL',
diff --git a/program/localization/ja/labels.inc b/program/localization/ja/labels.inc
index 3732185a1..d6f278003 100644
--- a/program/localization/ja/labels.inc
+++ b/program/localization/ja/labels.inc
@@ -19,7 +19,7 @@
 $labels = array();
 
 // login page
-$labels['welcome']   = 'Welcome to Roundcube|Mail';
+$labels['welcome']   = 'ようこそ $product へ';
 $labels['username']  = 'ユーザー名';
 $labels['password']  = 'パスワード';
 $labels['server']    = 'サーバー';
@@ -36,7 +36,6 @@ $labels['inbox']  = '受信箱';
 $labels['drafts'] = '草案';
 $labels['sent']   = '送信箱';
 $labels['trash']  = 'ごみ箱';
-$labels['drafts'] = '草稿';
 $labels['junk']   = 'ジャンク';
 
 // message listing
@@ -54,7 +53,7 @@ $labels['organization'] = '所属';
 // aliases
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Folders';
+$labels['mailboxlist'] = 'フォルダー一覧';
 $labels['messagesfromto'] = '表示中のメッセージ: $from から $to(全メッセージ: $count)';
 $labels['messagenrof'] = '全メッセージ: $count 現在のメッセージ:$nr';
 
@@ -64,9 +63,9 @@ $labels['download'] = 'ダウンロード';
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイルサイズ';
 
-$labels['preferhtml'] = 'Prefer HTML';
+$labels['preferhtml'] = 'HTML を表示';
 $labels['htmlmessage'] = 'HTML メッセージ';
-$labels['prettydate'] = '簡潔な日付';
+$labels['prettydate'] = '簡単な日付表示';
 
 $labels['addtoaddressbook'] = 'アドレス帳に追加する';
 
@@ -91,7 +90,7 @@ $labels['saturday']  = '土曜日';
 $labels['today'] = '今日';
 
 // toolbar buttons
-$labels['checkmail']        = '新しいメッセージがあるように確認';
+$labels['checkmail']        = '新しいメッセージを確認';
 $labels['writenewmessage']  = '新規メッセージを作成する';
 $labels['replytomessage']   = 'メッセージを返信する';
 $labels['replytoallmessage'] = '送信者とすべての受信者に返信する';
@@ -113,6 +112,11 @@ $labels['empty'] = '空';
 $labels['purge'] = '破棄';
 
 $labels['quota'] = 'ディスク使用量';
+$labels['unknown']  = '不明';
+$labels['unlimited']  = '無制限';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
 
 
 // message compose
@@ -121,6 +125,11 @@ $labels['savemessage']  = 'この草案を救いなさい';
 $labels['sendmessage']  = 'メッセージを今すぐ送信する';
 $labels['addattachment']  = 'ファイルを添付する';
 $labels['charset']  = '文字エンコード';
+$labels['returnreceipt'] = 'Return receipt';
+
+$labels['checkspelling'] = 'スペルの確認をする';
+$labels['resumeediting'] = '編集の中断をする';
+$labels['revertto'] = 'Revert to';
 
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
@@ -158,6 +167,10 @@ $labels['contactsfromto'] = '連絡先 $from から $to (合計: $count)';
 $labels['print']          = '印刷する';
 $labels['export']         = 'エクスポートする';
 
+$labels['previouspage']   = '前のセットを表示する';
+$labels['nextpage']       = '次のセットを表示する';
+
+
 // LDAP search
 $labels['ldapsearch'] = 'LDAP ディレクトリ検索';
 
@@ -188,6 +201,7 @@ $labels['language']  = '言語';
 $labels['timezone']  = 'タイムゾーン';
 $labels['pagesize']  = 'ページ辺りの行数';
 $labels['signature'] = '署名';
+$labels['dstactive']  = '夏時間';
 
 $labels['folder']  = 'フォルダー';
 $labels['folders']  = 'フォルダー一覧';
@@ -195,6 +209,8 @@ $labels['foldername']  = 'フォルダー名';
 $labels['subscribed']  = '購読済';
 $labels['create']  = '作成';
 $labels['createfolder']  = '新規フォルダーを作成する';
+$labels['rename'] = '名称変更';
+$labels['renamefolder'] = 'フォルダー名を変更する';
 $labels['deletefolder']  = 'フォルダーを削除する';
 $labels['managefolders']  = 'フォルダー管理';
 
diff --git a/program/localization/ja/messages.inc b/program/localization/ja/messages.inc
index 4847bd41d..3574b207e 100644
--- a/program/localization/ja/messages.inc
+++ b/program/localization/ja/messages.inc
@@ -20,7 +20,7 @@ $messages = array();
 
 $messages['loginfailed']  = 'ログインに失敗しました。';
 
-$messages['cookiesdisabled'] = 'ブラウザーが Cookie を認めていません。';
+$messages['cookiesdisabled'] = 'ブラウザーが Cookie を受理しません。';
 
 $messages['sessionerror'] = 'セッションが正しくないか期限切れです。';
 
@@ -36,15 +36,15 @@ $messages['loading'] = '読み込み中...';
 
 $messages['loadingdata'] = 'データを読み込み中です...';
 
-$messages['checkingmail'] = '新しいメッセージがあるように確認...';
+$messages['checkingmail'] = '新しいメッセージの確認中です...';
 
 $messages['sendingmessage'] = 'メッセージの送信中です...';
 
 $messages['messagesent'] = 'メッセージの送信に成功しました。';
 
-$messages['savingmessage'] = 'セービングメッセージ...';
+$messages['savingmessage'] = 'メッセージを保存しています...';
 
-$messages['messagesaved'] = 'メッセージは草案に救った';
+$messages['messagesaved'] = 'メッセージを草稿に保存しました。';
 
 $messages['successfullysaved'] = '保存に成功しました。';
 
@@ -72,26 +72,38 @@ $messages['deletefolderconfirm']  = '本当にこのフォルダーを削除し�
 
 $messages['purgefolderconfirm']  = '本当にこのフォルダーのすべてのメッセージを削除しますか?';
 
-$messages['formincomplete'] = 'フォームは完全に埋められていません。';
+$messages['formincomplete'] = 'フォームが完全に入力されていません。';
 
-$messages['noemailwarning'] = '有効な電子メールアドレスを入力してください';
+$messages['noemailwarning'] = '有効な電子メールアドレスを入力してください。';
 
-$messages['nonamewarning']  = '名前を入力してください';
+$messages['nonamewarning']  = '名前を入力してください。';
 
-$messages['nopagesizewarning'] = 'ページサイズを入力してください';
+$messages['nopagesizewarning'] = 'ページサイズを入力してください。';
 
-$messages['norecipientwarning'] = '少なくとも 1 つ受信者を入力してください';
+$messages['norecipientwarning'] = '少なくとも 1 つの受信者を入力してください。';
 
-$messages['nosubjectwarning']  = '項目「件名」が空です。今入力しますか?';
+$messages['nosubjectwarning']  = '項目「件名」が空です。今すぐ入力しますか?';
 
-$messages['nobodywarning'] = 'テキストの無いメッセージを送信しますか?';
+$messages['nobodywarning'] = '本文の無いメッセージを送信しますか?';
 
 $messages['notsentwarning'] = 'メッセージは送信されませんでした。メッセージを破棄したいですか?';
 
-$messages['noldapserver'] = '検索する LDAP サーバーを選択してください';
+$messages['noldapserver'] = '検索する LDAP サーバーを選択してください。';
 
-$messages['nocontactsreturned'] = '連絡先が見つかりません';
+$messages['nocontactsreturned'] = '連絡先が見つかりません。';
 
-$messages['nosearchname'] = '連絡先名か電子メールアドレスを入力してください';
+$messages['nosearchname'] = '連絡先名か電子メールアドレスを入力してください。';
+
+$messages['searchsuccessful'] = '$nr 個のメッセージが見つかりました。';
+
+$messages['searchnomatch'] = '一致するものがありません。';
+
+$messages['searching'] = '検索中です...';
+
+$messages['checking'] = '確認中です...';
+
+$messages['nospellerrors'] = 'スペルエラーはみつかりませんでした。';
+
+$messages['folderdeleted'] = 'フォルダーの削除に成功しました。';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/lv/labels.inc b/program/localization/lv/labels.inc
index 1fa5e45dd..3a1afe52d 100644
--- a/program/localization/lv/labels.inc
+++ b/program/localization/lv/labels.inc
@@ -19,7 +19,6 @@
 $labels = array();
 
 // login page
-$labels['welcome']   = 'Welcome to Roundcube|Mail';
 $labels['username']  = 'Lietotājvārds';
 $labels['password']  = 'Parole';
 $labels['server']    = 'Serveris';
@@ -92,6 +91,7 @@ $labels['today'] = 'Šodien';
 // toolbar buttons
 $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';
 $labels['deletemessage']    = 'Pārvietot vēstuli uz miskasti';
@@ -99,6 +99,7 @@ $labels['printmessage']     = 'Izdrukāt šo vēstuli';
 $labels['previousmessages'] = 'Parādīt iepriekšējo vēstuļu kopu';
 $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';
 
 $labels['select'] = 'Iezīmēt';
@@ -106,6 +107,8 @@ $labels['all'] = 'Visas';
 $labels['none'] = 'Nevienu';
 $labels['unread'] = 'Nelasītās';
 
+
+
 $labels['compact'] = 'Saspiest';
 $labels['empty'] = 'Iztukšot';
 $labels['purge'] = 'Iztīrīt';
@@ -117,6 +120,7 @@ $labels['quota'] = 'Kvota';
 $labels['compose']  = 'Rakstīt vēstuli';
 $labels['sendmessage']  = 'Sūtīt vēstuli';
 $labels['addattachment']  = 'Pievienot failu';
+
 $labels['charset']  = 'Rakstzīmju kopa';
 
 $labels['attachments'] = 'Pielikumi';
@@ -129,6 +133,7 @@ $labels['normal']  = 'Normāla';
 $labels['high']    = 'Augsta';
 $labels['highest'] = 'Augstākā';
 
+
 $labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
 
@@ -148,6 +153,7 @@ $labels['save']   = 'Saglabāt';
 $labels['delete'] = 'Dzēst';
 
 $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';
 $labels['composeto']      = 'Rakstīt vēstuli';
@@ -155,6 +161,8 @@ $labels['contactsfromto'] = 'Ieraksti $from līdz $to no $count';
 $labels['print']          = 'Drukāt';
 $labels['export']         = 'Eksportēt';
 
+
+
 // LDAP search
 $labels['ldapsearch'] = 'Meklēšana LDAP direktorijā';
 
@@ -166,6 +174,7 @@ $labels['ldappublicsearchform'] = 'Meklēt kontaktpersonu';
 $labels['ldappublicsearch'] = 'Meklēt';
 
 
+
 // settings
 $labels['settingsfor']  = 'Iestatījumi';
 
@@ -186,6 +195,7 @@ $labels['timezone']  = 'Laika zona';
 $labels['pagesize']  = 'Rindas lapā';
 $labels['signature'] = 'Paraksts';
 
+
 $labels['folder']  = 'Mape';
 $labels['folders']  = 'Mapes';
 $labels['foldername']  = 'Mapes nosaukums';
@@ -195,8 +205,32 @@ $labels['createfolder']  = 'Izveidot jaunu mapi';
 $labels['deletefolder']  = 'Dzēst mapi';
 $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';
+
+?>
\ No newline at end of file
diff --git a/program/localization/lv/messages.inc b/program/localization/lv/messages.inc
index ad07bef7c..8ddfafaa7 100644
--- a/program/localization/lv/messages.inc
+++ b/program/localization/lv/messages.inc
@@ -88,4 +88,16 @@ $messages['nocontactsreturned'] = 'Neviena kontaktpersona netika atrasta';
 
 $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';
+
+?>
\ No newline at end of file
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index b7779ed6a..55f96c0ae 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -195,7 +195,7 @@ $labels['sortasc']  = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
 
 //RC 0.1B2
-$labels['welcome'] = 'Witaj $product';
+$labels['welcome'] = 'Witamy w $product';
 
 $labels['unknown'] = 'nieznane';
 $labels['unlimited'] = 'bez limitu';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 2a26c544f..e2d720589 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -5,12 +5,13 @@
  | language/pt_PT/labels.inc                                             |
  |                                                                       |
  | 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$
 
 */
@@ -27,21 +28,20 @@ $labels['login']     = 'Entrar';
 $labels['logout']   = 'Sair';
 $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
 $labels['subject'] = 'Assunto';
 $labels['from']    = 'Remetente';
 $labels['to']      = 'Para';
-$labels['cc']      = 'Cc';
+$labels['cc']      = 'Cópia';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder para';
 $labels['date']    = 'Data';
@@ -53,7 +53,7 @@ $labels['organization'] = 'Organização';
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Pastas';
-$labels['messagesfromto'] = 'Mensagens de $from para $to $count';
+$labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 
 $labels['moveto']   = 'mover para...';
@@ -66,7 +66,7 @@ $labels['preferhtml'] = 'Prefere HTML';
 $labels['htmlmessage'] = 'Mensagem HTML';
 $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
 $labels['sun'] = 'Dom';
@@ -89,19 +89,18 @@ $labels['saturday']  = 'Sábado';
 $labels['today'] = 'Hoje';
 
 // 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';
 $labels['printmessage']     = 'Imprimir';
 $labels['previousmessages'] = 'Anterior';
 $labels['nextmessages']     = 'Próximo';
 $labels['backtolist']       = 'Voltar';
-$labels['viewsource']       = 'Exibir código fonte';
+$labels['viewsource']       = 'Mostrar código fonte';
 
-$labels['select'] = 'Selecionar';
+$labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
 $labels['unread'] = 'Não lidas';
@@ -110,12 +109,11 @@ $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vazio';
 $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';
 $labels['charset']  = 'Charset';
@@ -124,13 +122,13 @@ $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Upload';
 $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['highest'] = 'Mais alta';
 
-$labels['nosubject']  = '(sem assunto)';
+$labels['nosubject']  = '(no assunto)';
 $labels['showimages'] = 'Exibir imagens';
 
 
@@ -145,14 +143,13 @@ $labels['editcontact'] = 'Editar contacto';
 
 $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';
 
@@ -160,10 +157,10 @@ $labels['export']         = 'Exportar';
 $labels['ldapsearch'] = 'Pesquisa no diretório LDAP';
 
 $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';
 
 
@@ -171,33 +168,58 @@ $labels['ldappublicsearch'] = 'Pesquisar';
 $labels['settingsfor']  = 'Configurações para';
 
 $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';
 
 $labels['newitem']  = 'Novo item';
 $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';
 
 $labels['folder']  = 'Pasta';
 $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';
 $labels['sortasc']  = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
 
-?>
+// New labels since 0.1beta
+
+$labels['welcome'] = 'Bem-vindo ao $product';
+
+$labels['unknown'] = 'Desconhecido';
+$labels['unlimited'] = 'Ilimitado';
+$labels['dstactive'] = 'Horário de verão';
+
+$labels['previouspage'] = 'Exibir página anterior';
+$labels['nextpage']     = 'Exibir próxima página';
+
+$labels['returnreceipt'] = 'Confirmação de leitura';
+
+$labels['checkmail'] = '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';
+
+?>
\ No newline at end of file
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index b204ea448..9dd30164b 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -7,23 +7,24 @@
  | Language file of the RoundCube Webmail client                         |
  | 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$
- 
+
 */
 
 $messages = array();
 
 $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';
 
@@ -31,29 +32,19 @@ $messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até breve!';
 
 $messages['mailboxempty'] = 'A caixa postal está vazia';
 
-$messages['loading'] = 'Carregando...';
-
-$messages['loadingdata'] = 'Carregando Informações...';
-
-$messages['checkingmail'] = '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['messagesaved'] = 'Mensagem conservada aos esboços';
-
-$messages['successfullysaved'] = 'Ficheiro gravado';
+$messages['successfullysaved'] = 'Gravado com sucesso';
 
-$messages['addedsuccessfully'] = 'Contacto adicionado ao catálogo de endereços';
+$messages['addedsuccessfully'] = 'Contacto incluído com sucesso';
 
-$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';
 
@@ -65,32 +56,45 @@ $messages['errormoving'] = 'Não foi possível mover a mensagem';
 
 $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';
 
 $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';
 
 ?>
diff --git a/program/localization/cn/labels.inc b/program/localization/zh_CN/labels.inc
index 62208fe63..7cb97491b 100644
--- a/program/localization/cn/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -2,14 +2,13 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/cn/labels.inc                                                |
+ | language/zh_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>                         |
  +-----------------------------------------------------------------------+
 
@@ -33,10 +32,9 @@ $labels['addressbook'] = '地址薄';
 
 // mailbox names
 $labels['inbox']  = '收件箱';
-$labels['drafts'] = '草稿';
 $labels['sent']   = '发件箱';
 $labels['trash']  = '垃圾桶';
-$labels['drafts'] = '草稿';
+$labels['drafts'] = '早稿';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
@@ -48,14 +46,14 @@ $labels['bcc']     = '密送';
 $labels['replyto'] = '回复地址';
 $labels['date']    = '日期';
 $labels['size']    = '文件大小';
-$labels['priority'] = '优先级';
-$labels['organization'] = '团体';
+$labels['priority'] = '优先权';
+$labels['organization'] = '机构';
 
 // aliases
 $labels['reply-to'] = $labels['回复到'];
 
 $labels['mailboxlist'] = '文件夹';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['messagesfromto'] = '邮件 $from 到 $to 总共 $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
 $labels['moveto']   = '移动到...';
@@ -64,7 +62,7 @@ $labels['download'] = '下载';
 $labels['filename'] = '文件名称';
 $labels['filesize'] = '文件大小';
 
-$labels['preferhtml'] = '以HTML格式显示';
+$labels['preferhtml'] = '允许以HTML格式显示邮件内容';
 $labels['htmlmessage'] = 'HTML格式邮件';
 $labels['prettydate'] = 'Pretty dates';
 
@@ -91,33 +89,25 @@ $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['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'] = '空间使用';
+$labels['none'] = '没有';
+$labels['unread'] = '还没读过的';
 
 // message compose
 $labels['compose']  = '写新邮件';
-$labels['savemessage']  = '保存这份草稿';
 $labels['sendmessage']  = '立刻发送邮件';
-$labels['addattachment']  = '添加附件';
+$labels['addattachment']  = '附加一个文件';
 
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
@@ -129,7 +119,6 @@ $labels['normal']  = '正常';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
-$labels['nosubject']  = '(没有主题)';
 $labels['showimages'] = '显示图片';
 
 
@@ -148,35 +137,23 @@ $labels['save']   = '保存';
 $labels['delete'] = '删除';
 
 $labels['newcontact']     = '建立新的联系信息';
-$labels['addcontact']     = '将联系人添加到地址薄';
-$labels['deletecontact']  = '删除选择的联系信息';
+$labels['deletecontact']  = '删除所选择的联系信息';
 $labels['composeto']      = '给所选择的联系人发送邮件';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['contactsfromto'] = '联系人 $from 到 $to 总共 $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['settingsfor']  = 'Settings for';
 
-$labels['preferences']  = '参数选择';
-$labels['userpreferences']  = '用户参数';
-$labels['editpreferences']  = '编辑用户参数';
+$labels['preferences']  = '个人设定';
+$labels['userpreferences']  = '用户喜好设定';
+$labels['editpreferences']  = '编辑用户设定';
 
 $labels['identities']  = '发件人身份';
-$labels['manageidentities']  = '管理发件人资料';
-$labels['newidentity']  = '建立新身份';
+$labels['manageidentities']  = '管理帐号资料';
+$labels['newidentity']  = '建立新标识';
 
 $labels['newitem']  = 'New item';
 $labels['edititem']  = 'Edit item';
@@ -184,11 +161,9 @@ $labels['edititem']  = 'Edit item';
 $labels['setdefault']  = '设置为默认';
 $labels['language']  = '语言';
 $labels['timezone']  = '时区';
-$labels['pagesize']  = '每页行数';
-$labels['signature'] = '签名';
+$labels['pagesize']  = '每页邮件数';
 
 
-$labels['folder']  = '文件夹';
 $labels['folders']  = '文件夹';
 $labels['foldername']  = '文件夹名称';
 $labels['subscribed']  = '显示与否';
@@ -197,8 +172,28 @@ $labels['createfolder']  = '建立新文件夹';
 $labels['deletefolder']  = '删除文件夹';
 $labels['managefolders']  = '管理文件夹';
 
-$labels['sortby'] = 'Sort by';
-$labels['sortasc']  = '由小到大排列';
-$labels['sortdesc'] = '由大到小排列';
+// 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'] = '描述';
+
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
new file mode 100644
index 000000000..6d0408d39
--- /dev/null
+++ b/program/localization/zh_CN/messages.inc
@@ -0,0 +1,74 @@
+<?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'] = '成功删除文件夹';
+
+
+?>