Merge remote-tracking branch 'upstream/devel' into devel

1 files changed, 13 insertions, 13 deletions

diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 238f9964..6cc43f03 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -37,7 +37,7 @@
     "archive-card": "Archive Card",
     "archive-list": "Archive this list",
     "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Close Board?",
+    "archiveBoardPopup-title": "Archive Board?",
     "archived-items": "Archived Items",
     "archives": "Archives",
     "assign-member": "Assign member",
@@ -91,17 +91,17 @@
     "clipboard" : "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You can re-open the board by clicking the “Boards” menu from the header, selecting “View Closed Boards”, finding the board and clicking “Re-open”.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "color-black": "black",
+    "color-blue": "blue",
     "color-green": "green",
-    "color-yellow": "yellow",
+    "color-lime": "lime",
     "color-orange": "orange",
-    "color-red": "red",
+    "color-pink": "pink",
     "color-purple": "purple",
-    "color-blue": "blue",
+    "color-red": "red",
     "color-sky": "sky",
-    "color-lime": "lime",
-    "color-pink": "pink",
-    "color-black": "black",
+    "color-yellow": "yellow",
     "comment": "Comment",
     "comment-placeholder": "Write a comment",
     "computer": "Computer",
@@ -135,9 +135,9 @@
     "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.\n",
     "email-resetPassword-subject": "Reset your password on __url__",
     "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.\n",
+    "email-sent": "Email sent",
     "email-verifyEmail-subject": "Verify your email address on __url__",
     "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.\n",
-    "email-sent": "Email sent",
     "error-board-doesNotExist": "This board does not exist",
     "error-board-notAdmin": "You need to be admin of this board to do that",
     "error-board-notAMember": "You need to be a member of this board to do that",
@@ -184,18 +184,18 @@
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
-    "listArchiveCardsPopup-title": "Archive All Cards in this List?",
     "listImportCardPopup-title": "Import a Trello card",
-    "listMoveCardsPopup-title": "Move All Cards in List",
     "lists": "Lists",
     "log-out": "Log Out",
     "loginPopup-title": "Log In",
-    "mapMembersPopup-title": "Map members",
     "mapMembersAddPopup-title": "Select Wekan member",
+    "mapMembersPopup-title": "Map members",
     "memberMenuPopup-title": "Member Settings",
     "members": "Members",
     "menu": "Menu",
+    "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
+    "moveSelectionPopup-title": "Move selection",
     "multi-selection": "Multi-Selection",
     "multi-selection-on": "Multi-Selection is on",
     "my-boards": "My Boards",
@@ -214,8 +214,8 @@
     "password": "Password",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
     "preview": "Preview",
-    "previewClipboardImagePopup-title": "Preview",
     "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
     "private": "Private",
     "private-desc": "This board is private. Only people added to the board can view and edit it.",
     "profile": "Profile",