Merge branch 'master' into lib-change

1 files changed, 33 insertions, 5 deletions

diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json
index 8480f287..49aa9691 100644
--- a/i18n/hi.i18n.json
+++ b/i18n/hi.i18n.json
@@ -64,7 +64,7 @@
   "activity-unchecked-item": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s of %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 of %s",
   "activity-checklist-item-added": "संकलित चिह्नांकन-सूची विषय तक '%s' अंदर में %s",
   "activity-checklist-item-removed": "हटा दिया एक चिह्नांकन-सूची विषय से '%s' अंदर में %s",
@@ -152,6 +152,8 @@
   "card-spent": "समय बिताया",
   "card-edit-attachments": "संपादित संलग्नक",
   "card-edit-custom-fields": "संपादित  प्रचलन  क्षेत्र",
+  "card-start-voting": "Start voting",
+  "card-cancel-voting": "Delete voting and all votes",
   "card-edit-labels": "संपादित नामपत्र",
   "card-edit-members": "संपादित सदस्य",
   "card-labels-title": "कार्ड के लिए नामपत्र परिवर्तित करें ।",
@@ -161,6 +163,14 @@
   "cardAttachmentsPopup-title": "से अनुलग्न करें",
   "cardCustomField-datePopup-title": "तारीख बदलें",
   "cardCustomFieldsPopup-title": "संपादित करें प्रचलन क्षेत्र",
+  "cardStartVotingPopup-title": "Start a vote",
+  "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": "for it",
+  "vote-against": "against",
   "cardDeletePopup-title": "मिटाएँ कार्ड?",
   "cardDetailsActionsPopup-title": "कार्ड क्रियाएँ",
   "cardLabelsPopup-title": "नामपत्र",
@@ -319,6 +329,7 @@
   "filter-clear": "Clear filter",
   "filter-no-label": "No label",
   "filter-no-member": "No सदस्य",
+  "filter-no-assignee": "No assignee",
   "filter-no-custom-fields": "No  प्रचलन  क्षेत्र",
   "filter-show-archive": "Show archived lists",
   "filter-hide-empty": "Hide empty lists",
@@ -338,8 +349,6 @@
   "import-board-c": "Import बोर्ड",
   "import-board-title-trello": "Import बोर्ड से 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": "सूचित कर बोर्ड will मिटाएँ संपूर्ण existing data on बोर्ड और replace it साथ में  सूचित कर बोर्ड.",
   "from-trello": "From Trello",
   "from-wekan": "From previous export",
   "import-board-instruction-trello": "In your Trello बोर्ड, go तक 'Menu', then 'More', 'Print और Export', 'Export JSON', और copy the resulting text.",
@@ -440,7 +449,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",
@@ -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": "स्थानांतरित कार्ड तक 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"
 }