Update translations.

21 files changed, 1318 insertions, 251 deletions

diff --git a/.tx/config b/.tx/config
index 1f95dacd..0d6318bc 100644
--- a/.tx/config
+++ b/.tx/config
@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = es_ES:es-ES, fa_IR:fa-IR, pt_BR:pt-BR, zh_CN:zh-CN, zh_TW:zh-TW
+lang_map = es_ES:es-ES, fa_IR:fa, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW
 
 [wefork.application]
 file_filter = i18n/<lang>.i18n.json
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index 225b0975..a09721bc 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "الإجراءات",
     "activities": "الأنشطة",
     "activity": "النشاط",
@@ -31,6 +51,8 @@
     "all-boards": "كل اللوحات",
     "and-n-other-card": "And __count__ other بطاقة",
     "and-n-other-card_plural": "And __count__ other بطاقات",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "أرشف",
     "archive-all": "أرشف الكل",
     "archive-board": "أرشف اللوحة",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "حذف المرق هو حذف نهائي . لا يمكن التراجع إذا حذف.",
     "attachmentDeletePopup-title": "تريد حذف المرفق ?",
     "attachments": "المرفقات",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "حجم ملف الصورة الخاصة بك كبير . لا يمكن  أن تتجاوز 70 كيلو أكتي",
     "back": "رجوع",
     "board-change-color": "تغيير اللومr",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "تعديل خلفية الشاشة",
     "boardChangeTitlePopup-title": "إعادة تسمية اللوحة",
     "boardChangeVisibilityPopup-title": "تعديل وضوح الرؤية",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "قائمة اللوحة",
     "boards": "لوحات",
     "bucket-example": "مثل « todo list » على سبيل المثال",
@@ -66,11 +89,15 @@
     "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
     "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
     "card-delete-suggest-archive": "يمكنك أرشفة بطاقة لحذفها من اللوحة والمحافظة على النشاط.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "تعديل المرفقات",
     "card-edit-labels": "تعديل العلامات",
     "card-edit-members": "تعديل الأعضاء",
     "card-labels-title": "تعديل علامات البطاقة.",
     "card-members-title": "إضافة او حذف أعضاء للبطاقة.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "إرفاق من",
     "cardDeletePopup-title": "حذف البطاقة ?",
     "cardDetailsActionsPopup-title": "إجراءات على البطاقة",
@@ -82,13 +109,15 @@
     "change-avatar": "تعديل الصورة الشخصية",
     "change-password": "تغيير كلمة المرور",
     "change-permissions": "تعديل الصلاحيات",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "تعديل الصورة الشخصية",
     "changeLanguagePopup-title": "تغيير اللغة",
     "changePasswordPopup-title": "تغيير كلمة المرور",
     "changePermissionsPopup-title": "تعديل الصلاحيات",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "اضغط لإضافة اللوحة للمفضلة.",
     "click-to-unstar": "اضغط لحذف اللوحة من المفضلة.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "غلق",
     "close-board": "غلق اللوحة",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "إنشاء لوحة",
     "createLabelPopup-title": "إنشاء علامة",
     "current": "الحالي",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "صورة شخصية افتراضية",
     "delete": "حذف",
@@ -122,7 +152,10 @@
     "edit": "تعديل",
     "edit-avatar": "تعديل الصورة الشخصية",
     "edit-profile": "تعديل الملف الشخصي",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "تعديل العلامة",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "تعديل الملف الشخصي",
     "email": "البريد الإلكتروني",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "تصفية",
     "filter-cards": "تصفية البطاقات",
     "filter-clear": "مسح التصفية",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "التصفية تشتغل",
     "filter-on-desc": "أنت بصدد تصفية بطاقات هذه اللوحة. اضغط هنا لتعديل التصفية.",
     "filter-to-selection": "تصفية بالتحديد",
     "fullname": "الإسم الكامل",
     "header-logo-title": "الرجوع إلى صفحة اللوحات",
+    "hide-system-messages": "Hide system messages",
     "home": "الرئيسية",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "معلومات",
     "initials": "أولية",
+    "invalid-date": "Invalid date",
     "joined": "انضمّ",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "اختصار لوحة المفاتيح",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "القائمات",
     "log-out": "تسجيل الخروج",
+    "log-in": "Log In",
     "loginPopup-title": "تسجيل الدخول",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "أفضليات الأعضاء",
     "members": "أعضاء",
     "menu": "القائمة",
     "move-selection": "Move selection",
     "moveCardPopup-title": "نقل البطاقة",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "تحديد أكثر من واحدة",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "لوحاتي",
     "name": "اسم",
     "no-archived-cards": "لا يوجد بطاقة في الأرشيف.",
@@ -205,12 +247,15 @@
     "normal": "عادي",
     "normal-desc": "يمكن مشاهدة و تعديل  البطاقات. لا يمكن تغيير إعدادات الضبط.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "اختياري",
     "or": "or",
     "page-maybe-private": "قدتكون هذه الصفحة خاصة . قد تستطيع مشاهدتها ب  <a href='%s'>تسجيل الدخول</a>.",
     "page-not-found": "صفحة غير موجودة",
     "password": "كلمة المرور",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "عرض قائمة الإختصارات ،تلك",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "إظهار-إخفاء الشريط الجانبي للوحة",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "إنشاء حساب",
     "star-board-title": "اضغط لإضافة هذه اللوحة إلى المفضلة . سوف يتم إظهارها على رأس بقية اللوحات.",
     "starred-boards": "اللوحات المفضلة",
@@ -250,14 +296,24 @@
     "team": "فريق",
     "this-board": "هذه اللوحة",
     "this-card": "هذه البطاقة",
+    "time": "Time",
     "title": "عنوان",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "إلغاء تعيين العضو",
     "unsaved-description": "لديك وصف غير محفوظ",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "رفع صورة شخصية",
     "uploaded-avatar": "تم رفع الصورة الشخصية",
     "username": "اسم المستخدم",
     "view-it": "شاهدها",
     "warn-list-archived": "انتبه : هذه البطاقة في أرشيف القائمات",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "ماذا تريد أن تنجز?"
 }
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index 634e5369..5e313ac2 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Asantiñ",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Oberoù",
     "activities": "Oberiantizoù",
     "activity": "Oberiantiz",
@@ -31,6 +51,8 @@
     "all-boards": "All boards",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Archive",
     "archive-all": "Archive All",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
     "attachmentDeletePopup-title": "Delete Attachment?",
     "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "Back",
     "board-change-color": "Kemmañ al liv",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "Boards",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
     "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "Diverkañ ar gartenn ?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Change Avatar",
     "change-password": "Kemmañ ger-tremen",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Change Avatar",
     "changeLanguagePopup-title": "Change Language",
     "changePasswordPopup-title": "Kemmañ ger-tremen",
     "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Create Board",
     "createLabelPopup-title": "Create Label",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Diverkañ",
@@ -122,7 +152,10 @@
     "edit": "Kemmañ",
     "edit-avatar": "Change Avatar",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "Email",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "Filter Cards",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
     "home": "Home",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "joined",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "Log Out",
+    "log-in": "Log In",
     "loginPopup-title": "Log In",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Izili",
     "menu": "Menu",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "optional",
     "or": "or",
     "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
     "page-not-found": "Page not found.",
     "password": "Ger-tremen",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -234,7 +279,7 @@
     "search": "Search",
     "select-color": "Select a color",
     "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emojies": "Autocomplete emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Autocomplete members",
     "shortcut-clear-filters": "Clear all filters",
     "shortcut-close-dialog": "Close Dialog",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Create an Account",
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
     "starred-boards": "Starred Boards",
@@ -250,14 +296,24 @@
     "team": "Team",
     "this-board": "this board",
     "this-card": "this card",
+    "time": "Time",
     "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "What do you want to do?"
-}
\ No newline at end of file
+}
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index fa223d02..83b82d42 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accepta",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Accions",
     "activities": "Activitats",
     "activity": "Activitat",
@@ -31,6 +51,8 @@
     "all-boards": "Tots els taulers",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Desa",
     "archive-all": "Desa Tot",
     "archive-board": "Arxiva tauler",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "L'esborrat d'un arxiu adjunt és permanent. No es pot desfer.",
     "attachmentDeletePopup-title": "Esborrar adjunt?",
     "attachments": "Adjunts",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "L'avatar és massa gran (70Kb max)",
     "back": "Enrere",
     "board-change-color": "Canvia el color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Canvia fons",
     "boardChangeTitlePopup-title": "Canvia el nom tauler",
     "boardChangeVisibilityPopup-title": "Canvia visibilitat",
-    "boardImportBoardPopup-title": "Importa tauler des de Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menú del tauler",
     "boards": "Taulers",
     "bucket-example": "Igual que “Bucket List”,  per exemple",
@@ -66,11 +89,15 @@
     "card-delete-notice": "L'esborrat és permanent. Perdreu totes les accions associades a aquesta fitxa.",
     "card-delete-pop": "Totes les accions s'eliminaran de l'activitat i no podreu tornar a obrir la fitxa. No es pot desfer.",
     "card-delete-suggest-archive": "Podeu arxivar una fitxa per extreure-la del tauler i preservar l'activitat.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edita arxius adjunts",
     "card-edit-labels": "Edita etiquetes",
     "card-edit-members": "Edita membres",
     "card-labels-title": "Canvia les etiquetes de la fitxa",
     "card-members-title": "Afegeix o eliminar membres del tauler des de la fitxa.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Adjunta des de",
     "cardDeletePopup-title": "Esborrar fitxa?",
     "cardDetailsActionsPopup-title": "Accions de fitxes",
@@ -82,13 +109,15 @@
     "change-avatar": "Canvia Avatar",
     "change-password": "Canvia la clau",
     "change-permissions": "Canvia permisos",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Canvia Avatar",
     "changeLanguagePopup-title": "Canvia idioma",
     "changePasswordPopup-title": "Canvia la contrasenya",
     "changePermissionsPopup-title": "Canvia permisos",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Fes clic per destacar aquest tauler.",
     "click-to-unstar": "Fes clic per deixar de destacar aquest tauler.",
-    "clipboard": "Portaretalls o estirar i amollar",
+    "clipboard" : "Portaretalls o estirar i amollar",
     "close": "Tanca",
     "close-board": "Tanca tauler",
     "close-board-pop": "Podràs restaurar el tauler, seleccionant \"Arxivats\" de la finistra principal",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Crea tauler",
     "createLabelPopup-title": "Crea etiqueta",
     "current": "Actual",
+    "date": "Date",
     "decline": "Declina",
     "default-avatar": "Avatar per defecte",
     "delete": "Esborra",
@@ -122,7 +152,10 @@
     "edit": "Edita",
     "edit-avatar": "Canvia Avatar",
     "edit-profile": "Edita el teu Perfil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Canvia etiqueta",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edita teu Perfil",
     "email": "Correu electrònic",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "L'usuari no existeix",
     "error-user-notAllowSelf": "Aquesta acció no està permesa",
     "error-user-notCreated": "L'usuari no s'ha creat",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filtre",
     "filter-cards": "Fitxes de filtre",
     "filter-clear": "Elimina filtre",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filtra per",
     "filter-on-desc": "Estau filtrant fitxes en aquest tauler. Feu clic aquí per editar el filtre.",
     "filter-to-selection": "Filtra selecció",
     "fullname": "Nom complet",
     "header-logo-title": "Torna a la teva pàgina de taulers",
+    "hide-system-messages": "Hide system messages",
     "home": "Inici",
     "import": "importa",
     "import-board": "Importa des de Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "En el teu tauler Trello, ves a 'Menú', 'Més'.' Imprimir i Exportar', 'Exportar JSON', i copia el text resultant.",
-    "import-card": "Importa una fitxa de Trello",
-    "import-card-trello-instruction": "Ves a la fitxa Trello, selecciona 'Compartir i més...' llavors 'Export JSON' i copia el text resultant",
     "import-json-placeholder": "Aferra codi JSON vàlid aquí",
+    "import-map-members": "Map members",
     "import-members-map": "El tauler importat conté membres. Assigna els membres que vulguis importar a usuaris Wekan",
     "import-show-user-mapping": "Revisa l'assignació de membres",
     "import-user-select": "Selecciona l'usuari Wekan que vulguis associar a aquest membre",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informacions",
     "initials": "Inicials",
+    "invalid-date": "Invalid date",
     "joined": "s'ha unit",
     "just-invited": "Has estat convidat a aquest tauler",
     "keyboard-shortcuts": "Dreceres de teclat",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "importa una fitxa de Trello",
     "lists": "Llistes",
     "log-out": "Finalitza la  sessió",
+    "log-in": "Log In",
     "loginPopup-title": "Inicia sessió",
-    "mapMembersAddPopup-title": "Selecciona membre de Wekan",
-    "mapMembersPopup-title": "Assigna membres",
     "memberMenuPopup-title": "Configura membres",
     "members": "Membres",
     "menu": "Menú",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Moure fitxa",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selecció",
     "multi-selection-on": "Multi-Selecció està activada",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Els meus taulers",
     "name": "Nom",
     "no-archived-cards": "No hi ha fitxes arxivades.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.",
     "not-accepted-yet": "La invitació no ha esta acceptada encara",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opcional",
     "or": "o",
     "page-maybe-private": "Aquesta pàgina és privada. Per veure-la <a href='%s'> entra </a>.",
     "page-not-found": "Pàgina no trobada.",
     "password": "Contrasenya",
     "paste-or-dragdrop": "aferra, o estira i amolla la imatge (només imatge)",
+    "participating": "Participating",
     "preview": "Vista prèvia",
     "previewAttachedImagePopup-title": "Vista prèvia",
     "previewClipboardImagePopup-title": "Vista prèvia",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Mostra aquesta lista d'accessos directes",
     "shortcut-toggle-filterbar": "Canvia la barra lateral del tauler",
     "shortcut-toggle-sidebar": "Canvia Sidebar del Tauler",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Crea un compte",
     "star-board-title": "Fes clic per destacar aquest tauler. Es mostrarà a la part superior de la llista de taulers.",
     "starred-boards": "Taulers destacats",
@@ -250,14 +296,24 @@
     "team": "Equip",
     "this-board": "aquest tauler",
     "this-card": "aquesta fitxa",
+    "time": "Time",
     "title": "Títol",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Desassignar membre",
     "unsaved-description": "Tens una descripció sense desar.",
+    "unwatch": "Unwatch",
     "upload": "Puja",
     "upload-avatar": "Actualitza avatar",
     "uploaded-avatar": "Avatar actualitzat",
     "username": "Nom d'Usuari",
     "view-it": "Vist",
     "warn-list-archived": "Avís: aquesta fitxa està en una llista arxivada",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Què vols fer?"
 }
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index 30c84748..10bcc456 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Přijmout",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Akce",
     "activities": "Aktivity",
     "activity": "Aktivita",
@@ -31,6 +51,8 @@
     "all-boards": "Všechna tabla",
     "and-n-other-card": "A __count__ další karta(y)",
     "and-n-other-card_plural": "A __count__ dalších karet",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Archiv",
     "archive-all": "Archivovat vše",
     "archive-board": "Archivovat tablo",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Smazání přílohy je trvalé. Nejde vrátit zpět.",
     "attachmentDeletePopup-title": "Smazat přílohu?",
     "attachments": "Přílohy",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "Avatar je příliš velký (70Kb max)",
     "back": "Zpět",
     "board-change-color": "Změnit barvu",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Změnit pozadí tabla",
     "boardChangeTitlePopup-title": "Přejmenovat tablo",
     "boardChangeVisibilityPopup-title": "Upravit viditelnost",
-    "boardImportBoardPopup-title": "Importovat tablo ze služby Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menu tabla",
     "boards": "Tabla",
     "bucket-example": "Například \"Než mě odvedou\"",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Smazání je trvalé. Přijdete o všechny akce asociované s touto kartou.",
     "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu znovu otevřít. Toto nelze vrátit zpět.",
     "card-delete-suggest-archive": "Kartu můžete archivovat a tím ji odstranit z tabla a přitom zachovat aktivity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Upravit přílohy",
     "card-edit-labels": "Upravit štítky",
     "card-edit-members": "Upravit členy",
     "card-labels-title": "Změnit štítky karty.",
     "card-members-title": "Přidat nebo odstranit členy tohoto tabla z karty.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Přiložit formulář",
     "cardDeletePopup-title": "Smazat kartu?",
     "cardDetailsActionsPopup-title": "Akce karty",
