summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-05-13 02:57:36 +0300
committerLauri Ojansivu <x@xet7.org>2020-05-13 02:57:36 +0300
commit85f254da38cb4008877832a338dbb100fe3b475d (patch)
treed79482cdf7d031d138d55774c7088a6b1ee03cd6 /i18n
parent1fe7394d05032f65d1f8e035d6d4cf1fc41d8d35 (diff)
parentec03bbe260e3a7e1298ac7cf526b41c7d2207e91 (diff)
downloadwekan-85f254da38cb4008877832a338dbb100fe3b475d.tar.gz
wekan-85f254da38cb4008877832a338dbb100fe3b475d.tar.bz2
wekan-85f254da38cb4008877832a338dbb100fe3b475d.zip
Merge branch 'master' of https://github.com/NicoP-S/wekan into NicoP-S-master
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.i18n.json12
1 files changed, 5 insertions, 7 deletions
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 11e7e2dd..06593b20 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -152,8 +152,6 @@
"card-spent": "Spent Time",
"card-edit-attachments": "Edit attachments",
"card-edit-custom-fields": "Edit custom fields",
- "card-start-voting": "Start voting",
- "card-cancel-voting": "Delete voting and all votes",
"card-edit-labels": "Edit labels",
"card-edit-members": "Edit members",
"card-labels-title": "Change the labels for the card.",
@@ -166,11 +164,15 @@
"cardStartVotingPopup-title": "Start a vote",
"positiveVoteMembersPopup-title": "Proponents",
"negativeVoteMembersPopup-title": "Opponents",
- "allowNonBoardMembers": "Allow anonymous vote on public board",
+ "card-edit-voting": "Edit voting",
+ "editVoteEndDatePopup-title": "Change vote end date",
+ "allowNonBoardMembers": "Allow all logged in users",
"vote-question": "Voting question",
"vote-public": "Show who voted what",
"vote-for-it": "for it",
"vote-against": "against",
+ "deleteVotePopup-title": "Delete vote?",
+ "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.",
"cardDeletePopup-title": "Delete Card?",
"cardDetailsActionsPopup-title": "Card Actions",
"cardLabelsPopup-title": "Labels",
@@ -642,8 +644,6 @@
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member",
"r-name": "name",
- "r-is": "is",
- "r-when-a-attach": "When an attachment",
"r-when-a-checklist": "When a checklist is",
"r-when-the-checklist": "When the checklist",
"r-completed": "Completed",
@@ -656,7 +656,6 @@
"r-top-of": "Top of",
"r-bottom-of": "Bottom of",
"r-its-list": "its list",
- "r-list": "list",
"r-archive": "Move to Archive",
"r-unarchive": "Restore from Archive",
"r-card": "card",
@@ -712,7 +711,6 @@
"r-swimlane-name": "swimlane name",
"r-board-note": "Note: leave a field empty to match every possible value. ",
"r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
- "r-added-to": "added to",
"r-when-a-card-is-moved": "When a card is moved to another list",
"r-set": "Set",
"r-update": "Update",