From db1a87cd6c506f2afbd1a37c64cb56ae11120b49 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 17 Dec 2010 10:07:04 -0500
Subject: [PATCH] Update branch for 0.5-rc release

---
 program/localization/zh_TW/labels.inc |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index c05622e..886d3a3 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -40,8 +40,7 @@
 $labels['cc'] = '副本';
 $labels['bcc'] = '密件副本';
 $labels['replyto'] = '回覆至';
-$labels['mailreplyto'] = '信件回覆至';
-$labels['mailfollowupto'] = '信件跟隨至';
+$labels['followupto'] = '信件跟隨至';
 $labels['date'] = '日期';
 $labels['size'] = '大小';
 $labels['priority'] = '優先順序';
@@ -203,8 +202,7 @@
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
-$labels['addmailreplyto'] = '新增 信件回覆至';
-$labels['addmailfollowupto'] = '新增 信件跟隨至';
+$labels['addfollowupto'] = '新增 信件跟隨至';
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎?';
 $labels['receiptread'] = '郵件回條(已閱讀)';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
@@ -332,9 +330,6 @@
 $labels['messagecount'] = '郵件數目';
 $labels['create'] = '建立';
 $labels['createfolder'] = '建立新資料夾';
-$labels['rename'] = '重新命名';
-$labels['renamefolder'] = '重新命名資料夾';
-$labels['deletefolder'] = '刪除資料夾';
 $labels['managefolders'] = '管理資料夾';
 $labels['specialfolders'] = '預設資料夾設定';
 $labels['sortby'] = '排序';

--
Gitblit v1.9.1