@@ -82,13 +109,15 @@
     "change-avatar": "Změnit avatar",
     "change-password": "Změnit heslo",
     "change-permissions": "Změnit oprávnění",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Změnit avatar",
     "changeLanguagePopup-title": "Změnit jazyk",
     "changePasswordPopup-title": "Změnit heslo",
     "changePermissionsPopup-title": "Změnit oprávnění",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Kliknutím přidat hvězdičku tomuto tablu.",
     "click-to-unstar": "Kliknutím odebrat hvězdičku tomuto tablu.",
-    "clipboard": "Schránka nebo potáhnout a pustit",
+    "clipboard" : "Schránka nebo potáhnout a pustit",
     "close": "Zavřít",
     "close-board": "Zavřít tablo",
     "close-board-pop": "Budete moci obnovit tablo kliknutím na tlačítko \"Archivy\" v hlavním menu.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Vytvořit tablo",
     "createLabelPopup-title": "Vytvořit štítek",
     "current": "Aktuální",
+    "date": "Date",
     "decline": "Zamítnout",
     "default-avatar": "Výchozí avatar",
     "delete": "Smazat",
@@ -122,7 +152,10 @@
     "edit": "Upravit",
     "edit-avatar": "Změnit avatar",
     "edit-profile": "Upravit profil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Změnit štítek",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Upravit profil",
     "email": "Email",
     "email-enrollAccount-subject": "Byl vytvořen účet na __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "Tento uživatel neexistuje",
     "error-user-notAllowSelf": "Tato akce pro sebe sama není povolena",
     "error-user-notCreated": "Tento uživatel není vytvořen",
+    "error-username-taken": "This username is already taken",
     "export-board": "Exportovat tablo",
     "filter": "Filtr",
     "filter-cards": "Filtrovat karty",
     "filter-clear": "Vyčistit filtr",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filtr je zapnut",
     "filter-on-desc": "Filtrujete karty tohoto tabla. Pro úpravu filtru klikni sem.",
     "filter-to-selection": "Filtrovat výběr",
     "fullname": "Celé jméno",
     "header-logo-title": "Jit zpět na stránku s tably.",
+    "hide-system-messages": "Hide system messages",
     "home": "Domů",
     "import": "Import",
     "import-board": "Importovat ze služby Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "Na svém Trello tablu, otevři 'Menu', pak 'More', 'Print and Export', 'Export JSON', a zkopíruj výsledný text",
-    "import-card": "Importovat kartu ze služby Trello",
-    "import-card-trello-instruction": "Přejdi na Trello kartu, vyber 'Share and more...' a pak 'Export JSON' a zkopíruj výsledný text",
     "import-json-placeholder": "Sem vlož validní JSON data",
+    "import-map-members": "Map members",
     "import-members-map": "Toto importované tablo obsahuje několik členů. Namapuj členy z importu na uživatelské účty Wekan.",
     "import-show-user-mapping": "Zkontrolovat namapování členů",
     "import-user-select": "Vyber uživatele Wekan, kterého chceš použít pro tohoto člena",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informace",
     "initials": "Iniciály",
+    "invalid-date": "Invalid date",
     "joined": "spojeno",
     "just-invited": "Právě jsi byl pozván(a) do tohoto tabla",
     "keyboard-shortcuts": "Klávesové zkratky",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Importovat Trello kartu",
     "lists": "Seznamy",
     "log-out": "Odhlásit",
+    "log-in": "Log In",
     "loginPopup-title": "Přihlásit",
-    "mapMembersAddPopup-title": "Vybrat Wekan uživatele",
-    "mapMembersPopup-title": "Mapovat členy",
     "memberMenuPopup-title": "Nastavení uživatele",
     "members": "Členové",
     "menu": "Menu",
     "move-selection": "Přesunout výběr",
     "moveCardPopup-title": "Přesunout kartu",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Přesunout výběr",
     "multi-selection": "Multi-výběr",
     "multi-selection-on": "Multi-výběr je zapnut",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Moje tabla",
     "name": "Jméno",
     "no-archived-cards": "Žádné archivované karty.",
@@ -205,12 +247,15 @@
     "normal": "Normální",
     "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
     "not-accepted-yet": "Pozvánka ještě nebyla přijmuta",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "volitelný",
     "or": "nebo",
     "page-maybe-private": "Tato stránka může být soukromá. Můžete ji zobrazit po <a href='%s'>přihlášení</a>.",
     "page-not-found": "Stránka nenalezena.",
     "password": "Heslo",
     "paste-or-dragdrop": "vložit, nebo přetáhnout a pustit soubor obrázku (pouze obrázek)",
+    "participating": "Participating",
     "preview": "Náhled",
     "previewAttachedImagePopup-title": "Náhled",
     "previewClipboardImagePopup-title": "Náhled",
@@ -234,7 +279,7 @@
     "search": "Hledat",
     "select-color": "Vybrat barvu",
     "shortcut-assign-self": "Přiřadit sebe k aktuální kartě",
-    "shortcut-autocomplete-emojies": "Automatický výběr emotikon",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Automatický výběr uživatel",
     "shortcut-clear-filters": "Vyčistit všechny filtry",
     "shortcut-close-dialog": "Zavřít dialog",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Otevřít tento seznam odkazů",
     "shortcut-toggle-filterbar": "Přepnout lištu filtrování",
     "shortcut-toggle-sidebar": "Přepnout lištu tabla",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Vytvořit účet",
     "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno navrchu seznamu.",
     "starred-boards": "Tabla s hvězdičkou",
@@ -250,14 +296,24 @@
     "team": "Tým",
     "this-board": "toto tablo",
     "this-card": "tuto kartu",
+    "time": "Time",
     "title": "Název",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Vyřadit člena",
     "unsaved-description": "Popis neni uložen.",
+    "unwatch": "Unwatch",
     "upload": "Nahrát",
     "upload-avatar": "Nahrát avatar",
     "uploaded-avatar": "Avatar nahrán",
     "username": "Uživatelské jméno",
     "view-it": "Zobrazit",
     "warn-list-archived": "varování: tato karta je v archivovaném seznamu",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Co chcete dělat?"
