Merge branch 'master' into lib-change

1 files changed, 58 insertions, 30 deletions

diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index 8eef94d0..09e44620 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.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 __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "activity-checklist-completed": "completed checklist %s of %s",
   "activity-checklist-uncompleted": "لم يتم انجاز قائمة التحقق %s من %s",
   "activity-checklist-item-added": "تم اضافة عنصر قائمة التحقق الى '%s' في %s",
   "activity-checklist-item-removed": "تم ازالة عنصر قائمة التحقق الى '%s' في %s",
@@ -74,12 +74,12 @@
   "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
   "activity-editComment": "edited comment %s",
-  "activity-deleteComment": "deleted comment %s",
+  "activity-deleteComment": "تعليق محذوف %s",
   "add-attachment": "إضافة مرفق",
   "add-board": "إضافة لوحة",
   "add-card": "إضافة بطاقة",
   "add-swimlane": "Add Swimlane",
-  "add-subtask": "Add Subtask",
+  "add-subtask": "إضافة مهمة فرعية",
   "add-checklist": "إضافة قائمة تدقيق",
   "add-checklist-item": "إضافة عنصر إلى قائمة التحقق",
   "add-cover": "إضافة غلاف",
@@ -111,8 +111,8 @@
   "restore-board": "استعادة اللوحة",
   "no-archived-boards": "لا توجد لوحات في الأرشيف.",
   "archives": "أرشيف",
-  "template": "Template",
-  "templates": "Templates",
+  "template": "نموذج",
+  "templates": "نماذج",
   "assign-member": "تعيين عضو",
   "attached": "أُرفق)",
   "attachment": "مرفق",
@@ -152,6 +152,8 @@
   "card-spent": "امضى وقتا",
   "card-edit-attachments": "تعديل المرفقات",
   "card-edit-custom-fields": "تعديل الحقل المعدل",
+  "card-start-voting": "ابدأ التصويت",
+  "card-cancel-voting": "حذف التصويت وجميع الأصوات",
   "card-edit-labels": "تعديل العلامات",
   "card-edit-members": "تعديل الأعضاء",
   "card-labels-title": "تعديل علامات البطاقة.",
@@ -161,6 +163,14 @@
   "cardAttachmentsPopup-title": "إرفاق من",
   "cardCustomField-datePopup-title": "تغير التاريخ",
   "cardCustomFieldsPopup-title": "تعديل الحقل المعدل",
+  "cardStartVotingPopup-title": "ابدأ تصويت",
+  "positiveVoteMembersPopup-title": "Proponents",
+  "negativeVoteMembersPopup-title": "Opponents",
+  "allowNonBoardMembers": "Allow anonymous vote on public board",
+  "vote-question": "Voting question",
+  "vote-public": "Show who voted what",
+  "vote-for-it": "مع",
+  "vote-against": "ضد",
   "cardDeletePopup-title": "حذف البطاقة ?",
   "cardDetailsActionsPopup-title": "إجراءات على البطاقة",
   "cardLabelsPopup-title": "علامات",
@@ -183,7 +193,7 @@
   "changePasswordPopup-title": "تغيير كلمة المرور",
   "changePermissionsPopup-title": "تعديل الصلاحيات",
   "changeSettingsPopup-title": "تغيير الاعدادات",
-  "subtasks": "Subtasks",
+  "subtasks": "المهمات الفرعية",
   "checklists": "قوائم التّدقيق",
   "click-to-star": "اضغط لإضافة اللوحة للمفضلة.",
   "click-to-unstar": "اضغط لحذف اللوحة من المفضلة.",
@@ -194,9 +204,9 @@
   "color-black": "black",
   "color-blue": "blue",
   "color-crimson": "crimson",
-  "color-darkgreen": "darkgreen",
-  "color-gold": "gold",
-  "color-gray": "gray",
+  "color-darkgreen": "اخضر غامق",
+  "color-gold": "ذهبي",
+  "color-gray": "رمادي",
   "color-green": "green",
   "color-indigo": "indigo",
   "color-lime": "lime",
@@ -211,17 +221,17 @@
   "color-purple": "purple",
   "color-red": "red",
   "color-saddlebrown": "saddlebrown",
-  "color-silver": "silver",
+  "color-silver": "فضي",
   "color-sky": "sky",
   "color-slateblue": "slateblue",
-  "color-white": "white",
+  "color-white": "أبيض",
   "color-yellow": "yellow",
   "unset-color": "Unset",
   "comment": "تعليق",
   "comment-placeholder": "أكتب تعليق",
   "comment-only": "التعليق فقط",
   "comment-only-desc": "يمكن التعليق على بطاقات فقط.",
-  "no-comments": "No comments",
+  "no-comments": "لا يوجد تعليقات",
   "no-comments-desc": "Can not see comments and activities.",
   "worker": "Worker",
   "worker-desc": "Can only move cards, assign itself to card and comment.",
@@ -239,8 +249,8 @@
   "createBoardPopup-title": "إنشاء لوحة",
   "chooseBoardSourcePopup-title": "استيراد لوحة",
   "createLabelPopup-title": "إنشاء علامة",
