Merge branch 'devel' into greenkeeper/initial

1 files changed, 22 insertions, 0 deletions

diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index cf9e062f..52f8abbf 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -7,6 +7,7 @@
     "act-addComment": "درج نظر برای __card__: __comment__",
     "act-createBoard": "__board__ ایجاد شد",
     "act-createCard": "__card__  به __list__ اضافه شد",
+    "act-createCustomField": "created custom field __customField__",
     "act-createList": "__list__ به __board__ اضافه شد",
     "act-addBoardMember": "__member__ به __board__ اضافه شد",
     "act-archivedBoard": "__board__ moved to Recycle Bin",
@@ -30,6 +31,7 @@
     "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s به %s پیوست شد",
     "activity-created": "%s ایجاد شد",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "%s  از %s مستثنی گردید",
     "activity-imported": "%s از %s وارد %s شد",
     "activity-imported-board": "%s از %s وارد شد",
@@ -111,6 +113,7 @@
     "card-due-on": "مقتضی بر",
     "card-spent": "زمان صرف شده",
     "card-edit-attachments": "ویرایش ضمائم",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "ویرایش برچسب",
     "card-edit-members": "ویرایش اعضا",
     "card-labels-title": "تغییر برچسب کارت",
@@ -118,6 +121,8 @@
     "card-start": "شروع",
     "card-start-on": "شروع از",
     "cardAttachmentsPopup-title": "ضمیمه از",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "آیا می خواهید کارت را حذف کنید؟",
     "cardDetailsActionsPopup-title": "اعمال کارت",
     "cardLabelsPopup-title": "برچسب ها",
@@ -167,11 +172,25 @@
     "createBoardPopup-title": "ایجاد تخته",
     "chooseBoardSourcePopup-title": "بارگذاری تخته",
     "createLabelPopup-title": "ایجاد برچسب",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "جاری",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "تاریخ",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "تاریخ",
     "decline": "رد",
     "default-avatar": "تصویر پیش فرض",
     "delete": "حذف",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "آیا می خواهید برچسب را حذف کنید؟",
     "description": "توضیحات",
     "disambiguateMultiLabelPopup-title": "عمل ابهام زدایی از برچسب",
@@ -186,6 +205,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "تغییر تاریخ آغاز",
     "editCardDueDatePopup-title": "تغییر تاریخ بدلیل",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "تغییر زمان صرف شده",
     "editLabelPopup-title": "تغیر برچسب",
     "editNotificationPopup-title": "اصلاح اعلان",
@@ -366,6 +386,7 @@
     "title": "عنوان",
     "tracking": "پیگردی",
     "tracking-info": "شما از هرگونه تغییر در کارتهایی که بعنوان ایجاد کننده ویا عضو آن هستید، آگاه خواهید شد",
+    "type": "Type",
     "unassign-member": "عدم انتصاب کاربر",
     "unsaved-description": "شما توضیحات ذخیره نشده دارید.",
     "unwatch": "عدم دیده بانی",
@@ -430,6 +451,7 @@
     "hours": "ساعت",
     "minutes": "دقیقه",
     "seconds": "ثانیه",
+    "show-field-on-card": "Show this field on card",
     "yes": "بله",
     "no": "خیر",
     "accounts": "حساب‌ها",