-}
\ No newline at end of file
+}
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index 43e12d88..cb5190d4 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -1,5 +1,25 @@
 {
-    "accept": "Accept",
+    "accept": "Akzeptieren",
+    "act-activity-notify": "[Wekan] Aktivitätsbenachrichtigung",
+    "act-addAttachment": "hat __attachment__ an __card__ angehängt",
+    "act-addComment": "hat __card__ kommentiert: __comment__",
+    "act-createBoard": "hat __board__ erstellt",
+    "act-createCard": "hat __card__ zu __list__ hinzugefügt",
+    "act-createList": "hat __list__ zu __board__ hinzugefügt",
+    "act-addBoardMember": "hat __member__ zu __board__ hinzugefügt",
+    "act-archivedBoard": "hat __board__ archiviert",
+    "act-archivedCard": "hat __card__ archiviert",
+    "act-archivedList": "hat __list__ archiviert",
+    "act-importBoard": "hat __board__ importiert",
+    "act-importCard": "hat __card__ importiert",
+    "act-importList": "hat __list__ importiert",
+    "act-joinMember": "hat __member__ zu __card__ hinzugefügt",
+    "act-moveCard": "hat __card__ von __oldList__ nach __list__ verschoben",
+    "act-removeBoardMember": "hat __member__ von __board__ entfernt",
+    "act-restoredCard": "hat __card__ in __board__ wiederhergestellt",
+    "act-unjoinMember": "hat __member__ von __card__ entfernt",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Aktionen",
     "activities": "Aktivitäten",
     "activity": "Aktivität",
@@ -8,45 +28,48 @@
     "activity-attached": "hat %s an %s angehängt",
     "activity-created": "hat %s erstellt",
     "activity-excluded": "hat %s von %s ausgeschlossen",
-    "activity-imported": "imported %s into %s from %s",
-    "activity-imported-board": "imported %s from %s",
-    "activity-joined": "hat %s beigetreten",
+    "activity-imported": "hat %s in %s von %s importiert",
+    "activity-imported-board": "hat %s von %s importiert",
+    "activity-joined": "ist %s beigetreten",
     "activity-moved": "hat %s von %s nach %s verschoben",
-    "activity-on": "on %s",
+    "activity-on": "in %s",
     "activity-removed": "hat %s von %s entfernt",
     "activity-sent": "hat %s an %s gesendet",
-    "activity-unjoined": "unjoined %s",
+    "activity-unjoined": "hat %s verlassen",
     "add": "Hinzufügen",
     "add-attachment": "Anhang hinzufügen",
     "add-board": "Neues Board erstellen",
-    "add-card": "Karte hinzufügen...",
+    "add-card": "Karte hinzufügen",
     "add-cover": "Cover hinzufügen",
     "add-label": "Label hinzufügen",
-    "add-list": "Liste hinzufügen...",
-    "add-members": "Mitglieder hinzufügen...",
+    "add-list": "Liste hinzufügen",
+    "add-members": "Mitglieder hinzufügen",
     "added": "Hinzugefügt",
-    "addMemberPopup-title": "Nutzer",
+    "addMemberPopup-title": "Mitglieder",
     "admin": "Admin",
     "admin-desc": "Kann Karten anschauen und bearbeiten, Mitglieder entfernen und Boardeinstellungen ändern.",
     "all-boards": "Alle Boards",
     "and-n-other-card": "und eine andere Karte",
     "and-n-other-card_plural": "und __count__ andere Karten",
+    "apply": "Übernehmen",
+    "app-is-offline": "Die Anwendung ist derzeit offline. Aktualisieren der Seite führt zu Datenverlust.",
     "archive": "Archiv",
     "archive-all": "Alles archivieren",
     "archive-board": "Board archivieren",
     "archive-card": "Karte archivieren",
     "archive-list": "Diese Liste archivieren",
     "archive-selection": "Auswahl archivieren",
-    "archiveBoardPopup-title": "Archive Board?",
+    "archiveBoardPopup-title": "Board archivieren?",
     "archived-items": "Archivierte Einträge",
     "archives": "Archive",
     "assign-member": "Mitglied zuweisen",
     "attached": "angehängt",
     "attachment": "Anhang",
-    "attachment-delete-pop": "Das Löschen des Anhangs ist endgültig und kann nicht wieder rückgängig gemacht werden.",
+    "attachment-delete-pop": "Das Löschen eines Anhangs kann nicht wieder rückgängig gemacht werden.",
     "attachmentDeletePopup-title": "Anhang löschen?",
     "attachments": "Anhänge",
-    "avatar-too-big": "Das Profilbild ist zu groß (70Kb max)",
+    "auto-watch": "Neue Boards automatisch beobachten",
+    "avatar-too-big": "Das Profilbild ist zu groß (max. 70Kb)",
     "back": "Zurück",
     "board-change-color": "Farbe ändern",
     "board-nb-stars": "%s Sterne",
@@ -56,21 +79,25 @@
     "boardChangeColorPopup-title": "Boardfarbe ändern",
     "boardChangeTitlePopup-title": "Board umbenennen",
     "boardChangeVisibilityPopup-title": "Sichtbarkeit ändern",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Beobachtung ändern",
     "boardMenuPopup-title": "Boardmenü",
     "boards": "Boards",
-    "bucket-example": "Zum Beispiel \"Bucket List\"",
+    "bucket-example": "z.B. \"Löffelliste\"",
     "cancel": "Abbrechen",
     "card-archived": "Diese Karte wurde archiviert.",
     "card-comments-title": "Diese Karte hat %s Kommentare.",
-    "card-delete-notice": "Löschen ist irreversiebel. Alle Aktionen, die mit dieser Karte zu tun haben, werden ebenfalls gelöscht.",
-    "card-delete-pop": "Alle Aktionen werden vom Aktivitätsfeed entfernt und du kannst die Karte nicht mehr öffnen. Es gibt keine Möglichkeit diese Aktion rückgängig zu machen.",
-    "card-delete-suggest-archive": "Du kannst die Karte statdessen archivieren, um sie vom Bord zu entfernen und die Aktivitäten zu erhalten.",
-    "card-edit-attachments": "Anhang ändern",
+    "card-delete-notice": "Löschen ist unwiderruflich. Alle Aktionen die dieser Karte zugeordnet sind werden ebenfalls gelöscht.",
+    "card-delete-pop": "Alle Aktionen werden vom Aktivitätsfeed entfernt und die Karte kann nicht mehr geöffnet werden. Das Löschen kann nicht widerrufen werden!",
+    "card-delete-suggest-archive": "Sie können eine Karte archivieren, um sie von dem Board zu entfernen und die Aktivitäten zu behalten.",
+    "card-due": "Ende",
+    "card-due-on": "Ende am",
+    "card-edit-attachments": "Anhänge ändern",
     "card-edit-labels": "Labels ändern",
-    "card-edit-members": "Nutzer ändern",
-    "card-labels-title": "Label für diese Karte ändern.",
-    "card-members-title": "Füge dem Board Nutzer hinzu oder entferne sie von der Karte.",
+    "card-edit-members": "Mitglieder ändern",
+    "card-labels-title": "Labels für diese Karte ändern.",
+    "card-members-title": "Der Karte Board-Mitglieder hinzufügen oder entfernen.",
+    "card-start": "Start",
+    "card-start-on": "Start am",
     "cardAttachmentsPopup-title": "Anhängen von",
     "cardDeletePopup-title": "Karte löschen?",
     "cardDetailsActionsPopup-title": "Kartenaktionen",
@@ -78,20 +105,22 @@
     "cardMembersPopup-title": "Mitglieder",
     "cardMorePopup-title": "Mehr",
     "cards": "Karten",
-    "change": "Change",
+    "change": "Ändern",
     "change-avatar": "Profilbild ändern",
     "change-password": "Passwort ändern",
-    "change-permissions": "Ändere Berechtigungen",
+    "change-permissions": "Berechtigungen ändern",
+    "change-settings": "Einstellungen ändern",
     "changeAvatarPopup-title": "Profilbild ändern",
-    "changeLanguagePopup-title": "Sprache ändern...",
+    "changeLanguagePopup-title": "Sprache ändern",
     "changePasswordPopup-title": "Passwort ändern",
-    "changePermissionsPopup-title": "Ändere Berechtigungen",
-    "click-to-star": "Klicke, um dem Board einen Stern zu geben.",
-    "click-to-unstar": "Klicke, um den Stern zu entfernen.",
-    "clipboard": "Clipboard or drag & drop",
+    "changePermissionsPopup-title": "Berechtigungen ändern",
+    "changeSettingsPopup-title": "Einstellungen ändern",
+    "click-to-star": "Klicken um dem Board einen Stern zu geben.",
+    "click-to-unstar": "Klicken um den Stern von dem Board zu entfernen.",
+    "clipboard" : "Zwischenablage oder Drag & Drop",
     "close": "Schließen",
     "close-board": "Board schließen",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie den \"Archiv\"-Button in der Kopfzeile der Startseite anklicken.",
     "color-black": "schwarz",
     "color-blue": "blau",
     "color-green": "grün",
@@ -106,10 +135,11 @@
     "comment-placeholder": "Kommentar schreiben",
     "computer": "Computer",
     "create": "Erstellen",
-    "createBoardPopup-title": "Erstelle ein Board",
+    "createBoardPopup-title": "Board erstellen",
     "createLabelPopup-title": "Label erstellen",
     "current": "aktuell",
-    "decline": "Decline",
+    "date": "Datum",
+    "decline": "Ablehnen",
     "default-avatar": "Standard Profilbild",
     "delete": "Löschen",
     "deleteLabelPopup-title": "Label löschen?",
@@ -117,86 +147,98 @@
     "disambiguateMultiLabelPopup-title": "Labels vereinheitlichen",
     "disambiguateMultiMemberPopup-title": "Mitglieder vereinheitlichen",
     "discard": "Verwerfen",
-    "done": "Done",
-    "download": "Download",
+    "done": "Erledigt",
+    "download": "Herunterladen",
     "edit": "Bearbeiten",
     "edit-avatar": "Profilbild ändern",
     "edit-profile": "Profil ändern",
-    "editLabelPopup-title": "Ändere Label",
+    "editCardStartDatePopup-title": "Startdatum ändern",
+    "editCardDueDatePopup-title": "Enddatum ändern",
+    "editLabelPopup-title": "Label ändern",
+    "editNotificationPopup-title": "Benachrichtigung ändern",
     "editProfilePopup-title": "Profil ändern",
-    "email": "Email",
-    "email-enrollAccount-subject": "An account created for you on __siteName__",
-    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
-    "email-fail": "Sending email failed",
-    "email-invalid": "Invalid email",
-    "email-invite": "Invite via Email",
-    "email-invite-subject": "__inviter__ sent you an invitation",
-    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
-    "email-resetPassword-subject": "Reset your password on __siteName__",
-    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
-    "email-sent": "Email sent",
-    "email-verifyEmail-subject": "Verify your email address on __siteName__",
-    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
-    "error-board-doesNotExist": "This board does not exist",
-    "error-board-notAdmin": "You need to be admin of this board to do that",
-    "error-board-notAMember": "You need to be a member of this board to do that",
-    "error-json-malformed": "Your text is not valid JSON",
-    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-    "error-list-doesNotExist": "This list does not exist",
-    "error-user-doesNotExist": "This user does not exist",
-    "error-user-notAllowSelf": "This action on self is not allowed",
-    "error-user-notCreated": "This user is not created",
-    "export-board": "Export board",
+    "email": "E-Mail",
+    "email-enrollAccount-subject": "Ihr Benutzerkonto auf __siteName__ wurde erstellt",
+    "email-enrollAccount-text": "Hallo __user__,\n\num den Dienst nutzen zu können, klicken Sie bitte auf folgenden Link:\n\n__url__\n\nDanke.\n",
+    "email-fail": "Senden der E-Mail fehlgeschlagen",
+    "email-invalid": "Ungültige E-Mail-Adresse",
+    "email-invite": "via E-Mail einladen",
+    "email-invite-subject": "__inviter__ hat Ihnen eine Einladung geschickt",
+    "email-invite-text": "Hallo __user__,\n\n__inviter__ hat Sie zu dem Board \"__board__\" eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n\n__url__\n\nDanke.\n",
+    "email-resetPassword-subject": "Setzten Sie ihr Passwort auf __siteName__ zurück",
+    "email-resetPassword-text": "Hallo __user__,\n\num ihr Passwort zurückzusetzen, klicken Sie bitte auf folgenden Link:\n\n__url__\n\nDanke.\n",
+    "email-sent": "E-Mail gesendet",
+    "email-verifyEmail-subject": "Bestätigen Sie ihre E-Mail-Adresse auf __siteName__",
+    "email-verifyEmail-text": "Hallo __user__,\n\num ihre E-Mail-Adresse zu bestätigen, klicken Sie bitte auf folgenden Link:\n\n__url__\n\nDanke.\n",
+    "error-board-doesNotExist": "Dieses Board existiert nicht",
+    "error-board-notAdmin": "Um das zu tun, müssen Sie der Administrator dieses Boards sein",
+    "error-board-notAMember": "Um das zu tun, müssen Sie ein Mitglied dieses Boards sein",
+    "error-json-malformed": "Ihre Eingabe ist kein gültiges JSON",
+    "error-json-schema": "Ihre JSON-Daten enthalten nicht die gewünschten Informationen im richtigen Format",
+    "error-list-doesNotExist": "Diese Liste existiert nicht",
+    "error-user-doesNotExist": "Dieser Nutzer existiert nicht",
+    "error-user-notAllowSelf": "Diese Aktion auf self ist nicht erlaubt",
+    "error-user-notCreated": "Dieser Nutzer ist angelegt",
+    "error-username-taken": "Dieser Benutzername ist bereits vergeben",
+    "export-board": "Board exportieren",
     "filter": "Filter",
     "filter-cards": "Karten filtern",
     "filter-clear": "Filter entfernen",
+    "filter-no-label": "Kein Label",
+    "filter-no-member": "Kein Mitglied",
     "filter-on": "Filter ist aktiv",
-    "filter-on-desc": "Du filterst die Karten auf diesem Board. Klicke hier, um die Filter zu bearbeiten.",
+    "filter-on-desc": "Sie filtern die Karten in diesem Board. Klicken um die Filter zu bearbeiten.",
     "filter-to-selection": "Ergebnisse auswählen",
-    "fullname": "Voller Name",
+    "fullname": "Vollständiger Name",
     "header-logo-title": "Zurück zur Board Seite.",
+    "hide-system-messages": "Systemmeldungen ausblenden",
     "home": "Home",
     "import": "Importieren",
-    "import-board": "import from Trello",
-    "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
-    "import-json-placeholder": "Paste your valid JSON data here",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
-    "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "import-board": "von Trello importieren",
+    "import-board-title": "Board von Trello importieren",
+    "import-board-trello-instruction": "Gehen Sie in ihrem Trello-Board auf 'Menü', dann 'Mehr', 'Drucken und Exportieren', 'JSON-Export' und kopieren Sie den dort angezeigten Text",
+    "import-json-placeholder": "Fügen Sie die korrekten JSON-Daten hier ein",
+    "import-map-members": "Mitglieder zuordnen",
+    "import-members-map": "Das importierte Board hat einige Mitglieder. Bitte ordnen Sie die Mitglieder, die importiert werden sollen, Wekan-Nutzern zu",
+    "import-show-user-mapping": "Mitgliederzuordnung überprüfen",
+    "import-user-select": "Wählen Sie den Wekan-Nutzer aus, der dieses Mitglied sein soll",
+    "importMapMembersAddPopup-title": "Wekan-Nutzer auswählen",
     "info": "Informationen",
     "initials": "Initialien",
+    "invalid-date": "Ungültiges Datum",
     "joined": "beigetreten",
-    "just-invited": "You are just invited to this board",
+    "just-invited": "Sie wurden soeben zu diesem Board eingeladen",
     "keyboard-shortcuts": "Tastaturkürzel",
-    "label-create": "Neues Label erstellen.",
+    "label-create": "Neues Label erstellen",
     "label-default": "%s Label (Standard)",
-    "label-delete-pop": "Diese Aktion ist irreversiebel. Das Label wird von allen Karten entfernt und seine Historie gelöscht.",
+    "label-delete-pop": "Diese Aktion ist unwiderruflich. Das Label wird von allen Karten entfernt und seine Historie wird gelöscht.",
     "labels": "Labels",
     "language": "Sprache",
-    "last-admin-desc": "Du kannst die Rolle nicht ändern, es muss mindestens einen Admin geben.",
+    "last-admin-desc": "Sie können keine Rollen ändern, weil es mindestens ein Administrator geben muss.",
     "leave-board": "Board verlassen",
     "link-card": "Link zu dieser Karte",
     "list-archive-cards": "Alle Karten in dieser Liste archivieren",
-    "list-archive-cards-pop": "Dies entfernt alle Karten in der Liste vom Board. Um archivierte Karten anzusehen und zurück zum Board zu bringen, klicke \"Menü\" > \"Archivierte Items\".",
+    "list-archive-cards-pop": "Dieses entfernt alle Karten von dieser Liste des Boards. Um archivierte Karten anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archivierte Einträge\".",
     "list-move-cards": "Alle Karten in dieser Liste verschieben",
     "list-select-cards": "Alle Karten in dieser Liste auswählen",
     "listActionPopup-title": "Listenaktionen",
-    "listImportCardPopup-title": "Import a Trello card",
+    "listImportCardPopup-title": "Eine Trello-Karte importieren",
     "lists": "Listen",
     "log-out": "Ausloggen",
+    "log-in": "Einloggen",
     "loginPopup-title": "Einloggen",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Nutzereinstellungen",
-    "members": "Mitglied",
+    "members": "Mitglieder",
     "menu": "Menü",
-    "move-selection": "Move selection",
+    "move-selection": "Auswahl verschieben",
     "moveCardPopup-title": "Karte verschieben",
-    "moveSelectionPopup-title": "Move selection",
+    "moveCardToBottom-title": "Zum Ende verschieben",
+    "moveCardToTop-title": "Zum Anfang verschieben",
+    "moveSelectionPopup-title": "Auswahl verschieben",
     "multi-selection": "Mehrfachauswahl",
-    "multi-selection-on": "Multi-Selection is on",
+    "multi-selection-on": "Mehrfachauswahl ist aktiv",
+    "muted": "Stumm",
+    "muted-info": "Sie werden über keine Änderung in diesem Board benachrichtigt",
     "my-boards": "Meine Boards",
     "name": "Name",
     "no-archived-cards": "Keine archivierten Karten.",
@@ -204,60 +246,74 @@
     "no-results": "Keine Ergebnisse",
     "normal": "Normal",
     "normal-desc": "Kann Karten anschauen und bearbeiten, aber keine Einstellungen ändern.",
-    "not-accepted-yet": "Invitation not accepted yet",
+    "not-accepted-yet": "Die Einladung wurde noch nicht angenommen",
+    "notify-participate": "Benachrichtigungen über alle Karten erhalten, bei denen Sie als Ersteller oder Mitglied teilnehmen",
+    "notify-watch": "Benachrichtigungen über alle Boards, Listen oder Karten erhalten, die Sie beobachten",
     "optional": "optional",
     "or": "oder",
-    "page-maybe-private": "Diese Seite könnte privat sein.  Vielleicht kannst du sie sehen, wenn du dich <a href='%s'>einloggst</a>.",
+    "page-maybe-private": "Diese Seite könnte privat sein. Vielleicht können Sie sie sehen, wenn Sie sich <a href='%s'>einloggen</a>.",
     "page-not-found": "Seite nicht gefunden.",
     "password": "Passwort",
-    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
-    "preview": "Preview",
-    "previewAttachedImagePopup-title": "Preview",
-    "previewClipboardImagePopup-title": "Preview",
+    "paste-or-dragdrop": "Einfügen oder Datei mit Drag & Drop ablegen (nur Bilder)",
+    "participating": "Teilnehmen",
+    "preview": "Vorschau",
+    "previewAttachedImagePopup-title": "Vorschau",
+    "previewClipboardImagePopup-title": "Vorschau",
     "private": "Privat",
     "private-desc": "Dieses Board ist privat. Nur Nutzer, die zu dem Board gehören, können es anschauen und bearbeiten.",
     "profile": "Profil",
     "public": "Öffentlich",
     "public-desc": "Dieses Board ist öffentlich. Es ist für jeden, der den Link kennt, sichtbar und taucht in Suchmaschinen wie Google auf. Nur Nutzer, die zum Board hinzugefügt wurden, können es bearbeiten.",
-    "quick-access-description": "Markiere ein Board mit einem Stern um eine Verknüpfung in diese Leise hinzuzufügen.",
+    "quick-access-description": "Markieren Sie ein Board mit einem Stern um eine Verknüpfung in diese Leise hinzuzufügen.",
     "remove-cover": "Cover entfernen",
     "remove-from-board": "Von Board entfernen",
     "remove-label": "Label entfernen",
     "remove-member": "Nutzer entfernen",
     "remove-member-from-card": "Von Karte entfernen",
-    "remove-member-pop": "Entferne __name__ (__username__) von __boardTitle__? Nutzer wird von allen Karten auf diesem Board entfernt werden. Er wird eine Benachrichtigung erhalten.",
-    "removeMemberPopup-title": "Nutzer entfernen?",
+    "remove-member-pop": "__name__ (__username__) von __boardTitle__ entfernen? Das Mitglied wird von allen Karten auf diesem Board entfernt. Er erhält eine Benachrichtigung.",
+    "removeMemberPopup-title": "Mitglied entfernen?",
     "rename": "Umbenennen",
     "rename-board": "Board umbenennen",
     "restore": "Wiederherstellen",
     "save": "Speichern",
     "search": "Suchen",
-    "select-color": "Wähle eine Farbe aus",
-    "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emoji": "Autovervollständige Emojis",
-    "shortcut-autocomplete-members": "Autovervollständige Nutzer",
+    "select-color": "Farbe auswählen",
+    "shortcut-assign-self": "Fügen Sie sich zur aktuellen Karte hinzu",
+    "shortcut-autocomplete-emoji": "Emojis vervollständigen",
+    "shortcut-autocomplete-members": "Mitglieder vervollständigen",
     "shortcut-clear-filters": "Alle Filter entfernen",
     "shortcut-close-dialog": "Dialog schließen",
     "shortcut-filter-my-cards": "Meine Karten filtern",
     "shortcut-show-shortcuts": "Liste der Tastaturkürzel anzeigen",
-    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-filterbar": "Filter-Seitenleiste ein-/ausblenden",
     "shortcut-toggle-sidebar": "Seitenleiste ein-/ausblenden",
-    "signupPopup-title": "Account erstellen",
-    "star-board-title": "Klicke, um das Board mit einem Stern zu kennzeichnen. Es erscheint dann oben in deiner Boardliste.",
-    "starred-boards": "Gekennzeichnete Boards",
-    "starred-boards-description": "Gekennzeichnete Boards erscheinen oben in deiner Boardliste.",
+    "show-cards-minimum-count": "Zeigt die Kartenanzahl an, wenn die Liste mehr enthält als",
+    "signupPopup-title": "Benutzerkonto erstellen",
+    "star-board-title": "Klicken um das Board mit einem Stern zu kennzeichnen. Es erscheint dann oben in ihrer Boardliste.",
+    "starred-boards": "Markierte Boards",
+    "starred-boards-description": "Markierte Boards erscheinen oben in ihrer Boardliste.",
     "subscribe": "Abonnieren",
     "team": "Team",
     "this-board": "dieses Board",
     "this-card": "diese Karte",
+    "time": "Zeit",
     "title": "Titel",
-    "unassign-member": "Mitglied abziehen",
-    "unsaved-description": "Es gibt eine ungespeicherte Beschreibung.",
+    "tracking": "Folgen",
+    "tracking-info": "Sie werden über alle Änderungen an Karten, die Sie als Ersteller oder Mitglied beteiligt sind, benachrichtigt.",
+    "unassign-member": "Mitglied entfernen",
+    "unsaved-description": "Sie haben eine nicht gespeicherte Änderung.",
+    "unwatch": "Beobachtung entfernen",
     "upload": "Upload",
     "upload-avatar": "Profilbild hochladen",
     "uploaded-avatar": "Profilbild hochgeladen",
-    "username": "Nutzername",
+    "username": "Benutzername",
     "view-it": "Ansehen",
     "warn-list-archived": "Warnung: Diese Karte befindet sich in einer archivierten Liste",
+    "watch": "Beobachten",
+    "watching": "Beobatchen",
+    "watching-info": "Sie werden über alle Änderungen in diesem Board informiert",
+    "welcome-board": "Willkommen-Board",
+    "welcome-list1": "Grundlagen",
+    "welcome-list2": "Fortgeschritten",
     "what-to-do": "Was willst du tun?"
 }
diff --git a/i18n/es-ES.i18n.json b/i18n/es-ES.i18n.json
index 22aeb704..4e3e5623 100644
--- a/i18n/es-ES.i18n.json
+++ b/i18n/es-ES.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Aceptar",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Acciones",
     "activities": "Actividad",
     "activity": "Actividad",
@@ -31,6 +51,8 @@
     "all-boards": "Todos los tableros",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Guardar",
     "archive-all": "Guardar Todo",
     "archive-board": "Archivar tablero",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "El borrado de un archivo adjunto es permanente. No se puede deshacer.",
     "attachmentDeletePopup-title": "¿Borrar adjunto?",
     "attachments": "Adjuntos",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "El avatar es demasiado grande (70Kb max)",
     "back": "Atrás",
     "board-change-color": "Cambiar color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Cambiar fondo",
     "boardChangeTitlePopup-title": "Renombrar tablero",
     "boardChangeVisibilityPopup-title": "Cambiar visibilidad",
