- New Folder Manager UI

- Fix invalid Request when creating a folder (#1487443)
- Add folder size and quota indicator in folder manager (#1485780)
- Add possibility to move a subfolder into root folder (#1486791)


git-svn-id: https://svn.roundcube.net/trunk@4304 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 0 insertions, 7 deletions

diff --git a/roundcubemail/program/localization/zh_CN/labels.inc b/roundcubemail/program/localization/zh_CN/labels.inc
index acebdf718..dff93a4e2 100644
--- a/roundcubemail/program/localization/zh_CN/labels.inc
+++ b/roundcubemail/program/localization/zh_CN/labels.inc
@@ -307,13 +307,9 @@ $labels['afternseconds'] = '$n 秒之后';
 $labels['folder'] = '邮件夹';
 $labels['folders'] = '邮件夹';
 $labels['foldername'] = '邮件夹名称';
-$labels['subscribed'] = '已订阅';
 $labels['messagecount'] = '邮件数量';
 $labels['create'] = '建立';
 $labels['createfolder'] = '建立新邮件夹';
-$labels['rename'] = '重命名';
-$labels['renamefolder'] = '重命名邮件夹';
-$labels['deletefolder'] = '删除邮件夹';
 $labels['managefolders'] = '管理邮件夹';
 $labels['specialfolders'] = '指定邮件夹';
 $labels['sortby'] = '排序';
diff --git a/roundcubemail/program/localization/zh_CN/messages.inc b/roundcubemail/program/localization/zh_CN/messages.inc
index 5fc0d3f95..dbe5af585 100644
--- a/roundcubemail/program/localization/zh_CN/messages.inc
+++ b/roundcubemail/program/localization/zh_CN/messages.inc
@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
 $messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
 $messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
 $messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
-$messages['foldercreating'] = '正在创建邮件夹';
 $messages['folderdeleting'] = '正在删除邮件夹';
-$messages['folderrenaming'] = '正在重命名邮件夹';
 $messages['foldermoving'] = '正在移动目录...';
 $messages['formincomplete'] = '当前表单未填写完整，请完整填写';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址';
@@ -92,7 +90,6 @@ $messages['copyingmessage'] = '复制邮件到...';
 $messages['receiptsent'] = '成功发送了一个已读回执';
 $messages['errorsendingreceipt'] = '无法发送回执';
 $messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
-$messages['addsubfolderhint'] = '新建的文件夹将成为所选文件夹的子文件夹';
 $messages['forbiddencharacter'] = '目录名包含隐藏字符';
 $messages['selectimportfile'] = '请选择要上传的文件';
 $messages['addresswriterror'] = '已选择的地址簿不可写';