Revert "Merge branch 'master' of github.com:nextcloud/server"

This reverts commit d9d60238c7aaab9c61bf2d50c15aa59bc88c8975, reversing
changes made to ba3fdb0cdcfbb84f0080a2146a4ba2f01569915d.

1 files changed, 4 insertions, 3 deletions

diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 6cef557767d..30a0f00d973 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -168,6 +168,7 @@
     "Go to the \"{dir}\" directory" : "前往“{dir}”目录",
     "Drag and drop files here to upload" : "将文件拖拽至此处以上传",
     "You don’t have permission to upload or create files here" : "您没有权限在此上传或创建文件",
+    "Upload successful" : "上传成功",
     "\"{displayName}\" action executed successfully" : "“{displayName}”操作执行成功",
     "\"{displayName}\" action failed" : "“{displayName}”操作执行失败",
     "Rename file" : "重命名文件",
@@ -184,6 +185,8 @@
     "Could not rename \"{oldName}\", it does not exist any more" : "无法重命名“{fileName}”，此文件已经不存在",
     "The name \"{newName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名称「{newName}」在这个文件夹「{dir}」已经被使用。请选择其他名称。",
     "Could not rename \"{oldName}\"" : "无法重命名“{fileName}”",
+    "Could not copy {file}. {message}" : "无法复制 {file}。{message}",
+    "Could not move {file}. {message}" : "无法移动 {file}。{message}",
     "Total rows summary" : "总行摘要",
     "\"{displayName}\" failed on some elements " : "“{displayName}”在某些元素上失败",
     "\"{displayName}\" batch action executed successfully" : "批量操作“{displayName}”运行成功",
@@ -244,7 +247,6 @@
     "Blank" : "空白",
     "Unable to create new file from template" : "无法从模板创建新文件",
     "Delete permanently" : "彻底删除",
-    "Cancel" : "取消",
     "Destination is not a folder" : "目标不是一个文件夹",
     "This file/folder is already in that directory" : "该文件/文件夹已经存在与该目录中",
     "You cannot move a file/folder onto itself or into a subfolder of itself" : "你无法将文件/文件夹移动至其自身或子文件夹中",
@@ -257,8 +259,6 @@
     "Open folder {displayName}" : "打开文件夹{displayName}",
     "Open in Files" : "在文件中打开",
     "Open details" : "打开详情",
-    "Could not copy {file}. {message}" : "无法复制 {file}。{message}",
-    "Could not move {file}. {message}" : "无法移动 {file}。{message}",
     "Create new templates folder" : "新建模板文件夹",
     "Templates" : "模板",
     "Unable to initialize the templates directory" : "无法初始化模板目录",
@@ -286,6 +286,7 @@
     "You can only favorite a single file or folder at a time" : "您一次只能收藏一个文件或文件夹",
     "Search users" : "搜索用户",
     "You might not have have permissions to view it, ask the sender to share it" : "您可能没有权限浏览它，请要求发送者分享它",
+    "Cancel" : "取消",
     "Set up templates folder" : "设置模板文件夹",
     "Toggle %1$s sublist" : "切换 %1$s 子列表",
     "Toggle grid view" : "切换网格视图",