-    "boardImportBoardPopup-title": "Importar tablero desde Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menú del tablero",
     "boards": "Tableros",
     "bucket-example": "Al igual que “Bucket List”, por ejemplo",
@@ -66,11 +89,15 @@
     "card-delete-notice": "El borrado es permanente. Perderás todas las acciones asociadas a esta tarjeta.",
     "card-delete-pop": "Todas las acciones se eliminarán de la alimentación de la actividad y no podrán volver a abrir la tarjeta. No se puede deshacer.",
     "card-delete-suggest-archive": "Puedes archivar una tarjeta para quitarla del tablero y conservar la actividad.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Editar archivos adjuntos",
     "card-edit-labels": "Editar etiquetas",
     "card-edit-members": "Editar miembros",
     "card-labels-title": "Cambia las etiquetas de la tarjeta",
     "card-members-title": "Añadir o eliminar miembros del tablero desde la tarjeta.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Adjuntar desde",
     "cardDeletePopup-title": "¿Borrar tarjeta?",
     "cardDetailsActionsPopup-title": "Acciones de tarjeta",
@@ -82,13 +109,15 @@
     "change-avatar": "Cambiar Avatar",
     "change-password": "Cambiar la contraseña",
     "change-permissions": "Cambiar permisos",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Cambiar Avatar",
     "changeLanguagePopup-title": "Cambiar idioma",
     "changePasswordPopup-title": "Cambiar la contraseña",
     "changePermissionsPopup-title": "Cambiar permisos",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Haz clic para destacar este tablero.",
     "click-to-unstar": "Haz clic para dejar de destacar este tablero.",
-    "clipboard": "Portapapeles o drag & drop",
+    "clipboard" : "Portapapeles o drag & drop",
     "close": "Cerrar",
     "close-board": "Cerrar tablero",
     "close-board-pop": "Podrás restaurar el tablero seleccionando el botón “Archivados” desde la cabecera de la página de inicio.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Crear tablero",
     "createLabelPopup-title": "Crear etiqueta",
     "current": "actual",
+    "date": "Date",
     "decline": "Denegar",
     "default-avatar": "Avatar por defecto",
     "delete": "Borrar",
@@ -122,7 +152,10 @@
     "edit": "Editar",
     "edit-avatar": "Cambiar Avatar",
     "edit-profile": "Edita tu Perfil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Cambiar etiqueta",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Editar Perfil",
     "email": "Correo electrónico",
     "email-enrollAccount-subject": "Se ha creado un cuenta para ti en __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "Este usuario no existe",
     "error-user-notAllowSelf": "Esa acción en si misma no está permitida",
     "error-user-notCreated": "Este usuario no se ha creado",
+    "error-username-taken": "This username is already taken",
     "export-board": "Exportar tablero",
     "filter": "Filtrar",
     "filter-cards": "Filtrar Tarjetas",
     "filter-clear": "Eliminar filtro",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filtrar por",
     "filter-on-desc": "Estás filtrando tarjetas en este tablero. Haz clic aquí para editar el filtro.",
     "filter-to-selection": "Filtrar selección",
     "fullname": "Nombre Completo",
     "header-logo-title": "Volver a tu página de tableros",
+    "hide-system-messages": "Hide system messages",
     "home": "Inicio",
     "import": "Importar",
     "import-board": "Importar desde Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "En su tablero Trello, vaya a \"Menú\", luego \"Más\", \"Imprimir y exportar\", \"Exportación JSON ', y copia el texto que se muestre",
-    "import-card": "Importar tarjeta de Trello",
-    "import-card-trello-instruction": "Ve a la tarjeta Trello, selecciona 'Compartir y más...' y marca 'Export JSON' y copia el texto que obtengas",
     "import-json-placeholder": "Pega aquí los datos JSON",
+    "import-map-members": "Map members",
     "import-members-map": "El tablero importado tiene algunos miembros. Por favor, asigna los miembros que deseas importar a Wekan",
     "import-show-user-mapping": "Revisar asignación de miembros",
     "import-user-select": "Escoja el usuario Wekan que desea utilizar como miembro",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informaciones",
     "initials": "Iniciales",
+    "invalid-date": "Invalid date",
     "joined": "se ha unido",
     "just-invited": "Has sido invitado a este tablero",
     "keyboard-shortcuts": "Atajos de teclado",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Importar tarjeta de Trello",
     "lists": "Listas",
     "log-out": "Finalizar la sesión",
+    "log-in": "Log In",
     "loginPopup-title": "Iniciar sesión",
-    "mapMembersAddPopup-title": "Selecciona un miembro de Wekan",
-    "mapMembersPopup-title": "Asignar miembros",
     "memberMenuPopup-title": "Configurar miembros",
     "members": "Miembros",
     "menu": "Menú",
     "move-selection": "Mover selección",
     "moveCardPopup-title": "Mover Tarjeta",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Mover selección",
     "multi-selection": "Multi-Selección",
     "multi-selection-on": "Multi-selección activada",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Mis Tableros",
     "name": "Nombre",
     "no-archived-cards": "No hay tarjetas archivadas.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Puedes ver y editar tarjetas. No puedes cambiar la configuración.",
     "not-accepted-yet": "Invitación no aceptada aún",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opcional",
     "or": "o",
     "page-maybe-private": "Esta página es privada. Para verla tienes que <a href='%s'>entrar</a>.",
     "page-not-found": "Página no encontrada.",
     "password": "Contraseña",
     "paste-or-dragdrop": "para pegar, o hacer drag & drop de un archivo (solo imágenes)",
+    "participating": "Participating",
     "preview": "Vista previa",
     "previewAttachedImagePopup-title": "Vista previa",
     "previewClipboardImagePopup-title": "Vista previa",
@@ -234,7 +279,7 @@
     "search": "Buscar",
     "select-color": "Selecciona un color",
     "shortcut-assign-self": "Asignarme la tarjeta actual",
-    "shortcut-autocomplete-emojies": "Autocompletar emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Autocompletar miembros",
     "shortcut-clear-filters": "Eliminar todos los filters",
     "shortcut-close-dialog": "Cierra el Dialogo",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Mostrar atajos de teclado",
     "shortcut-toggle-filterbar": "Mostrar/Ocultar la barra lateral de filtrado",
     "shortcut-toggle-sidebar": "Menú lateral del Tablero",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Crear una cuenta",
     "star-board-title": "Haz clic para destacar este tablero. Se mostrará en la parte superior de tu lista de tableros.",
     "starred-boards": "Tableros Destacados",
@@ -250,14 +296,24 @@
     "team": "Equipo",
     "this-board": "este tablero",
     "this-card": "esta tarjeta",
+    "time": "Time",
     "title": "Título",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Desasignar miembro",
     "unsaved-description": "Tienes una descripción sin guardar.",
+    "unwatch": "Unwatch",
     "upload": "Subir",
     "upload-avatar": "Subir avatar",
     "uploaded-avatar": "Avatar actualizado",
     "username": "Nombre de usuario",
     "view-it": "Visto",
     "warn-list-archived": "Aviso: esta tarjeta está en una lista archivada",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "¿Qué quieres hacer?"
-}
\ No newline at end of file
+}
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index b4af8f5a..a88ac829 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Acciones",
     "activities": "Activities",
     "activity": "Actividad",
@@ -31,6 +51,8 @@
     "all-boards": "Tableros",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Guardar",
     "archive-all": "Guardar Todo",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "El borrado de un archivo adjunto es permanente. No se puede deshacer.",
     "attachmentDeletePopup-title": "¿Borrar adjunto?",
     "attachments": "Adjuntos",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "Atrás",
     "board-change-color": "Cambiar color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "Renombrar tablero",
     "boardChangeVisibilityPopup-title": "Cambiar visibilidad",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "Tableros",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "El borrado es permanente. Perderás todas las acciones asociadas a esta ficha.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Cambia las etiquetas de la ficha",
     "card-members-title": "Añadir o eliminar miembros del tablero desde la ficha.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "¿Borrar ficha?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Cambiar Avatar",
     "change-password": "Cambiar la clave",
     "change-permissions": "Cambiar permisos",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Cambiar Avatar",
     "changeLanguagePopup-title": "Cambiar idioma",
     "changePasswordPopup-title": "Cambiar la clave",
     "changePermissionsPopup-title": "Cambiar permisos",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Haz clic para destacar este tablero. ",
     "click-to-unstar": "Haz clic para dejar de destacar este tablero. ",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "Cerrar",
     "close-board": "Cerrar el tablero",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Crear tablero",
     "createLabelPopup-title": "Crear etiqueta",
     "current": "actual",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Avatar por defecto",
     "delete": "Borrar",
@@ -122,7 +152,10 @@
     "edit": "Editar",
     "edit-avatar": "Cambiar Avatar",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Cambiar etiqueta",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "Correo electrónico",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "Fichas de filtro",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "Estás filtrando fichas en este tablero. Haz clic aquí para editar el filtro.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Nombre Completo",
     "header-logo-title": "Volver a tu página de tableros",
+    "hide-system-messages": "Hide system messages",
     "home": "Inicio",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informaciones",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "se ha unido",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "Finalizar la sesion",
+    "log-in": "Log In",
     "loginPopup-title": "Iniciar sesion",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Miembros",
     "menu": "Menu",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Mis tableros",
     "name": "Nombre",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Puedes ver y editar fichas. No puedes cambiar la configuración.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opcional",
     "or": "or",
     "page-maybe-private": "Esta página puede ser privada. Puedes verla por <a href='%s'>logging in</a>.",
     "page-not-found": "Página no encontrada.",
     "password": "Clave",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Crear una Cuenta",
     "star-board-title": "Haz clic para destacar este tablero. Se mostrará en la parte superior de tu lista de tableros.",
     "starred-boards": "Tableros Destacados",
@@ -250,14 +296,24 @@
     "team": "Equipo",
     "this-board": "este tablero",
     "this-card": "esta ficha",
+    "time": "Time",
     "title": "Título",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Nombre de Usuario",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "What do you want to do?"
 }
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index c9d0b95b..bef0935f 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "تایید",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "اعمال",
     "activities": "فعالیت ها",
     "activity": "فعالیت",
@@ -31,6 +51,8 @@
     "all-boards": "تمام بردها",
     "and-n-other-card": "و __count__ کارت دیگر",
     "and-n-other-card_plural": "و __count__ کارت دیگر",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "آرشیو",
     "archive-all": "تمامی آرشیوها",
     "archive-board": "بایگانی برد",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "حذف پیوست دایمی خواهد بود، بدون بازگشت",
     "attachmentDeletePopup-title": "آیا می خواهید ضمیمه را حذف کنید؟",
     "attachments": "ضمائم",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "حجم تصویر انتخاب شده بیشتر از حد مجاز است .(حد مجاز 70Kb)",
     "back": "بازگشت",
     "board-change-color": "تغییر رنگ",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "تغییر پس زمینه برد",
     "boardChangeTitlePopup-title": "تغییر نام برد",
     "boardChangeVisibilityPopup-title": "تغغیر وضعیت نمایش",
-    "boardImportBoardPopup-title": "وارد کردن تخته ها از Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "منوی برد",
     "boards": "بردها",
     "bucket-example": "مانند \"لیست سبدها\" برای مثال",
@@ -66,11 +89,15 @@
     "card-delete-notice": "پاک کردن بطور کامل. شما تمامی اقدامات مربوطه را از دست خواهید داد.",
     "card-delete-pop": "همه اقدامات ازاین پردازه (خوراک) حذف خواهد شد و امکان بازگشا کردن کارت وجود نخواهد داشت. هیچ امکان بازگشتی!",
     "card-delete-suggest-archive": "شما می توانید یک کارت را بایگانی کرده با  حفظ فعالیت های آن.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "ویرایش ضمائم",
     "card-edit-labels": "ویرایش برچسب",
     "card-edit-members": "ویرایش اعضا",
     "card-labels-title": "تغییر برچسب کارت",
     "card-members-title": "افزودن یا حذف اعضا از کارت.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "ضمیمه از",
     "cardDeletePopup-title": "آیا می خواهید کارت را حذف کنید؟",
     "cardDetailsActionsPopup-title": "اعمال کارت",
@@ -82,13 +109,15 @@
     "change-avatar": "تغییر آواتار",
     "change-password": "تغییر کلمه عبور",
     "change-permissions": "تغییر دسترسی ها",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "تغییر آواتار",
     "changeLanguagePopup-title": "تغییر زبان",
     "changePasswordPopup-title": "تغییر کلمه عبور",
     "changePermissionsPopup-title": "تغییر دسترسی ها",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "جهت افزودن ستاره کلیک کنید .",
     "click-to-unstar": "جهت کاهش ستاره کلیک کنید.",
-    "clipboard": "ذخیره در حافظه ویا بکش-رهاکن",
+    "clipboard" : "ذخیره در حافظه ویا بکش-رهاکن",
     "close": "بستن",
     "close-board": "بستن برد",
     "close-board-pop": "شما می توانید با کلیک بر دکمه \"بایگانی\" از قسمت بالای خانه، تخته را بازگذاری نمایید.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "ایجاد برد",
     "createLabelPopup-title": "ایجاد برچسب",
     "current": "جاری",
+    "date": "Date",
     "decline": "رد",
     "default-avatar": "آواتار پیش فرض",
     "delete": "حذف",
@@ -122,7 +152,10 @@
     "edit": "ویرایش",
     "edit-avatar": "تغییر آواتار",
     "edit-profile": "ویرایش پروفایل",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "تغغیر برچسب",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "ویرایش پروفایل",
     "email": "ایمیل",
     "email-enrollAccount-subject": "یک حساب کاربری برای شما در __siteName__ ایجاد شد",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "این کاربر وجود ندارد",
     "error-user-notAllowSelf": "این اقدامبروی خود، مجاز نمی باشد",
     "error-user-notCreated": "این کاربر ایجاد نشده است",
+    "error-username-taken": "This username is already taken",
     "export-board": "انتقال به بیرون تخته",
     "filter": "فیلتر",
     "filter-cards": "صافی کارتها",
     "filter-clear": "حذف فیلتر",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "صافی روشن است",
     "filter-on-desc": "شما صافی برای کارتهای تخته را روشن کرده اید. جهت ویرایش کلیک نمایید.",
     "filter-to-selection": "صافی برای موارد انتخابی",
     "fullname": "نام و نام خانوادگی",
     "header-logo-title": "بازگشت به صفحه تخته.",
+    "hide-system-messages": "Hide system messages",
     "home": "خانه",
     "import": "وارد کردن",
     "import-board": "وارد کردن از ترلو",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "در Trello-ی خود  به 'Menu'، 'More'، 'Print'، 'Export to JSON رفته و متن نهایی را دراینجا وارد نمایید.",
-    "import-card": "وارد کردن کارت Trello",
-    "import-card-trello-instruction": "به کارت Trello رفته و با انتخاب Share and more...' و 'Export JSON' متن نهایی را دراینجا وارد کنید",
     "import-json-placeholder": "اطلاعات Json معتبر خود را اینجا وارد کنید.",
+    "import-map-members": "Map members",
     "import-members-map": "تخته خود وارد شده دارای برخی از اعضا می باشد. لطفا کاربرانی که باید وارد نرم افزار بشوند را مشخص کنید.",
     "import-show-user-mapping": "بررسی نقشه کاربران",
     "import-user-select": "کاربری از نرم افزار را که می خواهید بعنوان این عضو جایگزین شود را انتخاب کنید.",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "اطلاعات",
     "initials": "تخصیصات اولیه",
+    "invalid-date": "Invalid date",
     "joined": "متصل",
     "just-invited": "هم اکنون، شما به این تخته دعوت شده اید.",
     "keyboard-shortcuts": "میانبر کلیدها",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "وارد کردن کارت Trello",
     "lists": "لیست ها",
     "log-out": "خروج",
+    "log-in": "Log In",
     "loginPopup-title": "ورود",
