summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/l10n/zh_CN.GB2312.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:34:36 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:34:36 +0200
commit7425efade78a04f20cb3cc83f964c6a00094b6ce (patch)
tree967aa50e8873c88f0adf6f91d0285ab1c54b7189 /apps/files_trashbin/l10n/zh_CN.GB2312.php
parentb4a523927823ab8bc80c5f1fc0d5bd5ef61f8eb8 (diff)
parent7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff)
downloadnextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.tar.gz
nextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.zip
Merge branch 'master' into oc_preview
Conflicts: 3rdparty lib/template.php
Diffstat (limited to 'apps/files_trashbin/l10n/zh_CN.GB2312.php')
-rw-r--r--apps/files_trashbin/l10n/zh_CN.GB2312.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 4dda1e0433c..1ab193517f8 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Error" => "出错",
+"Delete permanently" => "永久删除",
"Name" => "名称",
"1 folder" => "1 个文件夹",
"{count} folders" => "{count} 个文件夹",