Merge branch 'TNick-nested-tasks' into devel

1 files changed, 24 insertions, 2 deletions

diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json
index 0911aed1..124bc7dd 100644
--- a/i18n/hy.i18n.json
+++ b/i18n/hy.i18n.json
@@ -2,6 +2,7 @@
     "accept": "Ընդունել",
     "act-activity-notify": "[Wekan] Activity Notification",
     "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
     "act-addChecklist": "added checklist __checklist__ to __card__",
     "act-addChecklistItem": "ավելացրել է __checklistItem__ __checklist__ on __card__-ին",
     "act-addComment": "մեկնաբանել է __card__: __comment__",
@@ -41,6 +42,7 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
     "activity-checklist-added": "added checklist to %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
     "add": "Add",
@@ -48,6 +50,7 @@
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -141,6 +144,7 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
@@ -163,7 +167,8 @@
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
@@ -475,5 +480,22 @@
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
     "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
     "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board"
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent"
 }
\ No newline at end of file