-    "mapMembersAddPopup-title": "انتخاب عضو Wekan",
-    "mapMembersPopup-title": "نقشه اعضا",
     "memberMenuPopup-title": "تنظیمات اعضا",
     "members": "اعضا",
     "menu": "منو",
     "move-selection": "حرکت مورد انتخاب شده",
     "moveCardPopup-title": "حرکت کارت",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "حرکت مورد انتخاب شده",
     "multi-selection": "چند انتخابی",
     "multi-selection-on": "چند انتخابی روشن است",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "بردهای من",
     "name": "نام",
     "no-archived-cards": "کارتی در بایگانی نیست",
@@ -205,12 +247,15 @@
     "normal": "عادی",
     "normal-desc": "امکان نمایش و تنظیم کارت بدون امکان تغییر تنظیمات",
     "not-accepted-yet": "دعوت هنوز پذیرفته نشده است",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "انتخابی",
     "or": "یا",
     "page-maybe-private": "این صفحه ممکن است خصوصی باشد.شما با<a href='%s'>ورود</a> می توانید آنرا ملاحظه نمایید.",
     "page-not-found": "صفحه پیدا نشد.",
     "password": "کلمه عبور",
     "paste-or-dragdrop": "جهت چسباندن، یا کشیدن-رهاسازی فایل تصویر به آن (تصویر)",
+    "participating": "Participating",
     "preview": "نمایش",
     "previewAttachedImagePopup-title": "نمایش",
     "previewClipboardImagePopup-title": "نمایش",
@@ -234,7 +279,7 @@
     "search": "جستجو",
     "select-color": "انتخاب رنگ",
     "shortcut-assign-self": "اختصاص خود به کارت فعلی",
-    "shortcut-autocomplete-emojies": "تکمیل خودکار شکلک",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "تکمیل خودکار کاربرها",
     "shortcut-clear-filters": "حذف تمامی فیلترها",
     "shortcut-close-dialog": "بستن دیالوگ",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "بالا آوردن میانبر این لیست",
     "shortcut-toggle-filterbar": "ضامن نوار صافی",
     "shortcut-toggle-sidebar": "ضامن نوار تخته",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "ایجاد یک اکانت",
     "star-board-title": "جهت ستاره دار کردن تخته کلیک نمایی.این در بالای لیست تخته های شما نمایش داده خواهد شد.",
     "starred-boards": "تخته های ستاره دار",
@@ -250,14 +296,24 @@
     "team": "تیم",
     "this-board": "این برد",
     "this-card": "این کارت",
+    "time": "Time",
     "title": "عنوان",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "عدم انتصاب کاربر ",
     "unsaved-description": "شما توضیحات ذخیره نشده دارید.",
+    "unwatch": "Unwatch",
     "upload": "ارسال",
     "upload-avatar": "ارسال یک آواتار",
     "uploaded-avatar": "آواتار ارسال شد",
     "username": "نام کاربری",
     "view-it": "مشاهده",
     "warn-list-archived": "هشدار: این کارت در یک لیست بایگانی شده است",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "چه کاری می خواهید انجام دهید؟"
-}
\ No newline at end of file
+}
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index adc4baa4..e743280a 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accepter",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activités",
     "activity": "Activité",
@@ -31,6 +51,8 @@
     "all-boards": "Tous les tableaux",
     "and-n-other-card": "Et __count__ autre carte",
     "and-n-other-card_plural": "Et __count__ autres cartes",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Archiver",
     "archive-all": "Tout archiver",
     "archive-board": "Archiver le tableau",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "La suppression d'une pièce jointe est définitive. Elle ne peut être annulée.",
     "attachmentDeletePopup-title": "Supprimer la pièce jointe ?",
     "attachments": "Pièces jointes",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "La taille du fichier de l’avatar est trop importante (70 Ko au maximum)",
     "back": "Retour",
     "board-change-color": "Changer la couleur",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change la fond du tableau",
     "boardChangeTitlePopup-title": "Renommer le tableau",
     "boardChangeVisibilityPopup-title": "Changer la visibilité",
-    "boardImportBoardPopup-title": "Importer le tableau depuis Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menu du tableau",
     "boards": "Tableaux",
     "bucket-example": "Comme « todo list » par exemple",
@@ -66,11 +89,15 @@
     "card-delete-notice": "La suppression est permanente. Vous perdrez toutes les actions associées à cette carte.",
     "card-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser cette carte. Cette action est irréversible.",
     "card-delete-suggest-archive": "Vous pouvez archiver une carte pour la supprimer en préservant le suivi des activités.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Editer les pièces jointes",
     "card-edit-labels": "Editer les étiquettes",
     "card-edit-members": "Modifier les membres",
     "card-labels-title": "Modifier les étiquettes de la carte.",
     "card-members-title": "Ajouter ou supprimer des membres à la carte.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Joindre depuis",
     "cardDeletePopup-title": "Supprimer la carte ?",
     "cardDetailsActionsPopup-title": "Actions sur la carte",
@@ -82,13 +109,15 @@
     "change-avatar": "Changer l'avatar",
     "change-password": "Changer le mot de passe",
     "change-permissions": "Changer les permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Changer l'avatar",
     "changeLanguagePopup-title": "Changer la langue",
     "changePasswordPopup-title": "Changer le mot de passe",
     "changePermissionsPopup-title": "Changer les permissions",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Cliquez pour ajouter ce tableau aux favoris.",
     "click-to-unstar": "Cliquez pour retirer ce tableau des favoris.",
-    "clipboard": "Presse-papier ou glisser-déposer",
+    "clipboard" : "Presse-papier ou glisser-déposer",
     "close": "Fermer",
     "close-board": "Fermer le tableau",
     "close-board-pop": "Vous pouvez restaurer le tableau en cliquant sur le bouton « Archives » depuis le menu en entête.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Créer un tableau",
     "createLabelPopup-title": "Créer un étiquette",
     "current": "courant",
+    "date": "Date",
     "decline": "Refuser",
     "default-avatar": "Avatar par défaut",
     "delete": "Supprimer",
@@ -122,7 +152,10 @@
     "edit": "Éditer",
     "edit-avatar": "Changer l'avatar",
     "edit-profile": "Éditer le profil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Changer l'étiquette",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Éditer le profil",
     "email": "Email",
     "email-enrollAccount-subject": "Un compte a été créé pour vous sur __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "Cet utilisateur n’existe pas",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "Cet utilisateur n’a pas encore été créé. ",
+    "error-username-taken": "This username is already taken",
     "export-board": "Exporter le tableau",
     "filter": "Filtrer",
     "filter-cards": "Filtrer les cartes",
     "filter-clear": "Retirer les filtres",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Le filtre est actif",
     "filter-on-desc": "Vous êtes en train de filtrer les cartes sur ce tableau. Cliquez ici pour changer les filtres.",
     "filter-to-selection": "Filtre vers la sélection",
     "fullname": "Nom complet",
     "header-logo-title": "Retourner à la page des tableaux",
+    "hide-system-messages": "Hide system messages",
     "home": "Accueil",
     "import": "Importer",
     "import-board": "Importer depuis Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Importer une carte Trello",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Collez ici les données JSON valides. ",
+    "import-map-members": "Map members",
     "import-members-map": "Le tableau que vous venez d’importer contient des participants. Veuillez associer les participants que vous souhaitez importer à des utilisateurs de Wekan. ",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Initiales",
+    "invalid-date": "Invalid date",
     "joined": "a joint",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Raccourcis clavier",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Importer une carte Trello",
     "lists": "Listes",
     "log-out": "Déconnexion",
+    "log-in": "Log In",
     "loginPopup-title": "Connexion",
-    "mapMembersAddPopup-title": "Sélectioner le membre Wekan",
-    "mapMembersPopup-title": "Associer les membres",
     "memberMenuPopup-title": "Préférence de membre",
     "members": "Membres",
     "menu": "Menu",
     "move-selection": "Déplacer la sélection",
     "moveCardPopup-title": "Déplacer la carte",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Déplacer la sélection",
     "multi-selection": "Sélection multiple",
     "multi-selection-on": "Multi-Selection active",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Mes tableaux",
     "name": "Nom",
     "no-archived-cards": "Pas de carte archivée.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Peut voir et éditer les cartes. Ne peut pas changer les paramètres.",
     "not-accepted-yet": "L’invitation n’a pas encore été acceptée",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "optionnel",
     "or": "ou",
     "page-maybe-private": "Cette page est peut-être privée. Vous pourrez peut-être la voir en vous <a href='%s'>connectant</a>.",
     "page-not-found": "Page non trouvée",
     "password": "Mot de passe",
     "paste-or-dragdrop": "pour coller, ou glissez-déposez une image ici (seulement une image)",
+    "participating": "Participating",
     "preview": "Prévisualiser",
     "previewAttachedImagePopup-title": "Prévisualiser",
     "previewClipboardImagePopup-title": "Prévisualiser",
@@ -234,7 +279,7 @@
     "search": "Chercher",
     "select-color": "Choisissez une couleur",
     "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emojies": "Auto-complétion des emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Auto-complétion des membres",
     "shortcut-clear-filters": "Retirer tous les filtres",
     "shortcut-close-dialog": "Fermer le dialogue",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Afficher cette liste de raccourcis",
     "shortcut-toggle-filterbar": "Afficher/Cacher la barre latérale des filtres",
     "shortcut-toggle-sidebar": "Afficher/Cacher la barre latérale du tableau",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Créer un compe",
     "star-board-title": "Cliquer pour ajouter ce tableau aux favoris. Il sera affiché en haut de votre liste de tableaux.",
     "starred-boards": "Tableaux favoris",
@@ -250,14 +296,24 @@
     "team": "Équipe",
     "this-board": "ce tableau",
     "this-card": "cette carte",
+    "time": "Time",
     "title": "Titre",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Retirer le membre",
     "unsaved-description": "Vous avez une description non sauvegardée",
+    "unwatch": "Unwatch",
     "upload": "Télécharger",
     "upload-avatar": "Télécharger un avatar",
     "uploaded-avatar": "Avatar téléchargé",
     "username": "Nom d'utilisateur",
     "view-it": "Le voir",
     "warn-list-archived": "Attention : cette carte est dans une liste archivée",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Que voulez-vous faire ?"
-}
\ No newline at end of file
+}
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index f08f430b..272c5486 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -1,10 +1,30 @@
 {
     "accept": "אישור",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "הלוח __board__ נוצר",
+    "act-createCard": "הכרטיס __card__ התווסף לרשימה __list__",
+    "act-createList": "הרשימה __list__ התווספה ללוח __board__",
+    "act-addBoardMember": "המשתמש __member__ שויך ללוח __board__",
+    "act-archivedBoard": "הלוח  __board__ אורכב",
+    "act-archivedCard": "הכרטיס __card__ אורכב",
+    "act-archivedList": "הרשימה __card__ אורכבה",
+    "act-importBoard": "הלוח __board__ יובא",
+    "act-importCard": "הכרטיס __card__ יובא",
+    "act-importList": "הרשימה  __list__ יובאה",
+    "act-joinMember": "המשתמש  __member__ שוייך לכרטיס __card__",
+    "act-moveCard": "הכרטיס __card__ הועבר מהרשימה __oldList__ לרשימה __list__",
+    "act-removeBoardMember": "המשתמש __member__ הוסר מהלוח __board__",
+    "act-restoredCard": "הכרטיס __card__ שוחזר ללוח __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "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": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "אחסן בארכיון",
     "archive-all": "אחסן הכל בארכיון",
     "archive-board": "אחסן לוח בארכיון",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "מחיקת קובץ מצורף הינה סופית. אין דרך חזרה.",
     "attachmentDeletePopup-title": "למחוק קובץ מצורף?",
     "attachments": "קבצים מצורפים",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "האווטאר גדול מידי (מקס 70Kb)",
     "back": "חזור",
     "board-change-color": "שנה צבע",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "שנה רקע ללוח",
     "boardChangeTitlePopup-title": "שנה שם ללוח",
     "boardChangeVisibilityPopup-title": "שנה תצוגה",
-    "boardImportBoardPopup-title": "ייבא לוח מטרלו",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "תפריט לוח",
     "boards": "לוחות",
     "bucket-example": "כמו “Bucket List” לדוגמא",
@@ -66,11 +89,15 @@
     "card-delete-notice": "מחיקה היא סופית. תאבדו את כל הפעולות המשויכות לכרטיס זה.",
     "card-delete-pop": "כל הפעולות יוסרו מלוח הפעילות ולא תוכלו לפתוח מחדש את הכרטיס. אין דרך חזרה.",
     "card-delete-suggest-archive": "באפשרותך לאחסן בארכיון כרטיס כדי להסירו מהלוח ולשמר את הפעילות.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "ערוך קבצים מצורפים",
     "card-edit-labels": "ערוך תוויות ",
     "card-edit-members": "ערוך חברים",
     "card-labels-title": "שנה תוויות לכרטיס.",
     "card-members-title": "הוסף או הסר את חברי הלוח מהכרטיס",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "צרף מ",
     "cardDeletePopup-title": "למחוק כרטיס?",
     "cardDetailsActionsPopup-title": "פעולות על הכרטיס",
@@ -82,13 +109,15 @@
     "change-avatar": "שנה אווטאר",
     "change-password": "שנה סיסמא",
     "change-permissions": "שנה הרשאות",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "שנה אווטאר",
     "changeLanguagePopup-title": "שנה שפה",
     "changePasswordPopup-title": "שנה סיסמא",
     "changePermissionsPopup-title": "שנה הרשאות",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "לחץ להוספת הלוח למועדפים",
     "click-to-unstar": "לחץ להסרת הלוח מהמועדפים.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "סגור",
     "close-board": "סגור לוח",
     "close-board-pop": "תוכלו לשחזר את הלוח בלחיצה על כפתור \"ארכיונים\" מהכותרת העליונה.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "צור לוח",
     "createLabelPopup-title": "צור תווית",
     "current": "נוכחי",
+    "date": "Date",
     "decline": "סרב",
     "default-avatar": "אווטאר דיפולטי",
     "delete": "מחק",
@@ -122,7 +152,10 @@
     "edit": "ערוך",
     "edit-avatar": "שנה אווטאר",
     "edit-profile": "ערוך פרופיל",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "שנה תווית",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "ערוך פרופיל",
     "email": "אמייל",
     "email-enrollAccount-subject": "חשבון נוצר עבורך ב __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "משתמש זה לא קיים",
     "error-user-notAllowSelf": "פעולה זו איננה מותרת",
     "error-user-notCreated": "משתמש זה לא נוצר",
+    "error-username-taken": "This username is already taken",
     "export-board": "ייצא לוח",
     "filter": "מסנן",
     "filter-cards": "סנן כרטיסים",
     "filter-clear": "נקה מסנן",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "מסנן פועל",
     "filter-on-desc": "מסנן כרטיסים בלוח זה פועל. יש ללחוץ כאן לעריכת המסנן.",
     "filter-to-selection": "סנן את הבחירה",
     "fullname": "שם מלא",
     "header-logo-title": "חזור לדף הלוחות שלך.",
+    "hide-system-messages": "Hide system messages",
     "home": "בית",
     "import": "ייבא",
     "import-board": "ייבא מטרלו",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "בלוח הטרלו שלך, עבור ל 'Menu', ואז ל 'More', 'Print and Export', 'Export JSON' והעתק את הטקסט שנוצר",
-    "import-card": "ייבא כרטיס מטרלו",
-    "import-card-trello-instruction": "עבור לכרטיס טרלו, בחר \"Share and more...\" ואז \"Export JSON\" והעתק את הטקסט שנוצר",
     "import-json-placeholder": "הדבק נתוני JSON תקינים כאן",
+    "import-map-members": "Map members",
     "import-members-map": "הלוחות המיובאים שלך מכילים חברים. בבקשה מפה את החברים שתרצה לייבא כמשתמשים",
     "import-show-user-mapping": "צפה במיפוי חברים",
     "import-user-select": "בחר במשתמש עבור חבר זה",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "אינפורמציה",
     "initials": "ראשי תיבות",
+    "invalid-date": "Invalid date",
     "joined": "הצטרף",
     "just-invited": "הוזמנת ללוח זה",
     "keyboard-shortcuts": "קיצורי מקלדת",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "ייבא כרטיס מטרלו",
     "lists": "רשימות",
     "log-out": "התנתק",
+    "log-in": "Log In",
     "loginPopup-title": "התחבר",
-    "mapMembersAddPopup-title": "בחר חבר",
-    "mapMembersPopup-title": "מפה חברים",
     "memberMenuPopup-title": "הגדרות חבר",
     "members": "חברים",
     "menu": "תפריט",
     "move-selection": "הזז בחירה",
     "moveCardPopup-title": "הזז כרטיס",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "הזז בחירה",
     "multi-selection": "בחירה מרובה",
     "multi-selection-on": "בחירה מרובה פועלת",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "הלוחות שלי",
     "name": "שם",
     "no-archived-cards": "אין כרטיסים מאוחסנים בארכיון.",
@@ -205,12 +247,15 @@
     "normal": "נורמלי",
     "normal-desc": "יכול לצפות ולערוך כרטיסים. לא יכול לשנות הגדרות.",
     "not-accepted-yet": "הזמנה לא התקבלה עדיין",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "אופציונלי",
     "or": "או",
     "page-maybe-private": "יתכן שדף זה פרטי. תוכלו לצפות על ידי <a href='%s'>התחברות למערכת</a>",
     "page-not-found": "דף לא נמצא.",
     "password": "סיסמא",
     "paste-or-dragdrop": "בכדי להדביק או drag & drop קובץ תמונה (תמונה בלבד)",
+    "participating": "Participating",
     "preview": "תצוגה מקדימה",
     "previewAttachedImagePopup-title": "תצוגה מקדימה",
     "previewClipboardImagePopup-title": "תצוגה מקדימה",
@@ -234,7 +279,7 @@
     "search": "חפש",
     "select-color": "בחר צבע",
     "shortcut-assign-self": "הקצה את עצמך לכרטיס הנוכחי",
-    "shortcut-autocomplete-emojies": "השלמה אוטומטית של אימוג'יז",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "השלמה אוטומטית של חברים",
     "shortcut-clear-filters": "נקה את כל המסננים",
     "shortcut-close-dialog": "סגור חלון",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "הבא רשימת קיצורי דרך זו",
     "shortcut-toggle-filterbar": "החלף מצבי מסנן",
     "shortcut-toggle-sidebar": "החלף מצבי מסנן",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "צור חשבון",
     "star-board-title": "בלחיצה על הכווכב של הלוח יתווסף הלוח לראש רשימת הלוחות שלך.",
     "starred-boards": "לוחות שסומנו בכוכב",
@@ -250,14 +296,24 @@
     "team": "צוות",
     "this-board": "לוח זה",
     "this-card": "כרטיס זה",
+    "time": "Time",
     "title": "כותרת",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "בטל הקצאת חבר",
     "unsaved-description": "יש לך תיאור לא שמור.",
+    "unwatch": "Unwatch",
     "upload": "העלה/טען",
     "upload-avatar": "העלה/ טען אווטאר",
     "uploaded-avatar": "אווטאר הועלה/נטען",
     "username": "שם משתמש",
     "view-it": "צפה",
     "warn-list-archived": "אזהרה: הכרטיס נמצא ברשימה שהועברה לארכיון",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "מה תרצה לעשות?"
-}
\ No newline at end of file
+}
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index 6cde68c6..bd21c65d 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "操作",
     "activities": "Activities",
     "activity": "アクティビティ",