-  "createCustomField": "Create Field",
-  "createCustomFieldPopup-title": "Create Field",
+  "createCustomField": "انشاء حقل",
+  "createCustomFieldPopup-title": "انشاء حقل",
   "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",
@@ -250,8 +260,8 @@
   "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-field-number": "رقم",
+  "custom-field-text": "نص",
   "custom-fields": "Custom Fields",
   "date": "تاريخ",
   "decline": "Decline",
@@ -319,6 +329,7 @@
   "filter-clear": "مسح التصفية",
   "filter-no-label": "لا يوجد ملصق",
   "filter-no-member": "ليس هناك أي عضو",
+  "filter-no-assignee": "No assignee",
   "filter-no-custom-fields": "No Custom Fields",
   "filter-show-archive": "Show archived lists",
   "filter-hide-empty": "Hide empty lists",
@@ -333,13 +344,11 @@
   "headerBarCreateBoardPopup-title": "إنشاء لوحة",
   "home": "الرئيسية",
   "import": "Import",
-  "link": "Link",
+  "link": "رابط",
   "import-board": "استيراد لوحة",
   "import-board-c": "استيراد لوحة",
   "import-board-title-trello": "Import board from Trello",
   "import-board-title-wekan": "Import board from previous export",
-  "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
-  "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
   "from-trello": "من تريلو",
   "from-wekan": "From previous export",
   "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
@@ -440,7 +449,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",
@@ -466,15 +475,15 @@
   "this-board": "هذه اللوحة",
   "this-card": "هذه البطاقة",
   "spent-time-hours": "Spent time (hours)",
-  "overtime-hours": "Overtime (hours)",
-  "overtime": "Overtime",
+  "overtime-hours": "وقت اضافي (ساعات)",
+  "overtime": "وقت اضافي",
   "has-overtime-cards": "Has overtime cards",
   "has-spenttime-cards": "Has spent time cards",
   "time": "الوقت",
   "title": "عنوان",
   "tracking": "تتبع",
   "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
-  "type": "Type",
+  "type": "النوع",
   "unassign-member": "إلغاء تعيين العضو",
   "unsaved-description": "لديك وصف غير محفوظ",
   "unwatch": "غير مُشاهد",
@@ -548,7 +557,7 @@
   "OS_Totalmem": "الذاكرة الكلية لنظام التشغيل",
   "OS_Type": "نوع نظام التشغيل",
   "OS_Uptime": "مدة تشغيل نظام التشغيل",
-  "days": "days",
+  "days": "أيام",
   "hours": "الساعات",
   "minutes": "الدقائق",
   "seconds": "الثواني",
@@ -562,17 +571,17 @@
   "accounts-allowUserNameChange": "Allow Username Change",
   "createdAt": "Created at",
   "verified": "Verified",
-  "active": "Active",
+  "active": "نشط",
   "card-received": "Received",
   "card-received-on": "Received on",
   "card-end": "End",
   "card-end-on": "Ends on",
   "editCardReceivedDatePopup-title": "Change received date",
   "editCardEndDatePopup-title": "Change end date",
-  "setCardColorPopup-title": "Set color",
-  "setCardActionsColorPopup-title": "Choose a color",
-  "setSwimlaneColorPopup-title": "Choose a color",
-  "setListColorPopup-title": "Choose a color",
+  "setCardColorPopup-title": "حدد اللون",
+  "setCardActionsColorPopup-title": "اختر لوناً",
+  "setSwimlaneColorPopup-title": "اختر لوناً",
+  "setListColorPopup-title": "اختر لوناً",
   "assigned-by": "Assigned By",
   "requested-by": "Requested By",
   "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -665,6 +674,7 @@
   "r-of-checklist": "of checklist",
   "r-send-email": "Send an email",
   "r-to": "to",
+  "r-of": "of",
   "r-subject": "subject",
   "r-rule-details": "Rule details",
   "r-d-move-to-top-gen": "Move card to top of its list",
@@ -756,5 +766,23 @@
   "assignee": "Assignee",
   "cardAssigneesPopup-title": "Assignee",
   "addmore-detail": "Add a more detailed description",
-  "show-on-card": "Show on Card"
+  "show-on-card": "Show on Card",
+  "new": "New",
+  "editUserPopup-title": "Edit User",
+  "newUserPopup-title": "New User",
+  "notifications": "Notifications",
+  "view-all": "View All",
+  "filter-by-unread": "Filter by Unread",
+  "mark-all-as-read": "Mark all as read",
+  "remove-all-read": "Remove all read",
+  "allow-rename": "Allow Rename",
+  "allowRenamePopup-title": "Allow Rename",
+  "start-day-of-week": "Set day of the week start",
+  "monday": "Monday",
+  "tuesday": "Tuesday",
+  "wednesday": "Wednesday",
+  "thursday": "Thursday",
+  "friday": "Friday",
+  "saturday": "Saturday",
+  "sunday": "Sunday"
 }