merge wefork

1 files changed, 69 insertions, 13 deletions

diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index 5ee29ce5..3f5a4dc4 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -1,10 +1,30 @@
 {
     "accept": "接受",
+    "act-activity-notify": "[Wekan] 活動通知",
+    "act-addAttachment": "新增附件__attachment__至__card__",
+    "act-addComment": "評論__card__: __comment__",
+    "act-createBoard": "完成新增 __board__",
+    "act-createCard": "將__card__加入__list__",
+    "act-createList": "新增__list__至__board__",
+    "act-addBoardMember": "在__board__中新增成員__member__",
+    "act-archivedBoard": "封存__board__",
+    "act-archivedCard": "封存__card__",
+    "act-archivedList": "封存__list__",
+    "act-importBoard": "匯入__board__",
+    "act-importCard": "匯入__card__",
+    "act-importList": "匯入__list__",
+    "act-joinMember": "在__card__中新增成員__member__",
+    "act-moveCard": "將__card__從__oldList__移動至__list__",
+    "act-removeBoardMember": "從__board__中移除成員__member__",
+    "act-restoredCard": "將__card__回復至__board__",
+    "act-unjoinMember": "從__card__中移除成員__member__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "操作",
     "activities": "活動",
     "activity": "活動",
     "activity-added": "新增 %s 至 %s",
-    "activity-archived": "刪除 %s",
+    "activity-archived": "封存 %s",
     "activity-attached": "新增附件 %s 至 %s",
     "activity-created": "建立 %s",
     "activity-excluded": "排除 %s 從 %s",
@@ -31,6 +51,8 @@
     "all-boards": "全部看板",
     "and-n-other-card": "和其他 __count__ 個卡片",
     "and-n-other-card_plural": "和其他 __count__ 個卡片",
+    "apply": "送出",
+    "app-is-offline": "目前狀態為離線，若整重將會造成資料遺失",
     "archive": "刪除",
     "archive-all": "全部刪除",
     "archive-board": "刪除看板",
@@ -38,14 +60,15 @@
     "archive-list": "刪除該清單",
     "archive-selection": "刪除所選內容",
     "archiveBoardPopup-title": "確定要刪除看板嗎？",
-    "archived-items": "回收筒",
-    "archives": "回收筒",
+    "archived-items": "封存",
+    "archives": "封存",
     "assign-member": "分配成員",
     "attached": "附加",
     "attachment": "附件",
     "attachment-delete-pop": "刪除附件的操作無法還原。",
     "attachmentDeletePopup-title": "刪除附件？",
     "attachments": "附件",
+    "auto-watch": "新增看板時自動加入觀察",
     "avatar-too-big": "大頭貼太大 (最大 70 Kb)",
     "back": "返回",
     "board-change-color": "更改顏色",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "修改看板背景",
     "boardChangeTitlePopup-title": "重新命名看板",
     "boardChangeVisibilityPopup-title": "更改可視級別",
-    "boardImportBoardPopup-title": "從 Trello 匯入看板",
+    "boardChangeWatchPopup-title": "更改觀察",
     "boardMenuPopup-title": "看板選單",
     "boards": "看板",
     "bucket-example": "例如 “目標清單”",
@@ -66,11 +89,15 @@
     "card-delete-notice": "徹底刪除的操作不可復原，你將會遺失該卡片相關的所有操作記錄。",
     "card-delete-pop": "所有的動作將從活動動態中被移除且您將無法重新打開該卡片。此操作無法復原。",
     "card-delete-suggest-archive": "你可以將卡片從看板中刪除至回收筒，但保留相關活動。",
+    "card-due": "到期",
+    "card-due-on": "到期",
     "card-edit-attachments": "編輯附件",
     "card-edit-labels": "編輯標籤",
     "card-edit-members": "編輯成員",
     "card-labels-title": "更改該卡片上的標籤",
     "card-members-title": "在該卡片中新增或移除看板成員",
+    "card-start": "開始",
+    "card-start-on": "開始",
     "cardAttachmentsPopup-title": "附件來源",
     "cardDeletePopup-title": "徹底刪除卡片？",
     "cardDetailsActionsPopup-title": "卡片動作",
@@ -82,13 +109,15 @@
     "change-avatar": "更改大頭貼",
     "change-password": "更改密碼",
     "change-permissions": "更改許可權",
+    "change-settings": "更改設定",
     "changeAvatarPopup-title": "更改大頭貼",
     "changeLanguagePopup-title": "更改語言",
     "changePasswordPopup-title": "更改密碼",
-    "changePermissionsPopup-title": "更改權限",
+    "changePermissionsPopup-title": "更改許可權",
+    "changeSettingsPopup-title": "更改設定",
     "click-to-star": "點此來標記該看板",
     "click-to-unstar": "點此來去除該看板的標記",
-    "clipboard": "剪貼簿貼上或者拖曳檔案",
+    "clipboard" : "剪貼簿貼上或者拖曳檔案",
     "close": "關閉",
     "close-board": "關閉看板",
     "close-board-pop": "您可以透過點選主介面上方的”回收筒“按鈕來還原看板。",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "建立看板",
     "createLabelPopup-title": "建立標籤",
     "current": "目前",
+    "date": "日期",
     "decline": "拒絕",
     "default-avatar": "預設大頭貼",
     "delete": "刪除",
@@ -122,7 +152,10 @@
     "edit": "編輯",
     "edit-avatar": "更改大頭貼",
     "edit-profile": "編輯資料",
+    "editCardStartDatePopup-title": "更改開始日期",
+    "editCardDueDatePopup-title": "更改到期日期",
     "editLabelPopup-title": "更改標籤",
+    "editNotificationPopup-title": "更改通知",
     "editProfilePopup-title": "編輯資料",
     "email": "電子郵件",
     "email-enrollAccount-subject": "您在 __siteName__ 的帳號已經建立",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "該使用者不存在",
     "error-user-notAllowSelf": "不允許對自己執行此操作",
     "error-user-notCreated": "該使用者未能成功建立",
+    "error-username-taken": "這個使用者名稱已被使用",
     "export-board": "Export board",
     "filter": "過濾",
     "filter-cards": "過濾卡片",
     "filter-clear": "清空過濾條件",
+    "filter-no-label": "沒有標籤",
+    "filter-no-member": "沒有成員",
     "filter-on": "過濾條件啟用",
     "filter-on-desc": "你正在過濾該看板上的卡片，點此編輯過濾條件。",
     "filter-to-selection": "要選擇的過濾條件",
     "fullname": "全稱",
     "header-logo-title": "返回您的看板頁面",
+    "hide-system-messages": "隱藏系統訊息",
     "home": "首頁",
     "import": "匯入",
-    "import-board": "從 Trello 匯入",
+    "import-board": "匯入 Trello 資料",
+    "import-board-title": "匯入在 Trello 的看板",
     "import-board-trello-instruction": "在你的Trello看板中，點選“功能表”，然後選擇“更多”，“列印與匯出”，“匯出為 JSON” 並拷貝結果文本",
-    "import-card": "匯入 Trello 卡片",
-    "import-card-trello-instruction": "進入一個 Trello 卡片，選擇“分享與更多”，然後選擇 “匯出為 JSON” 並且拷貝結果文本",
     "import-json-placeholder": "貼上您有效的 JSON 資料至此",
+    "import-map-members": "複製成員",
     "import-members-map": "您匯入的看板有一些成員。請將您想匯入的成員映射到 Wekan 使用者。",
     "import-show-user-mapping": "核對成員映射",
     "import-user-select": "選擇您想將此成員映射到的 Wekan 使用者",
+    "importMapMembersAddPopup-title": "選擇 Wekan 成員",
     "info": "資訊",
     "initials": "縮寫",
+    "invalid-date": "無效的日期",
     "joined": "關聯",
     "just-invited": "您剛剛被邀請加入此看板",
     "keyboard-shortcuts": "鍵盤快速鍵",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "匯入 Trello 卡片",
     "lists": "清單",
     "log-out": "登出",
+    "log-in": "登入",
     "loginPopup-title": "登入",
-    "mapMembersAddPopup-title": "選擇 Wekan 成員",
-    "mapMembersPopup-title": "映射成員",
     "memberMenuPopup-title": "成員更改",
     "members": "成員",
     "menu": "選單",
     "move-selection": "移動被選擇的項目",
     "moveCardPopup-title": "移動卡片",
-    "moveSelectionPopup-title": "Move selection",
+    "moveCardToBottom-title": "移至最下面",
+    "moveCardToTop-title": "移至最上面",
+    "moveSelectionPopup-title": "移動選取的項目",
     "multi-selection": "多選",
     "multi-selection-on": "多選啟用",
+    "muted": "靜音",
+    "muted-info": "您將不會收到有關這個看板的任何訊息",
     "my-boards": "我的看板",
     "name": "名稱",
     "no-archived-cards": "沒有已刪除的卡片",
@@ -205,12 +247,15 @@
     "normal": "普通",
     "normal-desc": "可以建立以及編輯卡片，無法更改。",
     "not-accepted-yet": "邀請尚未接受",
+    "notify-participate": "接收與你有關的卡片更新",
+    "notify-watch": "接收您關注的看板、清單或卡片的更新",
     "optional": "選擇性的",
     "or": "或",
     "page-maybe-private": "本頁面被設為私有. 您必須 <a href='%s'>登入</a>以瀏覽其中內容。",
     "page-not-found": "頁面不存在。",
     "password": "密碼",
     "paste-or-dragdrop": "從剪貼簿貼上，或者拖曳檔案到它上面 (僅限於圖片)",
+    "participating": "參與",
     "preview": "預覽",
     "previewAttachedImagePopup-title": "預覽",
     "previewClipboardImagePopup-title": "預覽",
@@ -235,7 +280,7 @@
     "search": "搜尋",
     "select-color": "選擇顏色",
     "shortcut-assign-self": "分配目前卡片給自己",
-    "shortcut-autocomplete-emojies": "自動完成 emojis",
+    "shortcut-autocomplete-emoji": "自動完成表情符號",
     "shortcut-autocomplete-members": "自動補齊成員",
     "shortcut-clear-filters": "清空全部過濾條件",
     "shortcut-close-dialog": "關閉對話方塊",
@@ -243,6 +288,7 @@
     "shortcut-show-shortcuts": "顯示此快速鍵清單",
     "shortcut-toggle-filterbar": "切換過濾程式邊欄",
     "shortcut-toggle-sidebar": "切換面板邊欄",
+    "show-cards-minimum-count": "顯示卡片數量，當內容超過數量",
     "signupPopup-title": "建立帳戶",
     "star-board-title": "點此標記該看板，它將會出現在您的看板列表上方。",
     "starred-boards": "已標記看板",
@@ -251,14 +297,24 @@
     "team": "團隊",
     "this-board": "這個看板",
     "this-card": "這個卡片",
+    "time": "時間",
     "title": "標題",
+    "tracking": "追蹤",
+    "tracking-info": "你將會收到與你有關的卡片的所有變更通知",
     "unassign-member": "取消分配成員",
     "unsaved-description": "未儲存的描述",
+    "unwatch": "取消觀察",
     "upload": "上傳",
     "upload-avatar": "上傳大頭貼",
     "uploaded-avatar": "大頭貼已經上傳",
     "username": "使用者名稱",
     "view-it": "檢視",
     "warn-list-archived": "警告: 該卡片位於已刪除的清單中",
+    "watch": "觀察",
+    "watching": "觀察中",
+    "watching-info": "你將會收到關於這個看板所有的變更通知",
+    "welcome-board": "歡迎進入看板",
+    "welcome-list1": "基本",
+    "welcome-list2": "進階",
     "what-to-do": "要做什麼？"
 }