@@ -31,6 +51,8 @@
     "all-boards": "All boards",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "アーカイブ",
     "archive-all": "すべてをアーカイブ",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "添付ファイルの削除をすると取り消しできません。",
     "attachmentDeletePopup-title": "添付ファイルを削除しますか？",
     "attachments": "添付ファイル",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "戻る",
     "board-change-color": "Change color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "ボード名の変更",
     "boardChangeVisibilityPopup-title": "公開範囲の変更",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "ボード",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "削除は取り消しできません。このカードに関係するすべてのアクションがなくなります。",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "カードのラベルを変更する",
     "card-members-title": "カードからボードメンバーを追加・削除する",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "カードを削除しますか？",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "アバターの変更",
     "change-password": "パスワードの変更",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "アバターの変更",
     "changeLanguagePopup-title": "言語の変更",
     "changePasswordPopup-title": "パスワードの変更",
     "changePermissionsPopup-title": "パーミッションの変更",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "ボードにスターをつける",
     "click-to-unstar": "ボードからスターを外す",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "閉じる",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "ボードの作成",
     "createLabelPopup-title": "ラベルの作成",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "削除",
@@ -122,7 +152,10 @@
     "edit": "編集",
     "edit-avatar": "アバターの変更",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "ラベルの変更",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "メールアドレス",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "カードをフィルターする",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "このボードのカードをフィルターしています。フィルターを編集するにはこちらをクリックしてください。",
     "filter-to-selection": "Filter to selection",
     "fullname": "フルネーム",
     "header-logo-title": "自分のボードページに戻る。",
+    "hide-system-messages": "Hide system messages",
     "home": "ホーム",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "情報",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "参加しました",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "ログアウト",
+    "log-in": "Log In",
     "loginPopup-title": "ログイン",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "メンバー",
     "menu": "メニュー",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "自分のボード",
     "name": "名前",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "通常",
     "normal-desc": "カードの閲覧と編集が可能。設定変更不可。",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "任意",
     "or": "or",
     "page-maybe-private": "このページはプライベートです。<a href='%s'>ログイン</a>して見てください。",
     "page-not-found": "ページが見つかりません。",
     "password": "パスワード",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "アカウント作成",
     "star-board-title": "ボードにスターをつけると自分のボード一覧のトップに表示されます。",
     "starred-boards": "スターのついたボード",
@@ -250,14 +296,24 @@
     "team": "チーム",
     "this-board": "このボード",
     "this-card": "このカード",
+    "time": "Time",
     "title": "タイトル",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "ユーザー名",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "What do you want to do?"
 }
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index 823a221d..ac8a3049 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "동작",
     "activities": "Activities",
     "activity": "활동 상태",
@@ -31,6 +51,8 @@
     "all-boards": "All boards",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "보관",
     "archive-all": "모두 보관",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "영구 첨부파일을 삭제합니다. 되돌릴 수 없습니다.",
     "attachmentDeletePopup-title": "첨부 파일을 삭제합니까?",
     "attachments": "첨부 파일",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "뒤로",
     "board-change-color": "Change color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "보드 이름 바꾸기",
     "boardChangeVisibilityPopup-title": "표시 여부 변경",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "보드",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "영구 삭제입니다. 이 카드와 관련된 모든 작업들을 잃게됩니다.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "카드의 라벨 변경.",
     "card-members-title": "카드에서 보드의 멤버를 추가하거나 삭제합니다.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "카드를 삭제합니까?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "아바타 변경",
     "change-password": "암호 변경",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "아바타 변경",
     "changeLanguagePopup-title": "언어 변경",
     "changePasswordPopup-title": "암호 변경",
     "changePermissionsPopup-title": "권한 변경",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "보드 별 추가.",
     "click-to-unstar": "보드 별 삭제.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "닫기",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "보드 생성",
     "createLabelPopup-title": "라벨 생성",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "삭제",
@@ -122,7 +152,10 @@
     "edit": "수정",
     "edit-avatar": "아바타 변경",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "라벨 변경",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "이메일",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "카드 필터",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "보드에서 카드를 필터링합니다. 여기를 클릭하여 필터를 수정합니다.",
     "filter-to-selection": "Filter to selection",
     "fullname": "전체 이름",
     "header-logo-title": "보드 페이지로 돌아가기.",
+    "hide-system-messages": "Hide system messages",
     "home": "홈",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "정보",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "참가함",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "로그아웃",
+    "log-in": "Log In",
     "loginPopup-title": "로그인",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "멤버",
     "menu": "메뉴",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "내 보드",
     "name": "이름",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "표준",
     "normal-desc": "카드를 보거나 수정할 수 있습니다. 설정값은 변경할 수 없습니다.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "옴션",
     "or": "or",
     "page-maybe-private": "이 페이지를 비공개일 수 있습니다. 이것을 보고 싶으면 <a href='%s'>로그인</a>을 하십시오.",
     "page-not-found": "페이지를 찾지 못 했습니다",
     "password": "암호",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "계정 생성",
     "star-board-title": "보드에 별을 클릭합니다. 보드 목록에서 최상위로 둘 수 있습니다.",
     "starred-boards": "별표된 보드",
@@ -250,14 +296,24 @@
     "team": "팀",
     "this-board": "보드",
     "this-card": "카드",
+    "time": "Time",
     "title": "제목",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "사용자 이름",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
-    "what-to-do": "What do you want to do?"
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "what-to-do": "무엇을 원하나요?"
 }
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index d44bccdb..f7d00b70 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Akceptuj",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Akcje",
     "activities": "Aktywności",
     "activity": "Aktywność",
@@ -31,6 +51,8 @@
     "all-boards": "Wszystkie tablice",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Zarchiwizuj",
     "archive-all": "Zarchiwizuj wszystkie",
     "archive-board": "Zarchiwizuj tablicę",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Usunięcie załącznika jest nieodwracalne.",
     "attachmentDeletePopup-title": "Usunąć załącznik?",
     "attachments": "Załączniki",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "Avatar jest za duży (maksymalnie 70Kb)",
     "back": "Wstecz",
     "board-change-color": "Zmień kolor",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Zmień tło tablicy",
     "boardChangeTitlePopup-title": "Zmień nazwę tablicy",
     "boardChangeVisibilityPopup-title": "Zmień widoczność",
-    "boardImportBoardPopup-title": "Zaimportuj tablicę z Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menu tablicy",
     "boards": "Tablice",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Usunięcie jest trwałe. Stracisz wszystkie akcje powiązane z tą kartą.",
     "card-delete-pop": "Wszystkie akcje będą usunięte z widoku aktywności, nie można będzie ponownie otworzyć karty.  Usunięcie jest nieodwracalne. ",
     "card-delete-suggest-archive": "Możesz zarchiwizować kartę w celu usunięcia jej z tablicy oraz zachowania jej aktywności.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edytuj załączniki",
     "card-edit-labels": "Edytuj etykiety",
     "card-edit-members": "Edytuj członków",
     "card-labels-title": "Zmień etykiety karty",
     "card-members-title": "Dodaj lub usuń członków tablicy z karty.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Załącz z",
     "cardDeletePopup-title": "Usunąć kartę?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Zmień Avatar",
     "change-password": "Zmień hasło",
     "change-permissions": "Zmień uprawnienia",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Zmień Avatar",
     "changeLanguagePopup-title": "Zmień język",
     "changePasswordPopup-title": "Zmień hasło",
     "changePermissionsPopup-title": "Zmień uprawnienia",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Kliknij by odznaczyć tę tablicę.",
     "click-to-unstar": "Kliknij by usunąć odznaczenie tej tablicy.",
-    "clipboard": "Schowek lub przeciągnij & upuść",
+    "clipboard" : "Schowek lub przeciągnij & upuść",
     "close": "Zamknij",
     "close-board": "Zamknij tablicę",
     "close-board-pop": "Możesz przywrócić tablicę klikając przycisk \"Zarchiwizowane\" z głównej belki.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Utwórz tablicę",
     "createLabelPopup-title": "Utwórz etykietę",
     "current": "obecny",
+    "date": "Date",
     "decline": "Odrzuć",
     "default-avatar": "Domyślny avatar",
     "delete": "Usuń",
@@ -122,7 +152,10 @@
     "edit": "Edytuj",
     "edit-avatar": "Zmień Avatar",
     "edit-profile": "Edytuj profil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Zmień etykietę",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edytuj profil",
     "email": "Email",
     "email-enrollAccount-subject": "Konto zostało utworzone na __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "Ten użytkownik nie istnieje",
     "error-user-notAllowSelf": "Ta akcje nie jest dozwolona",
     "error-user-notCreated": "Ten użytkownik nie został stworzony",
+    "error-username-taken": "This username is already taken",
     "export-board": "Eksportuj tablicę",
     "filter": "Filtr",
     "filter-cards": "Odfiltruj karty",
     "filter-clear": "Usuń filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filtr jest włączony",
     "filter-on-desc": "Filtrujesz karty na tej tablicy. Kliknij tutaj by edytować filtr.",
     "filter-to-selection": "Odfiltruj zaznaczenie",
     "fullname": "Full Name",
     "header-logo-title": "Wróć do swojej strony z tablicami.",
+    "hide-system-messages": "Hide system messages",
     "home": "Strona główna",
     "import": "Importu",
     "import-board": "zaimportuj z Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "W twojej tablicy na Trello, idź do 'Menu', następnie 'More', 'Print and Export', 'Export JSON' i skopiuj wynik",
-    "import-card": "Zaimportuj kartę z Trello",
-    "import-card-trello-instruction": "Idź do karty Trello, wybierz 'Share and more...', następnie 'Export JSON' i skopiuj wynik",
     "import-json-placeholder": "Wklej twój JSON tutaj",
+    "import-map-members": "Map members",
     "import-members-map": "Twoje zaimportowane tablice mają kilku członków. Proszę wybierz członków których chcesz zaimportować do Wekan",
     "import-show-user-mapping": "Przejrzyj wybranych członków",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informacje",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "dołączył",
     "just-invited": "Właśnie zostałeś zaproszony do tej tablicy",
     "keyboard-shortcuts": "Skróty klawiaturowe",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Zaimportuj kartę z Trello",
     "lists": "Listy",
     "log-out": "Wyloguj",
+    "log-in": "Log In",
     "loginPopup-title": "Zaloguj",
-    "mapMembersAddPopup-title": "Wybierz członka Wekan",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Członkowie",
     "menu": "Menu",
     "move-selection": "Przenieś zaznaczone",
     "moveCardPopup-title": "Przenieś kartę",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Przenieś zaznaczone",
     "multi-selection": "Wielokrotne zaznaczenie",
     "multi-selection-on": "Wielokrotne zaznaczenie jest włączone",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Moje tablice",
     "name": "Nazwa",
     "no-archived-cards": "Brak zarchiwizowanych kart.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Może widzieć i edytować karty. Nie może zmieniać ustawiań.",
     "not-accepted-yet": "Zaproszenie jeszcze nie zaakceptowane",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opcjonalny",
     "or": "lub",
     "page-maybe-private": "Ta strona może być prywatna. Możliwe, że możesz ją zobaczyć po <a href='%s'>zalogowaniu</a>.",
     "page-not-found": "Strona nie znaleziona.",
     "password": "Hasło",
     "paste-or-dragdrop": "wklej lub przeciągnij & upuść obrazek",
+    "participating": "Participating",
     "preview": "Podgląd",
     "previewAttachedImagePopup-title": "Podgląd",
     "previewClipboardImagePopup-title": "Podgląd",
@@ -234,7 +279,7 @@
     "search": "Wyszukaj",
     "select-color": "Wybierz kolor",
     "shortcut-assign-self": "Przypisz siebie do obecnej karty",
-    "shortcut-autocomplete-emojies": "Autocomplete emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Autocomplete members",
     "shortcut-clear-filters": "Usuń wszystkie filtry",
     "shortcut-close-dialog": "Zamknij okno",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Przypnij do listy skrótów",
     "shortcut-toggle-filterbar": "Przełącz boczny pasek filtru",
     "shortcut-toggle-sidebar": "Przełącz boczny pasek tablicy",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Utwórz konto",
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
     "starred-boards": "Odznaczone tablice",
@@ -250,14 +296,24 @@
     "team": "Zespół",
     "this-board": "ta tablica",
     "this-card": "ta karta",
+    "time": "Time",
     "title": "Tytuł",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Nieprzypisany członek",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Wyślij",
     "upload-avatar": "Wyślij avatar",
     "uploaded-avatar": "Wysłany avatar",
     "username": "Nazwa użytkownika",
     "view-it": "Zobacz",
     "warn-list-archived": "ostrzeżenie: ta karta jest na zarchiwizowanej liście",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Co chcesz zrobić?"
-}
\ No newline at end of file
+}
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index 189d4298..5f43b287 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Aceitar",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Ações",
     "activities": "Atividades",
     "activity": "Atividade",
