Merge branch 'main' into add_location_data

lib/l10n/intl_zh.arb

@@ -696,6 +696,21 @@
   "deleteEmptyAlbumsWithQuestionMark": "要删除空相册吗？",
   "deleteAlbumsDialogBody": "这将删除所有空相册。 当您想减少相册列表中的混乱时，这很有用。",
   "deleteProgress": "正在删除 {currentlyDeleting} /共 {totalCount}",
+  "genericProgress": "正在处理 {currentlyProcessing} / {totalCount}",
+  "@genericProgress": {
+    "description": "Generic progress text to display when processing multiple items",
+    "type": "text",
+    "placeholders": {
+      "currentlyProcessing": {
+        "example": "1",
+        "type": "int"
+      },
+      "totalCount": {
+        "example": "10",
+        "type": "int"
+      }
+    }
+  },
   "permanentlyDelete": "永久删除",
   "canOnlyCreateLinkForFilesOwnedByYou": "只能为您拥有的文件创建链接",
   "publicLinkCreated": "公共链接已创建",
@@ -823,7 +838,6 @@
   "clubByFileName": "按文件名排序",
   "count": "计数",
   "totalSize": "总大小",
-  "time": "时间",
   "longpressOnAnItemToViewInFullscreen": "长按一个项目来全屏查看",
   "decryptingVideo": "正在解密视频...",
   "authToViewYourMemories": "请验证以查看您的回忆",
@@ -1163,5 +1177,6 @@
   "selectALocation": "Select a location",
   "selectALocationFirst": "Select a location first",
   "changeLocationOfSelectedItems": "Change location of selected items?",
-  "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente"
+  "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente",
+  "cleanUncategorized": "清除未分类的"
 }