Merge pull request #3 from wekan/master

Update

55 files changed, 147 insertions, 126 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2070d3ba..b70b7d8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+- [Create subtasks in parenttask swimlane](https://github.com/wekan/wekan/issues/1953).
+  Thanks to TOSCom-DanielEder.
+- [When searching cards in a board, also search from Custom Fields](https://github.com/wekan/wekan/pull/2985).
+  Thanks to slvrpdr.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v3.88 2020-04-02 Wekan release
 
 This release adds the following new features:
diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js
index 34348fe1..cdc227fc 100644
--- a/client/components/cards/subtasks.js
+++ b/client/components/cards/subtasks.js
@@ -20,7 +20,13 @@ BlazeComponent.extendComponent({
     const crtBoard = Boards.findOne(card.boardId);
     const targetBoard = crtBoard.getDefaultSubtasksBoard();
     const listId = targetBoard.getDefaultSubtasksListId();
-    const swimlaneId = targetBoard.getDefaultSwimline()._id;
+
+    //Get the full swimlane data for the parent task.
+    const parentSwimlane = Swimlanes.findOne({boardId: crtBoard._id, _id: card.swimlaneId});
+    //find the swimlane of the same name in the target board.
+    const targetSwimlane = Swimlanes.findOne({boardId: targetBoard._id, title: parentSwimlane.title});
+    //If no swimlane with a matching title exists in the target board, fall back to the default swimlane.
+    const swimlaneId = targetSwimlane === undefined ? targetBoard.getDefaultSwimline()._id : targetSwimlane._id;
 
     if (title) {
       const _id = Cards.insert({
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index f97beeac..1689e7f3 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -440,7 +440,7 @@
   "save": "حفظ",
   "search": "بحث",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "اختيار اللون",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json
index 425da96c..126d0edd 100644
--- a/i18n/bg.i18n.json
+++ b/i18n/bg.i18n.json
@@ -440,7 +440,7 @@
   "save": "Запази",
   "search": "Търсене",
   "rules": "Правила",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Избери цвят",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index afbf510b..51cb2147 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index 195891a1..517e31bd 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -440,7 +440,7 @@
   "save": "Desa",
   "search": "Cerca",
   "rules": "Regles",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text que cercar?",
   "select-color": "Selecciona color",
   "set-wip-limit-value": "Limita el màxim nombre de tasques en aquesta llista",
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index d2412847..2fa37ec3 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -440,7 +440,7 @@
   "save": "Uložit",
   "search": "Hledat",
   "rules": "Pravidla",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Hledaný text",
   "select-color": "Vybrat barvu",
   "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů ve sloupci.",
diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json
index 9c64f1d6..07e71dc3 100644
--- a/i18n/da.i18n.json
+++ b/i18n/da.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index 882eb658..749a12e1 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "hat %s in Checkliste %s von %s abgewählt",
   "activity-checklist-added": "hat eine Checkliste zu %s hinzugefügt",
   "activity-checklist-removed": "entfernte eine Checkliste von %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "Abgeschlossene Checkliste",
   "activity-checklist-uncompleted": "unvervollständigte die Checkliste %s von %s",
   "activity-checklist-item-added": "hat ein Checklistenelement zu '%s' in %s hinzugefügt",
   "activity-checklist-item-removed": "hat ein Checklistenelement von '%s' in %s entfernt",
@@ -440,7 +440,7 @@
   "save": "Speichern",
   "search": "Suchen",
   "rules": "Regeln",
-  "search-cards": "Suche nach Karten-/Listentiteln und Beschreibungen auf diesem Board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Suchbegriff",
   "select-color": "Farbe auswählen",
   "set-wip-limit-value": "Setzen Sie ein Limit für die maximale Anzahl von Aufgaben in dieser Liste",
@@ -761,9 +761,9 @@
   "editUserPopup-title": "Benutzer ändern",
   "newUserPopup-title": "Neuer Benutzer",
   "notifications": "Benachrichtigungen",
-  "view-all": "View All",
+  "view-all": "Alle anzeigen",
   "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "mark-all-as-read": "Als ungelesen markieren",
+  "allow-rename": "Umbenennen erlauben",
+  "allowRenamePopup-title": "Umbenennen erlauben"
 }
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index d379dfe0..4dd17b71 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -440,7 +440,7 @@
   "save": "Αποθήκευση",
   "search": "Αναζήτηση",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Επιλέξτε Χρώμα",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json
index a562d26f..cd0bf147 100644
--- a/i18n/en-GB.i18n.json
+++ b/i18n/en-GB.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Colour",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index e3b3288d..bc07e934 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json
index fcd8616d..837d5e36 100644
--- a/i18n/eo.i18n.json
+++ b/i18n/eo.i18n.json
@@ -440,7 +440,7 @@
   "save": "Savi",
   "search": "Serĉi",
   "rules": "Reguloj",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json
index e09f3b2a..385312a6 100644
--- a/i18n/es-AR.i18n.json
+++ b/i18n/es-AR.i18n.json
@@ -440,7 +440,7 @@
   "save": "Grabar",
   "search": "Buscar",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "¿Texto a buscar?",
   "select-color": "Seleccionar Color",
   "set-wip-limit-value": "Fijar un límite para el número máximo de tareas en esta lista",
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index e6c69dfa..eb256ae7 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "desmarcado %s en lista  %s de %s",
   "activity-checklist-added": "ha añadido una lista de verificación a %s",
   "activity-checklist-removed": "eliminada una lista de verificación desde %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "lista de verificación completada %s de %s",
   "activity-checklist-uncompleted": "no completado la lista %s de %s",
   "activity-checklist-item-added": "ha añadido el elemento de la lista de verificación a '%s' en %s",
   "activity-checklist-item-removed": "eliminado un elemento de la lista de verificación desde '%s' en %s",
@@ -440,7 +440,7 @@
   "save": "Añadir",
   "search": "Buscar",
   "rules": "Reglas",
-  "search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "¿Texto a buscar?",
   "select-color": "Seleccionar el color",
   "set-wip-limit-value": "Cambiar el límite para el número máximo de tareas en esta lista.",
diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json
index 87587e22..1433b3d1 100644
--- a/i18n/eu.i18n.json
+++ b/i18n/eu.i18n.json
@@ -440,7 +440,7 @@
   "save": "Gorde",
   "search": "Bilatu",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Aukeratu kolorea",
   "set-wip-limit-value": "Zerrenda honetako atazen muga maximoa ezarri",
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index 133c262d..6f327d76 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -440,7 +440,7 @@
   "save": "ذخیره",
   "search": "جستجو",
   "rules": "قوانین",
-  "search-cards": "جتستجو از عنوان لیست/کارت ها و توضیحات در این برد",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "متن مورد جستجو؟",
   "select-color": "انتخاب رنگ",
   "set-wip-limit-value": "تعیین بیشینه تعداد وظایف در این فهرست",
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index f0e945b5..9a461521 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -440,7 +440,7 @@
   "save": "Tallenna",
   "search": "Etsi",
   "rules": "Säännöt",
-  "search-cards": "Etsi kortin/listan otsikoista ja kuvauksista tällä taululla",
+  "search-cards": "Etsi kortin/listan otsikoista, kuvauksista ja mukautetuista kentistä tällä taululla ",
   "search-example": "Etsittävä teksti?",
   "select-color": "Valitse väri",
   "set-wip-limit-value": "Aseta tämän listan tehtävien enimmäismäärä",
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index d7d7040f..b5c0ea50 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -440,7 +440,7 @@
   "save": "Enregistrer",
   "search": "Chercher",
   "rules": "Règles",
-  "search-cards": "Chercher selon les titres de carte/liste et descriptions de ce tableau",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Texte à rechercher ?",
   "select-color": "Sélectionner une couleur",
   "set-wip-limit-value": "Définit une limite maximale au nombre de cartes de cette liste",
diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json
index 4908c2b9..0ea78aaf 100644
--- a/i18n/gl.i18n.json
+++ b/i18n/gl.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 027aadd8..7550fa07 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "בוטל הסימון של %s ברשימת המשימות %s מתוך %s",
   "activity-checklist-added": "נוספה רשימת משימות אל %s",
   "activity-checklist-removed": "הוסרה רשימת משימות מ־%s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "הושלמה רשימת משימות %s מתוך %s",
   "activity-checklist-uncompleted": "רשימת המשימות %s מתוך %s סומנה כבלתי מושלמת",
   "activity-checklist-item-added": "נוסף פריט רשימת משימות אל ‚%s‘ תחת %s",
   "activity-checklist-item-removed": "הוסר פריט מרשימת המשימות ‚%s’ תחת %s",
@@ -440,7 +440,7 @@
   "save": "שמירה",
   "search": "חיפוש",
   "rules": "כללים",
-  "search-cards": "חיפוש בין כותרות של כרטיסים/רשימות ותיאורים בלוח זה",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "טקסט לחיפוש ?",
   "select-color": "בחירת צבע",
   "set-wip-limit-value": "הגדרת מגבלה למספר המרבי של משימות ברשימה זו",
@@ -760,10 +760,10 @@
   "new": "חדש",
   "editUserPopup-title": "עריכת משתמש",
   "newUserPopup-title": "משתמש חדש",
-  "notifications": "Notifications",
-  "view-all": "View All",
-  "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "notifications": "הודעות",
+  "view-all": "להציג הכול",
+  "filter-by-unread": "סימון לפי כאלו שלא נקראו",
+  "mark-all-as-read": "לסמן הכול כאילו שנקראו",
+  "allow-rename": "לאפשר שינוי שם",
+  "allowRenamePopup-title": "לאפשר שינוי שם"
 }
diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json
index b6c9b7a6..73df4cef 100644
--- a/i18n/hi.i18n.json
+++ b/i18n/hi.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text तक search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set एक limit for the maximum number of tasks अंदर में  यह list",
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index aac9b873..245b1a1a 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -440,7 +440,7 @@
   "save": "Mentés",
   "search": "Keresés",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "keresőkifejezés",
   "select-color": "Szín kiválasztása",
   "set-wip-limit-value": "Korlát beállítása a listán lévő feladatok legnagyobb számához",
diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json
index 5439ce57..29a81ae2 100644
--- a/i18n/hy.i18n.json
+++ b/i18n/hy.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json
index e5929f75..ccd6eea7 100644
--- a/i18n/id.i18n.json
+++ b/i18n/id.i18n.json
@@ -440,7 +440,7 @@
   "save": "Simpan",
   "search": "Cari",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json
index 5cb02f9c..a4150ee9 100644
--- a/i18n/ig.i18n.json
+++ b/i18n/ig.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index b0c4e6bd..3165c0a4 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -1,5 +1,5 @@
 {
-  "accept": "Accetta",
+  "accept": "Accept",
   "act-activity-notify": "Notifica attività",
   "act-addAttachment": "aggiunto allegato __attachment__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
   "act-deleteAttachment": "eliminato allegato __attachment__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "disattivato %s nella checklist %s di %s",
   "activity-checklist-added": "aggiunta checklist a %s",
   "activity-checklist-removed": "È stata rimossa una checklist da%s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "%s di %s checklists completate",
   "activity-checklist-uncompleted": "La checklist non è stata completata",
   "activity-checklist-item-added": "Aggiunto l'elemento checklist a '%s' in %s",
   "activity-checklist-item-removed": "è stato rimosso un elemento della checklist da '%s' in %s",
@@ -440,7 +440,7 @@
   "save": "Salva",
   "search": "Cerca",
   "rules": "Regole",
-  "search-cards": "Ricerca per titolo e descrizione scheda/lista su questa bacheca",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Testo da ricercare?",
   "select-color": "Seleziona Colore",
   "set-wip-limit-value": "Seleziona un limite per il massimo numero di attività in questa lista",
@@ -733,21 +733,21 @@
   "loading": "Loading, please wait.",
   "previous_as": "l'ultima volta è stata",
   "act-a-dueAt": "Scadenza modificata in __timeValue__\nData precedente: __timeOldValue__",
-  "act-a-endAt": "modified ending time to __timeValue__ from (__timeOldValue__)",
-  "act-a-startAt": "modified starting time to __timeValue__ from (__timeOldValue__)",
-  "act-a-receivedAt": "modified received time to __timeValue__ from (__timeOldValue__)",
-  "a-dueAt": "modified due time to be",
-  "a-endAt": "modified ending time to be",
-  "a-startAt": "modified starting time to be",
-  "a-receivedAt": "modified received time to be",
+  "act-a-endAt": "orario finale modificato in __timeValue__ (precedentemente: __timeOldValue__)",
+  "act-a-startAt": "orario iniziale modificato in __timeValue__ (precedentemente: __timeOldValue__)",
+  "act-a-receivedAt": "orario di ricezione modificato in __timeValue__ (precedentemente: __timeOldValue__)",
+  "a-dueAt": "scadenza modificata in",
+  "a-endAt": "orario finale modificato in",
+  "a-startAt": "orario iniziale modificato in",
+  "a-receivedAt": "orario di ricezione modificato in",
   "almostdue": "la data di scadenza attuale %s si sta avvicinando",
   "pastdue": "la data di scadenza attuale %s è scaduta",
   "duenow": "la data di scadenza attuale %s è oggi",
-  "act-newDue": "__list__/__card__ has 1st due reminder [__board__]",
-  "act-withDue": "__list__/__card__ due reminders [__board__]",
-  "act-almostdue": "was reminding the current due (__timeValue__) of __card__ is approaching",
-  "act-pastdue": "was reminding the current due (__timeValue__) of __card__ is past",
-  "act-duenow": "was reminding the current due (__timeValue__) of __card__ is now",
+  "act-newDue": "__list__/__card__ ha un 1° sollecito [__board__]",
+  "act-withDue": "sollecito relativo a __list__/__card__ [__board__]",
+  "act-almostdue": "sollecito inviato: la scadenza (__timeValue__) di __card__ è vicina",
+  "act-pastdue": "sollecito inviato: la scadenza (__timeValue__) di __card__ è già passata",
+  "act-duenow": "sollecito inviato: la scadenza (__timeValue__) di __card__ è adesso",
   "act-atUserComment": "Sei stato menzionato in [__board__] __list__/__card__",
   "delete-user-confirm-popup": "Sei sicuro di voler cancellare questo profilo? Non sarà possibile ripristinarlo.",
   "accounts-allowUserDelete": "Permetti agli utenti di cancellare il loro profilo",
@@ -762,7 +762,7 @@
   "newUserPopup-title": "Nuovo utente",
   "notifications": "Notifiche",
   "view-all": "Mostra Tutto",
-  "filter-by-unread": "Filtra per non Letto",
+  "filter-by-unread": "Filtra per non letto",
   "mark-all-as-read": "Segna come letto",
   "allow-rename": "Consenti Rinomina",
   "allowRenamePopup-title": "Consenti Rinomina"
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index 75ae43ea..99e742e6 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "チェックが外されました %s チェックリスト %s / %s",
   "activity-checklist-added": "%s にチェックリストを追加しました",
   "activity-checklist-removed": "チェックリストを %s から削除しました",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "チェックリスト%s / %s が完了しました",
   "activity-checklist-uncompleted": "チェックリスト %s / %s が未完了になりました",
   "activity-checklist-item-added": "チェックリスト項目を '%s' / %s に追加しました",
   "activity-checklist-item-removed": "'%s' の チェックリスト %s の項目を削除しました",
@@ -440,7 +440,7 @@
   "save": "保存",
   "search": "検索",
   "rules": "ルール",
-  "search-cards": "ボードのカード/リストのタイトルと詳細から検索",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "検索文字",
   "select-color": "色を選択",
   "set-wip-limit-value": "このリスト中のタスクの最大数を設定",
@@ -761,9 +761,9 @@
   "editUserPopup-title": "ユーザーを編集",
   "newUserPopup-title": "新規ユーザー",
   "notifications": "通知",
-  "view-all": "View All",
-  "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "view-all": "全てを表示",
+  "filter-by-unread": "未読でフィルタ",
+  "mark-all-as-read": "全て既読にする",
+  "allow-rename": "リネームを許可する",
+  "allowRenamePopup-title": "リネームを許可する"
 }
diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json
index 88fe76cd..1a5daebb 100644
--- a/i18n/ka.i18n.json
+++ b/i18n/ka.i18n.json
@@ -440,7 +440,7 @@
   "save": "დამახსოვრება",
   "search": "ძებნა",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "საძიებო ტექსტი",
   "select-color": "ფერის მონიშვნა",
   "set-wip-limit-value": "დააყენეთ შეზღუდვა  დავალებების მაქსიმალურ რაოდენობაზე ",
diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json
index bf6641df..5f146c2d 100644
--- a/i18n/km.i18n.json
+++ b/i18n/km.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index 41c687e8..1ff1f9b8 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -440,7 +440,7 @@
   "save": "저장",
   "search": "검색",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "색 선택",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json
index 52bc640a..9b7d2a01 100644
--- a/i18n/lv.i18n.json
+++ b/i18n/lv.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json
index c893ae09..bbd822f4 100644
--- a/i18n/mk.i18n.json
+++ b/i18n/mk.i18n.json
@@ -440,7 +440,7 @@
   "save": "Запази",
   "search": "Търсене",
   "rules": "Правила",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Избери цвят",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json
index bf9c9028..cd60c137 100644
--- a/i18n/mn.i18n.json
+++ b/i18n/mn.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json
index a99c2a26..a9b1a7b8 100644
--- a/i18n/nb.i18n.json
+++ b/i18n/nb.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index 82e3b875..9dc0a293 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -440,7 +440,7 @@
   "save": "Opslaan",
   "search": "Zoek",
   "rules": "Regels",
-  "search-cards": "Zoek op kaarten/lijsten en omschrijvingen op dit bord",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Tekst om naar te zoeken?",
   "select-color": "Selecteer kleur",
   "set-wip-limit-value": "Zet een limiet voor het maximaal aantal taken in deze lijst",
diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json
index 42dcfee3..210ba5cc 100644
--- a/i18n/oc.i18n.json
+++ b/i18n/oc.i18n.json
@@ -440,7 +440,7 @@
   "save": "Salvar",
   "search": "Cèrca",
   "rules": "Règlas",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Color causida",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 0457a557..4e7a8c74 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "odznaczono %s w liście zadań %s z %s",
   "activity-checklist-added": "dodał(a) listę zadań do %s",
   "activity-checklist-removed": "usunął listę zadań z %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "ukończono listę zadań %s z %s",
   "activity-checklist-uncompleted": "nieukończono listy zadań %s z %s",
   "activity-checklist-item-added": "dodał(a) zadanie '%s' do %s",
   "activity-checklist-item-removed": "usunął element z listy zadań '%s' w %s",
@@ -440,7 +440,7 @@
   "save": "Zapisz",
   "search": "Wyszukaj",
   "rules": "Reguły",
-  "search-cards": "Szukaj w tytułach kart/list oraz opisach na tej tablicy",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Czego mam szukać?",
   "select-color": "Wybierz kolor",
   "set-wip-limit-value": "Ustaw maksymalny limit zadań na tej liście",
@@ -760,10 +760,10 @@
   "new": "Nowy",
   "editUserPopup-title": "Edytuj użytkownika",
   "newUserPopup-title": "Nowy użytkownik",
-  "notifications": "Notifications",
-  "view-all": "View All",
-  "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "notifications": "Powiadomienia",
+  "view-all": "Wyświetl wszystko",
+  "filter-by-unread": "Filtruj nieprzeczytane",
+  "mark-all-as-read": "Zaznacz wszystkie jako przeczytane",
+  "allow-rename": "Zezwól na zmianę nazwy",
+  "allowRenamePopup-title": "Zezwól na zmianę nazwy"
 }
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index a2ca6c33..5dfafcc5 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "desmarcado %s na lista de verificação %s de %s",
   "activity-checklist-added": "Adicionada lista de verificação a %s",
   "activity-checklist-removed": "removida a lista de verificação de %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "listas de verificação completas %s de %s",
   "activity-checklist-uncompleted": "não-completada a lista de verificação %s de %s",
   "activity-checklist-item-added": "adicionado o item de lista de verificação para '%s' em %s",
   "activity-checklist-item-removed": "removida o item de lista de verificação de '%s' na %s",
@@ -440,7 +440,7 @@
   "save": "Salvar",
   "search": "Buscar",
   "rules": "Regras",
-  "search-cards": "Procurar por título e descrição de cartão/lista neste quadro ",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Texto para procurar",
   "select-color": "Selecionar Cor",
   "set-wip-limit-value": "Defina um limite máximo para o número de tarefas nesta lista",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index bf7fe7a2..bc150d0f 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -440,7 +440,7 @@
   "save": "Guardar",
   "search": "Procurar",
   "rules": "Regras",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Texto a procurar?",
   "select-color": "Seleccionar Cor",
   "set-wip-limit-value": "Defina um limite máximo para o número de tarefas nesta lista",
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 14cb571a..13f344b2 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -440,7 +440,7 @@
   "save": "Salvează",
   "search": "Caută",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index b8d6577d..ae1f540e 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "снял %s в контрольном списке %s в %s",
   "activity-checklist-added": "добавил контрольный список в %s",
   "activity-checklist-removed": "удалил контрольный список из %s",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "завершил чек-лист %s в %s",
   "activity-checklist-uncompleted": "вновь открыл контрольный список %s в %s",
   "activity-checklist-item-added": "добавил пункт в контрольный список '%s' в карточке %s",
   "activity-checklist-item-removed": "удалил пункт из контрольного списка '%s' в карточке %s",
@@ -309,7 +309,7 @@
   "list-sort-by": "Сортировать список по:",
   "list-label-modifiedAt": "Время последнего доступа",
   "list-label-title": "Название списка",
-  "list-label-sort": "Your Manual Order",
+  "list-label-sort": "Установленный вами порядок",
   "list-label-short-modifiedAt": "(L)",
   "list-label-short-title": "(N)",
   "list-label-short-sort": "(M)",
@@ -440,7 +440,7 @@
   "save": "Сохранить",
   "search": "Поиск",
   "rules": "Правила",
-  "search-cards": "Искать в названиях карточек, списков и описаниях карточек на этой доске",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Искать текст?",
   "select-color": "Выбрать цвет",
   "set-wip-limit-value": "Устанавливает ограничение на максимальное количество задач в этом списке",
@@ -743,7 +743,7 @@
   "almostdue": "текущий срок выполнения %s приближается",
   "pastdue": "текущий срок выполнения %s прошел",
   "duenow": "текущий срок выполнения %s сегодня",
-  "act-newDue": "__list__/__card__ has 1st due reminder [__board__]",
+  "act-newDue": "__list__/__card__ содержит 1-ое напоминание о сроке [__board__]",
   "act-withDue": "__list__/__card__ напоминания о сроке выполнения [__board__]",
   "act-almostdue": "напомнил, что скоро завершается срок выполнения (__timeValue__) карточки __card__",
   "act-pastdue": "напомнил, что срок выполнения (__timeValue__) карточки __card__ прошел",
@@ -752,18 +752,18 @@
   "delete-user-confirm-popup": "Вы уверены, что хотите удалить аккаунт? Данное действие необратимо.",
   "accounts-allowUserDelete": "Разрешить пользователям удалять собственные аккаунты",
   "hide-minicard-label-text": "Скрыть текст меток на карточках",
-  "show-desktop-drag-handles": "Show desktop drag handles",
+  "show-desktop-drag-handles": "Показать ярлыки для перетаскивания",
   "assignee": "Исполнитель",
   "cardAssigneesPopup-title": "Исполнитель",
   "addmore-detail": "Добавить более детальное описание",
   "show-on-card": "Показать на карточке",
-  "new": "New",
-  "editUserPopup-title": "Edit User",
-  "newUserPopup-title": "New User",
+  "new": "Новый",
+  "editUserPopup-title": "Редактировать пользователя",
+  "newUserPopup-title": "Новый пользователь",
   "notifications": "Уведомления",
-  "view-all": "View All",
-  "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "view-all": "Показать все",
+  "filter-by-unread": "Фильтр по непрочитанным",
+  "mark-all-as-read": "Отметить все как прочитанные",
+  "allow-rename": "Разрешить переименование",
+  "allowRenamePopup-title": "Разрешить переименование"
 }
diff --git a/i18n/sl.i18n.json b/i18n/sl.i18n.json
index 8638aea6..6c5f3504 100644
--- a/i18n/sl.i18n.json
+++ b/i18n/sl.i18n.json
@@ -440,7 +440,7 @@
   "save": "Shrani",
   "search": "Išči",
   "rules": "Pravila",
-  "search-cards": "Išči po imenih seznamov/kartic in opisov v tej tabli",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Besedilo za iskanje?",
   "select-color": "Izberi barvo",
   "set-wip-limit-value": "Omeji maksimalno število opravil v seznamu",
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index bea26ed0..795b6c92 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -440,7 +440,7 @@
   "save": "Snimi",
   "search": "Pretraga",
   "rules": "Rules",
-  "search-cards": "Pretraži naslove sa kartica/listi i opisa na ovoj tabli",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index 3ebba726..9082a223 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -440,7 +440,7 @@
   "save": "Spara",
   "search": "Sök",
   "rules": "Regler",
-  "search-cards": "Sök från kort-/listtitlar och beskrivningar på denna anslagstavla",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text att söka efter?",
   "select-color": "Välj färg",
   "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan",
diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json
index ae755922..31068ce8 100644
--- a/i18n/sw.i18n.json
+++ b/i18n/sw.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json
index 83243c9a..455679a8 100644
--- a/i18n/ta.i18n.json
+++ b/i18n/ta.i18n.json
@@ -440,7 +440,7 @@
   "save": "சேமி ",
   "search": "தேடு ",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json
index 35920f70..65ca118c 100644
--- a/i18n/th.i18n.json
+++ b/i18n/th.i18n.json
@@ -440,7 +440,7 @@
   "save": "บันทึก",
   "search": "ค้นหา",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index 5fc1a3d5..4e38a2e2 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -1,8 +1,8 @@
 {
   "accept": "Kabul Et",
   "act-activity-notify": "Etkinlik Bildirimi",
-  "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "act-addAttachment": "__attachment__ eklentisi, __swimlane__ kulvarındaki __list__ listesindeki __board__ panosundaki __card__ kartına eklendi.",
+  "act-deleteAttachment": "__attachment__ eklentisi, __swimlane__ kulvarındaki __list__ listesindeki __board__ panosundaki __card__ kartından silindi.",
   "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -440,7 +440,7 @@
   "save": "Kaydet",
   "search": "Arama",
   "rules": "Kurallar",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Aranılacak metin?",
   "select-color": "Renk Seç",
   "set-wip-limit-value": "Bu listedeki en fazla öğe sayısı için bir sınır belirleyin",
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index 284934e5..7be7094e 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json
index 5966ff22..678ea78b 100644
--- a/i18n/vi.i18n.json
+++ b/i18n/vi.i18n.json
@@ -440,7 +440,7 @@
   "save": "Save",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 6e610103..3f98a1f3 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "未勾选 %s  于清单 %s 共 %s",
   "activity-checklist-added": "已经将清单添加到 %s",
   "activity-checklist-removed": "已从%s移除待办清单",
-  "activity-checklist-completed": "completed checklist %s of %s",
+  "activity-checklist-completed": "完成清单%s共%s",
   "activity-checklist-uncompleted": "未完成清单 %s 共 %s",
   "activity-checklist-item-added": "添加清单项至'%s' 于 %s",
   "activity-checklist-item-removed": "已从 '%s' 于 %s中 移除一个清单项",
@@ -137,7 +137,7 @@
   "board-view": "看板视图",
   "board-view-cal": "日历",
   "board-view-swimlanes": "泳道图",
-  "board-view-collapse": "Collapse",
+  "board-view-collapse": "崩溃",
   "board-view-lists": "列表",
   "bucket-example": "例如 “目标清单”",
   "cancel": "取消",
@@ -223,8 +223,8 @@
   "comment-only-desc": "只能在卡片上评论。",
   "no-comments": "暂无评论",
   "no-comments-desc": "无法查看评论和活动。",
-  "worker": "Worker",
-  "worker-desc": "Can only move cards, assign itself to card and comment.",
+  "worker": "人员",
+  "worker-desc": "只能移动卡片，分配给卡片和评论",
   "computer": "从本机上传",
   "confirm-subtask-delete-dialog": "确定要删除子任务吗？",
   "confirm-checklist-delete-dialog": "确定要删除清单吗？",
@@ -440,7 +440,7 @@
   "save": "保存",
   "search": "搜索",
   "rules": "规则",
-  "search-cards": "搜索当前看板上的卡片/列表标题和描述",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "搜索",
   "select-color": "选择颜色",
   "set-wip-limit-value": "设置此列表中的最大任务数",
@@ -583,9 +583,9 @@
   "default": "缺省",
   "queue": "队列",
   "subtask-settings": "子任务设置",
-  "card-settings": "Card Settings",
+  "card-settings": "卡片设置",
   "boardSubtaskSettingsPopup-title": "看板子任务设置",
-  "boardCardSettingsPopup-title": "Card Settings",
+  "boardCardSettingsPopup-title": "卡片设置",
   "deposit-subtasks-board": "将子任务放入以下看板：",
   "deposit-subtasks-list": "将子任务放入以下列表：",
   "show-parent-in-minicard": "显示上一级卡片：",
@@ -755,15 +755,15 @@
   "show-desktop-drag-handles": "显示桌面拖放手柄",
   "assignee": "被指派人",
   "cardAssigneesPopup-title": "被指派人",
-  "addmore-detail": "Add a more detailed description",
-  "show-on-card": "Show on Card",
-  "new": "New",
-  "editUserPopup-title": "Edit User",
-  "newUserPopup-title": "New User",
+  "addmore-detail": "添加更详细的说明",
+  "show-on-card": "显示卡片",
+  "new": "新",
+  "editUserPopup-title": "修改用户",
+  "newUserPopup-title": "新用户",
   "notifications": "提示",
-  "view-all": "View All",
-  "filter-by-unread": "Filter by Unread",
-  "mark-all-as-read": "Mark all as read",
-  "allow-rename": "Allow Rename",
-  "allowRenamePopup-title": "Allow Rename"
+  "view-all": "查看全部",
+  "filter-by-unread": "过滤未读",
+  "mark-all-as-read": "标记全部已读",
+  "allow-rename": "允许重命名",
+  "allowRenamePopup-title": "允许重命名"
 }
diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json
index 1f9ab691..968fcda6 100644
--- a/i18n/zh-HK.i18n.json
+++ b/i18n/zh-HK.i18n.json
@@ -440,7 +440,7 @@
   "save": "儲存",
   "search": "Search",
   "rules": "Rules",
-  "search-cards": "Search from card/list titles and descriptions on this board",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "Text to search for?",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index f90c7b60..5745f52b 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -440,7 +440,7 @@
   "save": "儲存",
   "search": "搜尋",
   "rules": "規則",
-  "search-cards": "搜尋看板內的卡片標題及描述",
+  "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
   "search-example": "搜尋",
   "select-color": "選擇顏色",
   "set-wip-limit-value": "設定此清單中的最大任務數",
diff --git a/models/boards.js b/models/boards.js
index 8862f301..35ee1a36 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -806,7 +806,11 @@ Boards.helpers({
     if (term) {
       const regex = new RegExp(term, 'i');
 
-      query.$or = [{ title: regex }, { description: regex }];
+      query.$or = [
+        { title: regex },
+        { description: regex },
+        { customFields: { $elemMatch: { value: regex } } },
+      ];
     }
 
     return Cards.find(query, projection);