@@ -31,6 +51,8 @@
     "all-boards": "Todos os quadros",
     "and-n-other-card": "E __count__ outro cartão",
     "and-n-other-card_plural": "E __count__ outros cartões",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Arquivar",
     "archive-all": "Arquivar Tudo",
     "archive-board": "Arquivar Quadro",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Excluir um anexo é permanente. Não será possível recuperá-lo.",
     "attachmentDeletePopup-title": "Excluir Anexo?",
     "attachments": "Anexos",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "Imagem de avatar muito grande (máx 70KB)",
     "back": "Voltar",
     "board-change-color": "Alterar cor",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Alterar Tela de Fundo",
     "boardChangeTitlePopup-title": "Renomear Quadro",
     "boardChangeVisibilityPopup-title": "Alterar Visibilidade",
-    "boardImportBoardPopup-title": "Importar quadro do Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Menu do Quadro",
     "boards": "Quadros",
     "bucket-example": "\"Bucket List\", por exemplo",
@@ -66,11 +89,15 @@
     "card-delete-notice": "A exclusão será permanente. Você perderá todas as ações associadas a este cartão.",
     "card-delete-pop": "Todas as ações serão removidas da lista de Atividades e vocês não poderá re-abrir o cartão. Não há como desfazer.",
     "card-delete-suggest-archive": "Você pode arquivar um cartão para removê-lo do quadro e preservar suas atividades.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Editar anexos",
     "card-edit-labels": "Editar etiquetas",
     "card-edit-members": "Editar membros",
     "card-labels-title": "Alterar etiquetas do cartão.",
     "card-members-title": "Acrescentar ou remover membros do quadro deste cartão.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Anexar a partir de",
     "cardDeletePopup-title": "Excluir Cartão?",
     "cardDetailsActionsPopup-title": "Ações do cartão",
@@ -82,13 +109,15 @@
     "change-avatar": "Alterar Avatar",
     "change-password": "Alterar Senha",
     "change-permissions": "Alterar permissões",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Alterar Avatar",
     "changeLanguagePopup-title": "Alterar Idioma",
     "changePasswordPopup-title": "Alterar Senha",
     "changePermissionsPopup-title": "Alterar Permissões",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Marcar quadro como favorito.",
     "click-to-unstar": "Remover quadro dos favoritos.",
-    "clipboard": "Área de Transferência ou arraste e solte",
+    "clipboard" : "Área de Transferência ou arraste e solte",
     "close": "Fechar",
     "close-board": "Fechar Quadro",
     "close-board-pop": "Você estará habilitado para restaurar o quadro clicando no botão \"Arquivos\" à partir da barra de início.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Criar Quadro",
     "createLabelPopup-title": "Criar Etiqueta",
     "current": "atual",
+    "date": "Date",
     "decline": "Rejeitar",
     "default-avatar": "Avatar padrão",
     "delete": "Excluir",
@@ -122,7 +152,10 @@
     "edit": "Editar",
     "edit-avatar": "Alterar Avatar",
     "edit-profile": "Editar Perfil",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Alterar Etiqueta",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Editar Perfil",
     "email": "E-mail",
     "email-enrollAccount-subject": "Uma conta foi criada para você em __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "Este usuário não existe",
     "error-user-notAllowSelf": "Esta ação em você mesmo não é permitida",
     "error-user-notCreated": "Este usuário não foi criado",
+    "error-username-taken": "This username is already taken",
     "export-board": "Exportar quadro",
     "filter": "Filtrar",
     "filter-cards": "Filtrar Cartões",
     "filter-clear": "Limpar filtro",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filtro está ativo",
     "filter-on-desc": "Você está filtrando cartões neste quadro. Clique aqui para editar o filtro.",
     "filter-to-selection": "Filtrar esta seleção",
     "fullname": "Nome Completo",
     "header-logo-title": "Voltar para a lista de quadros.",
+    "hide-system-messages": "Hide system messages",
     "home": "Início",
     "import": "Importar",
     "import-board": "Importar do Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "No seu quadro do Trello, vá em 'Menu', depois em 'Mais', 'Imprimir e Exportar', 'Exportar JSON', então copie o texto emitido",
-    "import-card": "Importe um cartão do Trello",
-    "import-card-trello-instruction": "Vá para um cartão do Trello, selecione 'Compartilhar e mais...' então 'Exporte JSON' e copie o texto resultante",
     "import-json-placeholder": "Cole seus dados JSON válidos aqui",
+    "import-map-members": "Map members",
     "import-members-map": "O seu quadro importado tem alguns membros. Por favor determine os membros que você deseja importar para os usuários Wekan",
     "import-show-user-mapping": "Revisar mapeamento dos membros",
     "import-user-select": "Selecione o usuário Wekan que você gostaria de usar como este membro",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Informações",
     "initials": "Iniciais",
+    "invalid-date": "Invalid date",
     "joined": "juntou-se",
     "just-invited": "Você já foi convidado para este quadro",
     "keyboard-shortcuts": "Atalhos do teclado",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Importe um cartão do Trello",
     "lists": "Listas",
     "log-out": "Sair",
+    "log-in": "Log In",
     "loginPopup-title": "Entrar",
-    "mapMembersAddPopup-title": "Selecione um membro Wekan",
-    "mapMembersPopup-title": "Mapear membros",
     "memberMenuPopup-title": "Configuração de Membros",
     "members": "Membros",
     "menu": "Menu",
     "move-selection": "Mover seleção",
     "moveCardPopup-title": "Mover Cartão",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Mover seleção",
     "multi-selection": "Multi-Seleção",
     "multi-selection-on": "Multi-seleção está ativo",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Meus Quadros",
     "name": "Nome",
     "no-archived-cards": "Nenhum cartão arquivado",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Pode ver e editar cartões. Não pode alterar configurações.",
     "not-accepted-yet": "Convite ainda não aceito",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opcional",
     "or": "ou",
     "page-maybe-private": "Esta página pode ser privada. Você poderá vê-la se estiver <a href='%s'>logado</a>.",
     "page-not-found": "Página não encontrada.",
     "password": "Senha",
     "paste-or-dragdrop": "para colar, ou arraste e solte o arquivo da imagem para ca (somente imagens)",
+    "participating": "Participating",
     "preview": "Previsualizar",
     "previewAttachedImagePopup-title": "Previsualizar",
     "previewClipboardImagePopup-title": "Previsualizar",
@@ -234,7 +279,7 @@
     "search": "Buscar",
     "select-color": "Selecione uma cor",
     "shortcut-assign-self": "Atribuir a si o cartão atual",
-    "shortcut-autocomplete-emojies": "Preenchimento automático de emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Preenchimento automático de membros",
     "shortcut-clear-filters": "Limpar todos filtros",
     "shortcut-close-dialog": "Fechar dialogo",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Mostrar lista de atalhos",
     "shortcut-toggle-filterbar": "Alternar barra de filtro",
     "shortcut-toggle-sidebar": "Fechar barra lateral.",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Criar uma Conta",
     "star-board-title": "Clique para marcar este quadro como favorito. Ele aparecerá no topo na lista dos seus quadros.",
     "starred-boards": "Quadros Favoritos",
@@ -250,14 +296,24 @@
     "team": "Equipe",
     "this-board": "este quadro",
     "this-card": "este cartão",
+    "time": "Time",
     "title": "Título",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Membro não associado",
     "unsaved-description": "Você possui uma descrição não salva",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Carregar um avatar",
     "uploaded-avatar": "Avatar carregado",
     "username": "Nome de usuário",
     "view-it": "Visualizar",
     "warn-list-archived": "aviso: este cartão está em uma lista arquivada",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "O que você gostaria de fazer?"
-}
\ No newline at end of file
+}
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 04b5a455..ec7f55de 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
@@ -31,6 +51,8 @@
     "all-boards": "All boards",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Archive",
     "archive-all": "Archive All",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
     "attachmentDeletePopup-title": "Delete Attachment?",
     "attachments": "Ataşamente",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "Înapoi",
     "board-change-color": "Change color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "Boards",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
     "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Change Avatar",
     "changeLanguagePopup-title": "Change Language",
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "Închide",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Create Board",
     "createLabelPopup-title": "Create Label",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
@@ -122,7 +152,10 @@
     "edit": "Edit",
     "edit-avatar": "Change Avatar",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "Email",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "Filter Cards",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
     "home": "Home",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Iniţiale",
+    "invalid-date": "Invalid date",
     "joined": "joined",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Liste",
     "log-out": "Log Out",
+    "log-in": "Log In",
     "loginPopup-title": "Log In",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Members",
     "menu": "Meniu",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nume",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "optional",
     "or": "or",
     "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
     "page-not-found": "Page not found.",
     "password": "Parolă",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -234,7 +279,7 @@
     "search": "Caută",
     "select-color": "Select a color",
     "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emojies": "Autocomplete emojies",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Autocomplete members",
     "shortcut-clear-filters": "Clear all filters",
     "shortcut-close-dialog": "Close Dialog",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Create an Account",
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
     "starred-boards": "Starred Boards",
@@ -250,14 +296,24 @@
     "team": "Team",
     "this-board": "this board",
     "this-card": "this card",
+    "time": "Time",
     "title": "Titlu",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Ce ai vrea sa faci?"
-}
\ No newline at end of file
+}
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index a2319a27..c99d2bad 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Принять",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Действия",
     "activities": "История действия",
     "activity": "Активность",
@@ -31,6 +51,8 @@
     "all-boards": "Все доски",
     "and-n-other-card": "И __count__ другая карточка",
     "and-n-other-card_plural": "И __count__ другие карточки",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Архивировать",
     "archive-all": "Архивировать все",
     "archive-board": "Архивировать доску",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Если удалить вложение, его нельзя будет восстановить.",
     "attachmentDeletePopup-title": "Удалить вложение?",
     "attachments": "Вложения",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "Аватар слишком большой (максимум 70кб)",
     "back": "Назад",
     "board-change-color": "Изменить цвет",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Изменить фон доски",
     "boardChangeTitlePopup-title": "Переименовать доску",
     "boardChangeVisibilityPopup-title": "Изменить настройки видимости",
-    "boardImportBoardPopup-title": "Импортировать доску с Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Меню доски",
     "boards": "Доски",
     "bucket-example": "Например “Список дел”",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.",
     "card-delete-pop": "Все действия будут удалены из ленты активности и вы не сможете заново открыть карточку. Действие необратимо",
     "card-delete-suggest-archive": "Вы можете заархивировать карточку, чтобы удалить ее с доски и сохранить активность .",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Изменить вложения",
     "card-edit-labels": "Изменить метку",
     "card-edit-members": "Изменить пользователей",
     "card-labels-title": "Редактировать метки.",
     "card-members-title": "Добавить или удалить участника.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Прикрепить из",
     "cardDeletePopup-title": "Удалить карточку?",
     "cardDetailsActionsPopup-title": "Действия в карточке",
@@ -82,26 +109,28 @@
     "change-avatar": "Изменить аватар",
     "change-password": "Изменить пароль",
     "change-permissions": "Изменить права доступа",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Изменить аватар",
     "changeLanguagePopup-title": "Сменить язык",
     "changePasswordPopup-title": "Изменить пароль",
     "changePermissionsPopup-title": "Изменить настройки доступа",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Добавить в  «Избранное»",
     "click-to-unstar": "Удалить из «Избранного»",
-    "clipboard": "Буфер обмена или drag & drop",
+    "clipboard" : "Буфер обмена или drag & drop",
     "close": "Закрыть",
     "close-board": "Закрыть доску",
     "close-board-pop": "Вы можете восстановить доску, нажав  “Архивы” в заголовке.",
+    "color-black": "черный",
+    "color-blue": "синий",
     "color-green": "зеленый",
-    "color-yellow": "желтый",
+    "color-lime": "лимоновый",
     "color-orange": "оранджевый",
-    "color-red": "красный",
+    "color-pink": "зорозвый",
     "color-purple": "фиолетовый",
-    "color-blue": "синий",
+    "color-red": "красный",
     "color-sky": "голубой",
-    "color-lime": "лимоновый",
-    "color-pink": "зорозвый",
-    "color-black": "черный",
+    "color-yellow": "желтый",
     "comment": "Отправить",
     "comment-placeholder": "Написать комментарий",
     "computer": "Загрузить с компьютера",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Создать доску",
     "createLabelPopup-title": "Создать метку",
     "current": "Текущий",
+    "date": "Date",
     "decline": "Понизить",
     "default-avatar": "Стандартный аватар",
     "delete": "Удалить",
@@ -122,7 +152,10 @@
     "edit": "Редактировать",
     "edit-avatar": "Изменить аватар",
     "edit-profile": "Изменить профиль",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Редактирование метки",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Изменить профиль",
     "email": "Эл.почта",
     "email-enrollAccount-subject": "Аккаунт создан для вас здесь __url__",
@@ -134,9 +167,9 @@
     "email-invite-text": "Дорогой __user__,\n\n__inviter__ пригласил вас на доску \"__board__\" для сотрудничества.\n\nПожайлуйста проследуйте по ссылке:\n\n__url__\n\nСпасибо.",
     "email-resetPassword-subject": "Перейдите по ссылке, чтобы сбросить пароль __url__",
     "email-resetPassword-text": "Привет __user__,\n\nДля сброса пароля перейдите по ссылке.\n\n__url__\n\nThanks.",
+    "email-sent": "Email отправлен",
     "email-verifyEmail-subject": "Подтвердите Email перейдя по ссылке __url__",
     "email-verifyEmail-text": "Привет __user__,\n\nДля подтверждения Email перейдите по ссылке.\n\n__url__\n\nСпасибо.",
-    "email-sent": "Email отправлен",
     "error-board-doesNotExist": "Доска не найдена",
     "error-board-notAdmin": "Вы должны обладать правами админстратора, чтобы сделать это",
     "error-board-notAMember": "Вы должны быть пользователем доски, чтобы сделать это",
@@ -146,26 +179,33 @@
     "error-user-doesNotExist": "Пользователь не найден",
     "error-user-notAllowSelf": "Нельзя выполнить это действие на себе",
     "error-user-notCreated": "Пользователь не создан",
+    "error-username-taken": "This username is already taken",
+    "export-board": "Export board",
     "filter": "Фильтр",
     "filter-cards": "Фильтр карточек",
     "filter-clear": "Очистить фильтр",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "Показываются карточки, соответствующие настройкам фильтра. Нажмите для редактирования.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Полное имя",
     "header-logo-title": "Вернуться к доскам.",
+    "hide-system-messages": "Hide system messages",
     "home": "Главная",
     "import": "Импорт",
     "import-board": "Импорт с Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "На вашей Trello доске нажмите “Menu” - “More” - “Print and export - “Export JSON” и скопируйте полученный текст",
-    "import-card": "Импортировать карточку Trello",
-    "import-card-trello-instruction": "Перейдите в карточку Trello, выбирите “Share and more” - “Export JSON” и скопируйте полученный текст",
     "import-json-placeholder": "Вставьте JSON сюда",
+    "import-map-members": "Map members",
     "import-members-map": "Вы ипортировали доску с пользователями. Пожалуйста, составьте карту пользователей, которых вы хотите импортировать в Wekan пользователей ",
     "import-show-user-mapping": "Пересмотреть карту пользователей",
     "import-user-select": "Выберите Wekan-пользователя, которого вы хотите использовать в качестве пользователя",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Информация",
     "initials": "Инициалы",
+    "invalid-date": "Invalid date",
     "joined": "вступил",
     "just-invited": "Вы только пригласили на эту доску",
     "keyboard-shortcuts": "Сочетания клавиш",
@@ -185,15 +225,20 @@
     "listImportCardPopup-title": "Импортировать Trello карточку",
     "lists": "Списки",
     "log-out": "Выйти",
+    "log-in": "Log In",
     "loginPopup-title": "Войти",
-    "mapMembersPopup-title": "Карта пользователей",
-    "mapMembersAddPopup-title": "Выбрать Wekan пользователя",
     "memberMenuPopup-title": "Настройки пользователя",
     "members": "Участники",
     "menu": "Меню",
+    "move-selection": "Move selection",
     "moveCardPopup-title": "Переместить карточку",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Выбрать несколько",
     "multi-selection-on": "Выбрать несколько из",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Мои доски",
     "name": "Имя",
     "no-archived-cards": "Нет карточек в архиве.",
