From 71a474268e6381f8630f6d906471c830342dc50f Mon Sep 17 00:00:00 2001 From: omnitrix Date: Wed, 16 Apr 2025 16:18:04 +0200 Subject: feat(web): Add support for merging lists (#1231) * feat: Support list merging * some fixes * move @hoarder to @karakeep --------- Co-authored-by: Mohamed Bassem --- apps/web/lib/i18n/locales/en/translation.json | 8 +++++++- apps/web/lib/i18n/locales/zh/translation.json | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'apps/web/lib') diff --git a/apps/web/lib/i18n/locales/en/translation.json b/apps/web/lib/i18n/locales/en/translation.json index 4cce6295..3398045e 100644 --- a/apps/web/lib/i18n/locales/en/translation.json +++ b/apps/web/lib/i18n/locales/en/translation.json @@ -223,6 +223,10 @@ "new_list": "New List", "edit_list": "Edit List", "new_nested_list": "New Nested List", + "merge_list": "Merge List", + "destination_list": "Destination List", + "delete_after_merge": "Delete original list after merge", + "no_destination": "No Destination", "parent_list": "Parent List", "no_parent": "No Parent", "list_type": "List Type", @@ -361,7 +365,9 @@ }, "lists": { "created": "List has been created!", - "updated": "List has been updated!" + "updated": "List has been updated!", + "merged": "List has been merged!", + "deleted": "List has been deleted!" } }, "banners": { diff --git a/apps/web/lib/i18n/locales/zh/translation.json b/apps/web/lib/i18n/locales/zh/translation.json index 8132cb1f..178baca8 100644 --- a/apps/web/lib/i18n/locales/zh/translation.json +++ b/apps/web/lib/i18n/locales/zh/translation.json @@ -214,6 +214,10 @@ "favourites": "收藏", "new_list": "新列表", "new_nested_list": "新嵌套列表", + "merge_list": "合并列表", + "destination_list": "目标列表", + "delete_after_merge": "合并后删除源列表", + "no_destination": "未选中目标", "no_parent": "没有父级", "parent_list": "父级列表", "list_type": "列表类型", @@ -309,7 +313,9 @@ }, "lists": { "created": "列表已创建！", - "updated": "列表已更新！" + "updated": "列表已更新！", + "merged": "列表已合并！", + "deleted": "列表已删除！" } }, "cleanups": { -- cgit v1.2.3-70-g09d2