@@ -202,15 +247,18 @@
     "normal": "Обычный",
     "normal-desc": "Может редактировать карточки. Не может управлять настройками.",
     "not-accepted-yet": "Приглашение еще не принято",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "не обязательно",
     "or": "или",
     "page-maybe-private": "Возможно, эта страница скрыта от незарегистрированных пользователей. Попробуйте <a href='%s'>войти на сайт</a>.",
     "page-not-found": "Страница не найдена.",
     "password": "Пароль",
     "paste-or-dragdrop": "вставьте, или перетащите файл с изображением сюда (только графический фай)",
+    "participating": "Participating",
     "preview": "Предпросмотр",
-    "previewClipboardImagePopup-title": "Предпросмотр",
     "previewAttachedImagePopup-title": "Предпросмотр",
+    "previewClipboardImagePopup-title": "Предпросмотр",
     "private": "Закрытая",
     "private-desc": "Эта доска с ограниченным доступом. Только участники могут работать с ней.",
     "profile": "Профиль",
@@ -239,22 +287,33 @@
     "shortcut-show-shortcuts": "Поднять список ярлыков",
     "shortcut-toggle-filterbar": "Переместить фильтр на бововую панель",
     "shortcut-toggle-sidebar": "Переместить доску на боковую панель",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Создать учетную запись",
     "star-board-title": "Добавить в «Избранное». Эта доска будет всегда на виду.",
     "starred-boards": "Добавленные в «Избранное»",
-    "starred-boards-description": "",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
     "subscribe": "Подписаться",
     "team": "Участники",
     "this-board": "эту доску",
     "this-card": "текущая карточка",
+    "time": "Time",
     "title": "Название",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Отменить назначение пользователя",
     "unsaved-description": "У вас есть несохраненное описание.",
+    "unwatch": "Unwatch",
     "upload": "Загрзуить",
     "upload-avatar": "Загрузить аватар",
     "uploaded-avatar": "Загруженный аватар",
     "username": "Имя пользователя",
     "view-it": "Просмотреть",
     "warn-list-archived": "Внимание: Данная карточка находится в списке архива",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Что вы хотите сделать?"
 }
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index b7f004e4..e3d4dd0e 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Prihvati",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "Akcije",
     "activities": "Aktivnosti",
     "activity": "Aktivnost",
@@ -31,6 +51,8 @@
     "all-boards": "Sve table",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Arhiviraj",
     "archive-all": "Arhiviraj sve",
     "archive-board": "Arhiviraj tablu",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Brisanje prikačenog dokumenta je trajno. Ne postoji vraćanje obrisanog.",
     "attachmentDeletePopup-title": "Obrisati prikačeni dokument ?",
     "attachments": "Prikačeni dokumenti",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "Avatar je prevelik (maksimum je 70Kb)",
     "back": "Nazad",
     "board-change-color": "Promeni boju",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Promeni pozadinu table",
     "boardChangeTitlePopup-title": "Preimenuj tablu",
     "boardChangeVisibilityPopup-title": "Promeni Vidljivost",
-    "boardImportBoardPopup-title": "Uvezi table iz Trello-a",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Meni table",
     "boards": "Table",
     "bucket-example": "Na primer \"Lista zadataka\"",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Brisanje je trajno. Izgubićeš sve akcije povezane sa ovom karticom.",
     "card-delete-pop": "Sve akcije će biti uklonjene sa liste aktivnosti i kartica neće moći biti ponovo otvorena. Nema vraćanja unazad.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Uredi priloge",
     "card-edit-labels": "Uredi natpise",
     "card-edit-members": "Uredi članove",
     "card-labels-title": "Promeni natpis na kartici.",
     "card-members-title": "Dodaj ili ukloni članove table sa kartice.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Change Avatar",
     "changeLanguagePopup-title": "Change Language",
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Create Board",
     "createLabelPopup-title": "Create Label",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
@@ -122,7 +152,10 @@
     "edit": "Edit",
     "edit-avatar": "Change Avatar",
     "edit-profile": "Edit Profile",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
     "email": "Email",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "Filter Cards",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
     "home": "Home",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "joined",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "Log Out",
+    "log-in": "Log In",
     "loginPopup-title": "Log In",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Članovi",
     "menu": "Menu",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "Normalno",
     "normal-desc": "Can view and edit cards. Can't change settings.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "opciono",
     "or": "ili",
     "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
     "page-not-found": "Stranica nije pronađena.",
     "password": "Lozinka",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Prikaz",
     "previewAttachedImagePopup-title": "Prikaz",
     "previewClipboardImagePopup-title": "Prikaz",
@@ -234,7 +279,7 @@
     "search": "Pretraga",
     "select-color": "Izaberi boju",
     "shortcut-assign-self": "Pridruži sebe trenutnoj kartici",
-    "shortcut-autocomplete-emojies": "Sam popuni emodžije",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Sam popuni članove",
     "shortcut-clear-filters": "Očisti sve filtere",
     "shortcut-close-dialog": "Zatvori dijalog",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Prikaži ovu listu prečica",
     "shortcut-toggle-filterbar": "Uključi ili isključi bočni meni filtera",
     "shortcut-toggle-sidebar": "Uključi ili isključi bočni meni table",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Kreiraj nalog",
     "star-board-title": "Klikni da označiš zvezdicom ovu tablu. Pokazaće se na vrhu tvoje liste tabli.",
     "starred-boards": "Table sa zvezdicom",
@@ -250,14 +296,24 @@
     "team": "Tim",
     "this-board": "ova tabla",
     "this-card": "ova kartica",
+    "time": "Time",
     "title": "Naslov",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "Imaš nesnimljen opis.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Korisničko ime",
     "view-it": "Pregledaj je",
     "warn-list-archived": "upozorenje: ova kartica je u arhiviranoj listi",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "Šta želiš da uradiš ?"
-}
\ No newline at end of file
+}
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index c05833bb..24869280 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -1,5 +1,25 @@
 {
     "accept": "Accept",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addComment": "commented on __card__: __comment__",
+    "act-createBoard": "created __board__",
+    "act-createCard": "added __card__ to __list__",
+    "act-createList": "added __list__ to __board__",
+    "act-addBoardMember": "added __member__ to __board__",
+    "act-archivedBoard": "archived __board__",
+    "act-archivedCard": "archived __card__",
+    "act-archivedList": "archived __list__",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "added __member__ to __card__",
+    "act-moveCard": "moved __card__ from __oldList__ to __list__",
+    "act-removeBoardMember": "removed __member__ from __board__",
+    "act-restoredCard": "restored __card__ to __board__",
+    "act-unjoinMember": "removed __member__ from __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
     "actions": "İşlemler",
     "activities": "Aktiviteler",
     "activity": "Etkinlik",
@@ -31,6 +51,8 @@
     "all-boards": "All boards",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "The application is currently offline, refreshing the page will cause data loss.",
     "archive": "Arşiv",
     "archive-all": "Tümünü Arşivle",
     "archive-board": "Archive Board",
@@ -46,6 +68,7 @@
     "attachment-delete-pop": "Ek dosya silme işlemi kalıcıdır. Geri dönüşü yok",
     "attachmentDeletePopup-title": "Ek Dosya Silinsin Mi?",
     "attachments": "Ek Dosyalar",
+    "auto-watch": "Automatically watch boards when create it",
     "avatar-too-big": "The avatar is too large (70Kb max)",
     "back": "Geri",
     "board-change-color": "Change color",
@@ -56,7 +79,7 @@
     "boardChangeColorPopup-title": "Change Board Background",
     "boardChangeTitlePopup-title": "Pano Adı Değiştirme",
     "boardChangeVisibilityPopup-title": "Görünebilirliği Değiştir",
-    "boardImportBoardPopup-title": "Import board from Trello",
+    "boardChangeWatchPopup-title": "Change Watch",
     "boardMenuPopup-title": "Board Menu",
     "boards": "Panolar",
     "bucket-example": "Like “Bucket List” for example",
@@ -66,11 +89,15 @@
     "card-delete-notice": "Silme işlemi kalıcıdır. Bu kartla ilişkili tüm eylemleri kaybedersiniz.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
     "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "Kart Silinsin mi?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -82,13 +109,15 @@
     "change-avatar": "Avatar Değiştir",
     "change-password": "Parola Değiştir",
     "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Avatar Değiştir",
     "changeLanguagePopup-title": "Dil Değiştir",
     "changePasswordPopup-title": "Parola Değiştir",
     "changePermissionsPopup-title": "Yetkileri Değiştirme",
+    "changeSettingsPopup-title": "Change Settings",
     "click-to-star": "Bu panoyu yıldızlamak için tıkla.",
     "click-to-unstar": "Bu panunun yıldızını kaldırmak için tıkla.",
-    "clipboard": "Clipboard or drag & drop",
+    "clipboard" : "Clipboard or drag & drop",
     "close": "Kapat",
     "close-board": "Close Board",
     "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
@@ -109,6 +138,7 @@
     "createBoardPopup-title": "Pano Oluşturma",
     "createLabelPopup-title": "Etiket Oluşturma",
     "current": "current",
+    "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Sil",
@@ -122,7 +152,10 @@
     "edit": "Düzenle",
     "edit-avatar": "Avatar Değiştir",
     "edit-profile": "Profili Düzenle",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
     "editLabelPopup-title": "Etiket Değiştirme",
+    "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Profili Düzenle",
     "email": "E-posta",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
@@ -146,27 +179,33 @@
     "error-user-doesNotExist": "This user does not exist",
     "error-user-notAllowSelf": "This action on self is not allowed",
     "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
     "export-board": "Export board",
     "filter": "Filter",
     "filter-cards": "Kartları Süz",
     "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
     "filter-on": "Filter is on",
     "filter-on-desc": "Bu panodaki kartları süzüyorsunuz. Süzgeci düzenlemek için tıklayın.",
     "filter-to-selection": "Filter to selection",
     "fullname": "Ad Soyad",
     "header-logo-title": "Panolar sayfanıza geri dön.",
+    "hide-system-messages": "Hide system messages",
     "home": "Home",
     "import": "Import",
     "import-board": "import from Trello",
+    "import-board-title": "Import board from Trello",
     "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-card": "Import a Trello card",
-    "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text",
     "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
     "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
     "import-show-user-mapping": "Review members mapping",
     "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "joined",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -186,17 +225,20 @@
     "listImportCardPopup-title": "Import a Trello card",
     "lists": "Lists",
     "log-out": "Oturum Kapat",
+    "log-in": "Log In",
     "loginPopup-title": "Oturum Aç",
-    "mapMembersAddPopup-title": "Select Wekan member",
-    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Üyeler",
     "menu": "Menü",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
     "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Panolarım",
     "name": "Adı",
     "no-archived-cards": "No archived cards.",
@@ -205,12 +247,15 @@
     "normal": "Normal",
     "normal-desc": "Kartları görüntüler ve düzenler. Ayarları değiştiremez.",
     "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
     "optional": "isteğe bağlı",
     "or": "or",
     "page-maybe-private": "Bu sayfa özel olabilir. <a href='%s'>Oturum açarak</a> görülebilir.",
     "page-not-found": "Sayda bulunamadı.",
     "password": "Parola",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "Bring up this shortcuts list",
     "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
     "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
     "signupPopup-title": "Bir Hesap Oluştur",
     "star-board-title": "Bu panoyu yıldızlamak için tıkla. Pano listesinin en üstünde gösterilir.",
     "starred-boards": "Yıldızlı Panolar",
@@ -250,14 +296,24 @@
     "team": "Takım",
     "this-board": "bu panoyu",
     "this-card": "bu kart",
+    "time": "Time",
     "title": "Başlık",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
     "upload": "Upload",
     "upload-avatar": "Upload an avatar",
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Kullanıcı adı",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an archived list",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
     "what-to-do": "What do you want to do?"
 }
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 4cfd03f0..03a9dede 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -1,21 +1,41 @@
 {
     "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": "添加成员 __member__  至看板 __board__",
+    "act-archivedBoard": "归档看板 __board__",
+    "act-archivedCard": "归档卡片 __card__",
+    "act-archivedList": "归档列表 __list__",
+    "act-importBoard": "导入看板 __board__",
+    "act-importCard": "导入卡片 __card__",
+    "act-importList": "导入列表 __list__",
+    "act-joinMember": "添加成员 __member__  至卡片 __card__",
+    "act-moveCard": "从列表 __oldList__  移动卡片 __card__  至列表 __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",
     "activity-imported": "导入 %s 至 %s 从 %s 中",
     "activity-imported-board": "已导入 %s 从 %s 中",
-    "activity-joined": "关联 %s",
+    "activity-joined": "已关联 %s",
     "activity-moved": "将 %s 从 %s 移动到 %s",
     "activity-on": "在 %s",
-    "activity-removed": "移除 %s 从 %s 中",
+    "activity-removed": "从 %s 中移除 %s",
     "activity-sent": "发送 %s 至 %s",
-    "activity-unjoined": "解除关联 %s",
+    "activity-unjoined": "已解除 %s 关联",
     "add": "添加",
     "add-attachment": "添加附件",
     "add-board": "添加新看板",
@@ -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": "归档看板",
@@ -46,6 +68,7 @@
     "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": "更改权限",
+    "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": "导出看板",
     "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-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": "移动卡片",
+    "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": "预览",
@@ -234,7 +279,7 @@
     "search": "搜索",
     "select-color": "选择颜色",
     "shortcut-assign-self": "分配当前卡片给自己",
-    "shortcut-autocomplete-emojies": "自动补全表情",
+    "shortcut-autocomplete-emoji": "表情符号自动补全",
     "shortcut-autocomplete-members": "自动补全成员",
     "shortcut-clear-filters": "清空全部过滤器",
     "shortcut-close-dialog": "关闭对话框",
@@ -242,6 +287,7 @@
     "shortcut-show-shortcuts": "显示此快捷键列表",
     "shortcut-toggle-filterbar": "切换过滤器边栏",
     "shortcut-toggle-sidebar": "切换面板边栏",
+    "show-cards-minimum-count": "当列表中的卡片多于此阈值时将显示数量",
     "signupPopup-title": " 创建账户",
     "star-board-title": "点此来标记该看板，它将会出现在您的看板列表顶部。",
     "starred-boards": "已标记看板",
@@ -250,14 +296,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": "要做什么？"
-}
\ No newline at end of file
+}
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index 0cd4565c..4cb73857 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -198,7 +198,7 @@
     "import-board-title": "匯入在 Trello 的看板",
     "import-board-trello-instruction": "在你的Trello看板中，點選“功能表”，然後選擇“更多”，“列印與匯出”，“匯出為 JSON” 並拷貝結果文本",
     "import-json-placeholder": "貼上您有效的 JSON 資料至此",
-    "import-map-members": "Map members",
+    "import-map-members": "複製成員",
     "import-members-map": "您匯入的看板有一些成員。請將您想匯入的成員映射到 Wekan 使用者。",
     "import-show-user-mapping": "核對成員映射",
     "import-user-select": "選擇您想將此成員映射到的 Wekan 使用者",
@@ -247,7 +247,7 @@
     "normal": "普通",
     "normal-desc": "可以建立以及編輯卡片，無法更改。",
     "not-accepted-yet": "邀請尚未接受",
-    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-participate": "接收與你有關的卡片更新",
     "notify-watch": "接收您關注的看板、清單或卡片的更新",
     "optional": "選擇性的",
     "or": "或",
@@ -299,7 +299,7 @@
     "time": "時間",
     "title": "標題",
     "tracking": "追蹤",
-    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "tracking-info": "你將會收到與你有關的卡片的所有變更通知",
     "unassign-member": "取消分配成員",
     "unsaved-description": "未儲存的描述",
     "unwatch": "取消觀察",
@@ -311,7 +311,7 @@
     "warn-list-archived": "警告: 該卡片位於已刪除的清單中",
     "watch": "觀察",
     "watching": "觀察中",
-    "watching-info": "You will be notified of any change in this board",
+    "watching-info": "你將會收到關於這個看板所有的變更通知",
     "welcome-board": "歡迎進入看板",
     "welcome-list1": "基本",
     "welcome-list2": "進階",