v0.89

Thanks to zebby76 !

.eslintrc.json

@@ -131,6 +131,7 @@
     "AccountSettings": true,
     "Announcements": true,
     "Swimlanes": true,
+    "ChecklistItems": true,
     "Npm": true
   }
 }

.github/ISSUE_TEMPLATE.md

@@ -1,16 +1,16 @@
 ## Issue
-**Impacted version**: xxxx
 
 **Server Setup Information**:
 
 * Operating System:
-* Deployment Method(tar/sandstorm/snap/docker/etc /http frontend (nginx, httpd, ...)):
+* Deployment Method(snap/sandstorm/mongodb bundle):
+* Http frontend (Caddy, Nginx, Apache, see config examples from Wekan GitHub wiki first):
 * Node Version:
 * MongoDB Version:
-* ROOT_URL environment variable (Is there a subfolder?):
+* ROOT_URL environment variable http(s)://(subdomain).example.com(/suburl):
 
 **Problem description**:
 - *be as explicit as you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
-- *attach whatever information that can help understanding the context (screen capture, log files)*
+- *attach whatever information that can help understanding the context (screen capture, log files in .zip file)*

.meteor/packages

@@ -82,3 +82,5 @@ staringatlights:flow-router
 mixmax:smart-disconnect
 accounts-password@1.5.0
 cfs:gridfs
+browser-policy
+eluck:accounts-lockout

.meteor/versions

@@ -18,6 +18,10 @@ binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
 boilerplate-generator@1.3.1
+browser-policy@1.1.0
+browser-policy-common@1.0.11
+browser-policy-content@1.1.0
+browser-policy-framing@1.1.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
@@ -57,6 +61,7 @@ ecmascript-runtime@0.5.0
 ecmascript-runtime-client@0.5.0
 ecmascript-runtime-server@0.5.0
 ejson@1.1.0
+eluck:accounts-lockout@0.9.0
 email@1.2.3
 es5-shim@4.6.15
 fastclick@1.0.13

CHANGELOG.md

@@ -1,3 +1,127 @@
+# v0.89 2018-04-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Wekan import / Export for
+   ChecklistItems](https://github.com/wekan/wekan/commit/30b17ff6c92df07922f875071e864cf688902293).
+
+Thanks to Github user zebby76 for contributions.
+
+# v0.88 2018-04-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Trello import of ChecklistItems](https://github.com/wekan/wekan/pull/1611).
+
+Thanks to Github user zebby76 for contributions.
+
+# v0.87 2018-04-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Sandstorm: Copy Card, Move Card and Copy Checklist Template to Many Cards - No longer works in
+   menu](https://github.com/wekan/wekan/commit/db80e738048e2729917c5e8fc18cf8ee44df7992);
+- [Snap: Use override-build instead of old deprecated
+   prepare/build/install](https://github.com/wekan/wekan/commit/075ea1c43d827099e0030c750a4c156bd3340fed);
+- [Removed not-used plugins part of Caddy download
+   URL](https://github.com/wekan/wekan/commit/7b91b341fe9c0cde42f91bf14d228820653c883d).
+
+Thanks to GitHub users kyrofa and xet7 for their contributions.
+
+# v0.86 2018-04-20 Wekan release
+
+This release adds the following new features:
+
+- Updated translations: German and Turkish;
+- Updated Caddy to newest version for Snap.
+
+Thanks to translators and Caddy developers.
+
+# v0.85 2018-04-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Switch List/swimlane view only working with admin privileges](https://github.com/wekan/wekan/issues/1567);
+- [Fix Wekan logo positioning](https://github.com/wekan/wekan/issues/1378);
+- [Fix checklists items migration error "title is required"](https://github.com/wekan/wekan/issues/1576);
+- [Removed paxctl alpine fix #1303 , because it did not work anymore, so Docker container
+   did not build correctly](https://github.com/wekan/wekan/commit/ce659632174ba25ca9b5e85b053fde02fd9c3928);
+- [Use curl to download 100% CPU fibers fixed node in snap, and remove paxctl from
+   snap package](https://github.com/wekan/wekan/commit/179ff7a12457be1592f04e1bdc15a5bb4fe9d398).
+
+Thanks to GitHub users andresmanelli, iwkse and xet7 for their contributions.
+
+# v0.84 2018-04-16 Wekan release
+
+This release adds the following new features:
+
+- [Add Checklist Items REST API](https://github.com/wekan/wekan/commit/9eef5112dc1c1c30590d19fbfd2f615714112a3f).
+
+and fixes the following bugs:
+
+- [Fix Node Fibers 100% CPU issue](https://github.com/wekan/wekan/commit/e26a4824cfb119a15767c4827190a6b9ab65b904);
+- [Plus button on a Swimlane row, always add an element on the first row](https://github.com/wekan/wekan/issues/1577);
+- [Fix Checklist REST API](https://github.com/wekan/wekan/commit/9eef5112dc1c1c30590d19fbfd2f615714112a3f);
+- [Fix Disabling "show cards count" not possible, now zero means disable](https://github.com/wekan/wekan/issues/1570);
+- [Fix Checklist not copied when copied a card and Copy Checklist Template to Many Cards](https://github.com/wekan/wekan/issues/1565);
+- [Fix Filter cards hides checklist items](https://github.com/wekan/wekan/issues/1561).
+
+Thanks to GitHub users andresmanelli, kentonv and xet7 for their contributions.
+
+# v0.83 2018-04-12 Wekan release
+
+- Updated translations: Czech and French.
+
+Thanks to translators!
+
+# v0.82 2018-04-11 Wekan release
+
+- [Restore original font and font sizes. Admin panel people and version texts
+  to darker](https://github.com/wekan/wekan/commit/db74c86e555f45a5aaaef84d2f3d4128cec77782).
+
+Thanks to GitHub users apn3a and xet7 for their contributions.
+
+# v0.81 2018-04-10 Wekan release
+
+This release adds the following new features:
+
+- [Removed checkbox from checklist name to have more of material design look](https://github.com/wekan/wekan/issues/1568);
+- [Renamed Archives to Recycle Bin](https://github.com/wekan/wekan/issues/1429);
+- [Separate translations for cards in Recycle Bin and cards count](https://github.com/wekan/wekan/commit/49c7a6c223061b9c1769143fea32fecc7d0f3c3e);
+- [Use lighter and smaller font sizes](https://github.com/wekan/wekan/commit/7b94b0470198bc22b6a52db6661f35076f7c6388);
+- [Board title as markdown in board view](https://github.com/wekan/wekan/commit/7b94b0470198bc22b6a52db6661f35076f7c6388).
+
+and fixes the following bugs:
+
+- [Removed forcing "cards" translations to lowercase in count of cards](https://github.com/wekan/wekan/issues/1571).
+
+Thanks to GitHub users BruceZCQ, Chartman123, quantazelle and xet7 for their contributions.
+
+# v0.80 2018-04-04 Wekan release
+
+This release adds the following new features:
+
+- [Changed icon of checklist name to unchecked](https://github.com/wekan/wekan/pull/1559/commits/f9539aa2a8d806e5a158d1c32f74788d051d40cb);
+- [Added meteor packages](https://github.com/wekan/wekan/commit/40d438a517f0d807894e04873358aecf44fa7c4d)
+  for security: [browser-policy](https://atmospherejs.com/meteor/browser-policy) and
+  [eluck:accounts-lockout](https://atmospherejs.com/eluck/accounts-lockout).
+
+Thanks to GitHub users quantazelle and xet7 for their contributions.
+
+# v0.79 2018-03-31 Wekan release
+
+This release adds the following new features:
+
+- [Checklist items sort fix, and checklist sort capability](https://github.com/wekan/wekan/pull/1543);
+- [Add Received Date and End Date. Between them is already existing Start and Due Date](https://github.com/wekan/wekan/pull/1550).
+
+and fixes the following bugs:
+
+- [Fix drag in lists view](https://github.com/wekan/wekan/pull/1559/commits/679e50af6449a680f958256570e8b9f1944a3a92);
+- [Set fixed width for swimlane header](https://github.com/wekan/wekan/pull/1559/commits/2e8f8924dd0d985ae4634450cfbef04e88e5d954).
+
+Thanks to GitHub users andresmanelli, rjevnikar and xet7 for their contributions.
+
 # v0.78 2018-03-17 Wekan release
 
 This release adds the following new features:

Dockerfile

@@ -12,9 +12,10 @@ ARG ARCHITECTURE
 ARG SRC_PATH
 
 # Set the environment variables (defaults where required)
-# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
-ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl"
-ENV NODE_VERSION ${NODE_VERSION:-v8.9.3}
+# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
+# ENV BUILD_DEPS="paxctl"
+ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7"
+ENV NODE_VERSION ${NODE_VERSION:-v8.11.1}
 ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
 ENV USE_EDGE ${USE_EDGE:-false}
 ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
@@ -34,34 +35,47 @@ RUN \
     apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
     \
     # Download nodejs
-    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #---------------------------------------------------------------------------------------------
+    # Node Fibers 100% CPU usage issue:
+    # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+    # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+    # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+    # Also see beginning of wekan/server/authentication.js
+    #   import Fiber from "fibers";
+    #   Fiber.poolSize = 1e9;
+    # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+    # Description at https://releases.wekan.team/node.txt
+    # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
+    wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    echo "c85ed210a360c50d55baaf7b49419236e5241515ed21410d716f4c1f5deedb12  node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
     \
     # Verify nodejs authenticity
     grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
-    export GNUPGHOME="$(mktemp -d)" && \
-    \
+    #export GNUPGHOME="$(mktemp -d)" && \
+    #\
     # Try other key servers if ha.pool.sks-keyservers.net is unreachable
     # Code from https://github.com/chorrell/docker-node/commit/2b673e17547c34f17f24553db02beefbac98d23c
     # gpg keys listed at https://github.com/nodejs/node#release-team
     # and keys listed here from previous version of this Dockerfile
-    for key in \
-    9554F04D7259F04124DE6B476D5A82AC7E37093B \
-    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
-    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    ; do \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-    gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    done && \
-    gpg --verify SHASUMS256.txt.asc && \
+    #for key in \
+    #9554F04D7259F04124DE6B476D5A82AC7E37093B \
+    #94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    #FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    #71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    #DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    #C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    #B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    #; do \
+    #gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+    #gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+    #gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    #done && \
+    #gpg --verify SHASUMS256.txt.asc && \
     # Ignore socket files then delete files then delete directories
-    find "$GNUPGHOME" -type f | xargs rm -f && \
-    find "$GNUPGHOME" -type d | xargs rm -fR && \
+    #find "$GNUPGHOME" -type f | xargs rm -f && \
+    #find "$GNUPGHOME" -type d | xargs rm -fR && \
     rm -f SHASUMS256.txt.asc && \
     \
     # Install Node
@@ -71,8 +85,8 @@ RUN \
     ln -s /opt/nodejs/bin/node /usr/bin/node && \
     ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
     \
-    # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
-    paxctl -mC `which node` && \
+    #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
+    #paxctl -mC `which node` && \
     \
     # Install Node dependencies
     npm install -g npm@${NPM_VERSION} && \

client/components/boards/boardBody.js

@@ -87,15 +87,13 @@ BlazeComponent.extendComponent({
   },
 
   isViewSwimlanes() {
-    const currentBoardId = Session.get('currentBoard');
-    const board = Boards.findOne(currentBoardId);
-    return (board.view === 'board-view-swimlanes');
+    const currentUser = Meteor.user();
+    return (currentUser.profile.boardView === 'board-view-swimlanes');
   },
 
   isViewLists() {
-    const currentBoardId = Session.get('currentBoard');
-    const board = Boards.findOne(currentBoardId);
-    return (board.view === 'board-view-lists');
+    const currentUser = Meteor.user();
+    return (currentUser.profile.boardView === 'board-view-lists');
   },
 
   openNewListForm() {

client/components/boards/boardHeader.jade

@@ -2,7 +2,8 @@ template(name="boardHeaderBar")
   h1.header-board-menu
     with currentBoard
       a(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}")
-        = title
+        +viewer
+          = title
 
   .board-header-btns.left
     unless isMiniScreen
@@ -71,7 +72,7 @@ template(name="boardHeaderBar")
               title="{{_ 'log-in'}}")
               i.fa.fa-sign-in
               span {{_ 'log-in'}}
-              
+
       if isSandstorm
         if currentUser
           a.board-header-btn.js-open-archived-board
@@ -94,7 +95,7 @@ template(name="boardHeaderBar")
       a.board-header-btn.js-toggle-board-view(
         title="{{_ 'board-view'}}")
         i.fa.fa-th-large
-        span {{_ currentBoard.view}}
+        span {{_ currentUser.profile.boardView}}
 
       if canModifyBoard
         a.board-header-btn.js-multiselection-activate(

client/components/boards/boardHeader.js

@@ -77,19 +77,11 @@ BlazeComponent.extendComponent({
         Modal.open('archivedBoards');
       },
       'click .js-toggle-board-view'() {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        if (currentBoard.view === 'board-view-swimlanes') {
-          Boards.update(currentBoard._id, {
-            $set: {
-              view: 'board-view-lists',
-            },
-          });
-        } else if (currentBoard.view === 'board-view-lists') {
-          Boards.update(currentBoard._id, {
-            $set: {
-              view: 'board-view-swimlanes',
-            },
-          });
+        const currentUser = Meteor.user();
+        if (currentUser.profile.boardView === 'board-view-swimlanes') {
+          currentUser.setBoardView('board-view-lists');
+        } else if (currentUser.profile.boardView === 'board-view-lists') {
+          currentUser.setBoardView('board-view-swimlanes');
         }
       },
       'click .js-open-filter-view'() {

client/components/boards/boardsList.styl

@@ -44,9 +44,9 @@ $spaceBetweenTiles = 16px
     line-height: 22px
 
   .board-list-item-desc
-    color: rgba(255, 255, 255, .5)
+    color: #fff
     display: block
-    font-size: 10px
+    font-size: 14px
     font-weight: 400
     line-height: 18px
 

client/components/cards/cardDate.js

@@ -1,4 +1,4 @@
-// Edit start & due dates
+// Edit received, start, due & end dates
 const EditCardDate = BlazeComponent.extendComponent({
   template() {
     return 'editCardDate';
@@ -92,6 +92,23 @@ Template.dateBadge.helpers({
   },
 });
 
+// editCardReceivedDatePopup
+(class extends EditCardDate {
+  onCreated() {
+    super.onCreated();
+    this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
+  }
+
+  _storeDate(date) {
+    this.card.setReceived(date);
+  }
+
+  _deleteDate() {
+    this.card.unsetReceived();
+  }
+}).register('editCardReceivedDatePopup');
+
+
 // editCardStartDatePopup
 (class extends EditCardDate {
   onCreated() {
@@ -99,6 +116,13 @@ Template.dateBadge.helpers({
     this.data().startAt && this.date.set(moment(this.data().startAt));
   }
 
+  onRendered() {
+    super.onRendered();
+    if (moment.isDate(this.card.receivedAt)) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.receivedAt);
+    }
+  }
+
   _storeDate(date) {
     this.card.setStart(date);
   }
@@ -131,8 +155,31 @@ Template.dateBadge.helpers({
   }
 }).register('editCardDueDatePopup');
 
+// editCardEndDatePopup
+(class extends EditCardDate {
+  onCreated() {
+    super.onCreated();
+    this.data().endAt && this.date.set(moment(this.data().endAt));
+  }
 
-// Display start & due dates
+  onRendered() {
+    super.onRendered();
+    if (moment.isDate(this.card.startAt)) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+    }
+  }
+
+  _storeDate(date) {
+    this.card.setEnd(date);
+  }
+
+  _deleteDate() {
+    this.card.unsetEnd();
+  }
+}).register('editCardEndDatePopup');
+
+
+// Display received, start, due & end dates
 const CardDate = BlazeComponent.extendComponent({
   template() {
     return 'dateBadge';
@@ -161,6 +208,36 @@ const CardDate = BlazeComponent.extendComponent({
   },
 });
 
+class CardReceivedDate extends CardDate {
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.autorun(() => {
+      self.date.set(moment(self.data().receivedAt));
+    });
+  }
+
+  classes() {
+    let classes = 'received-date' + ' ';
+    if (this.date.get().isBefore(this.now.get(), 'minute') &&
+        this.now.get().isBefore(this.data().dueAt)) {
+      classes += 'current';
+    }
+    return classes;
+  }
+
+  showTitle() {
+    return `${TAPi18n.__('card-received-on')} ${this.date.get().format('LLLL')}`;
+  }
+
+  events() {
+    return super.events().concat({
+      'click .js-edit-date': Popup.open('editCardReceivedDate'),
+    });
+  }
+}
+CardReceivedDate.register('cardReceivedDate');
+
 class CardStartDate extends CardDate {
   onCreated() {
     super.onCreated();
@@ -223,6 +300,44 @@ class CardDueDate extends CardDate {
 }
 CardDueDate.register('cardDueDate');
 
+class CardEndDate extends CardDate {
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.autorun(() => {
+      self.date.set(moment(self.data().endAt));
+    });
+  }
+
+  classes() {
+    let classes = 'end-date' + ' ';
+    if (this.data.dueAt.diff(this.date.get(), 'days') >= 2)
+      classes += 'long-overdue';
+    else if (this.data.dueAt.diff(this.date.get(), 'days') >= 0)
+      classes += 'due';
+    else if (this.data.dueAt.diff(this.date.get(), 'days') >= -2)
+      classes += 'almost-due';
+    return classes;
+  }
+
+  showTitle() {
+    return `${TAPi18n.__('card-end-on')} ${this.date.get().format('LLLL')}`;
+  }
+
+  events() {
+    return super.events().concat({
+      'click .js-edit-date': Popup.open('editCardEndDate'),
+    });
+  }
+}
+CardEndDate.register('cardEndDate');
+
+(class extends CardReceivedDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}).register('minicardReceivedDate');
+
 (class extends CardStartDate {
   showDate() {
     return this.date.get().format('l');
@@ -234,3 +349,10 @@ CardDueDate.register('cardDueDate');
     return this.date.get().format('l');
   }
 }).register('minicardDueDate');
+
+(class extends CardEndDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}).register('minicardEndDate');
+

client/components/cards/cardDate.styl

@@ -49,6 +49,11 @@
     &:hover, &.is-active
       background-color: darken(#fd5d47, 7)
 
+  &.end-date
+    time
+      &::before
+        content: "\f253"  // symbol: fa-hourglass-end
+
   &.due-date
     time
       &::before
@@ -59,6 +64,11 @@
       &::before
         content: "\f08b"  // symbol: fa-sign-out
 
+  &.received-date
+    time
+      &::before
+        content: "\f251"  // symbol: fa-hourglass-start
+
   time
     &::before
       font: normal normal normal 14px/1 FontAwesome

client/components/cards/cardDetails.jade

@@ -17,6 +17,35 @@ template(name="cardDetails")
     if archived
       p.warning {{_ 'card-archived'}}
 
+    .card-details-items
+      .card-details-item.card-details-item-received
+        h3.card-details-item-title {{_ 'card-received'}}
+        if receivedAt
+          +cardReceivedDate
+        else
+          a.js-received-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-start
+        h3.card-details-item-title {{_ 'card-start'}}
+        if startAt
+          +cardStartDate
+        else
+          a.js-start-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-due
+        h3.card-details-item-title {{_ 'card-due'}}
+        if dueAt
+          +cardDueDate
+        else
+          a.js-due-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-end
+        h3.card-details-item-title {{_ 'card-end'}}
+        if endAt
+          +cardEndDate
+        else
+          a.js-end-date {{_ 'add'}}
+
     .card-details-items
       .card-details-item.card-details-item-members
         h3.card-details-item-title {{_ 'members'}}
@@ -36,16 +65,6 @@ template(name="cardDetails")
           a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
             i.fa.fa-plus
 
-      if startAt
-        .card-details-item.card-details-item-start
-          h3.card-details-item-title {{_ 'card-start'}}
-          +cardStartDate
-
-      if dueAt
-        .card-details-item.card-details-item-due
-          h3.card-details-item-title {{_ 'card-due'}}
-          +cardDueDate
-
     .card-details-items
       if spentTime
         .card-details-item.card-details-item-spent
@@ -86,7 +105,7 @@ template(name="cardDetails")
     +checklists(cardId = _id)
 
     hr
-    h2
+    h3
       i.fa.fa-paperclip
       | {{_ 'attachments'}}
 
@@ -94,7 +113,7 @@ template(name="cardDetails")
 
     hr
     .activity-title
-      h2 {{ _ 'activity'}}
+      h3 {{ _ 'activity'}}
       if currentUser.isBoardMember
         .material-toggle-switch
           span.toggle-switch-title {{_ 'hide-system-messages'}}
@@ -124,8 +143,10 @@ template(name="cardDetailsActionsPopup")
       li: a.js-members {{_ 'card-edit-members'}}
       li: a.js-labels {{_ 'card-edit-labels'}}
       li: a.js-attachments {{_ 'card-edit-attachments'}}
+      li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
       li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
       li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
       li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
     hr
     ul.pop-over-list
@@ -141,29 +162,20 @@ template(name="cardDetailsActionsPopup")
       li: a.js-more {{_ 'cardMorePopup-title'}}
 
 template(name="moveCardPopup")
-  if isSandstorm
-    +boardLists
-  else
-    +boardsAndLists
+  +boardsAndLists
 
 template(name="copyCardPopup")
   label(for='copy-card-title') {{_ 'title'}}:
   textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
     = title
-  if isSandstorm
-    +boardLists
-  else
-    +boardsAndLists
+  +boardsAndLists
 
 
 template(name="copyChecklistToManyCardsPopup")
   label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}:
   textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
     | {{_ 'copyChecklistToManyCardsPopup-format'}}
-  if isSandstorm
-    +boardLists
-  else
-    +boardsAndLists
+  +boardsAndLists
 
 template(name="boardsAndLists")
   label {{_ 'boards'}}:

client/components/cards/cardDetails.js

@@ -1,4 +1,5 @@
 const subManager = new SubsManager();
+const { calculateIndexData } = Utils;
 
 BlazeComponent.extendComponent({
   mixins() {
@@ -66,6 +67,51 @@ BlazeComponent.extendComponent({
 
   onRendered() {
     if (!Utils.isMiniScreen()) this.scrollParentContainer();
+    const $checklistsDom = this.$('.card-checklist-items');
+
+    $checklistsDom.sortable({
+      tolerance: 'pointer',
+      helper: 'clone',
+      handle: '.checklist-title',
+      items: '.js-checklist',
+      placeholder: 'checklist placeholder',
+      distance: 7,
+      start(evt, ui) {
+        ui.placeholder.height(ui.helper.height());
+        EscapeActions.executeUpTo('popup-close');
+      },
+      stop(evt, ui) {
+        let prevChecklist = ui.item.prev('.js-checklist').get(0);
+        if (prevChecklist) {
+          prevChecklist = Blaze.getData(prevChecklist).checklist;
+        }
+        let nextChecklist = ui.item.next('.js-checklist').get(0);
+        if (nextChecklist) {
+          nextChecklist = Blaze.getData(nextChecklist).checklist;
+        }
+        const sortIndex = calculateIndexData(prevChecklist, nextChecklist, 1);
+
+        $checklistsDom.sortable('cancel');
+        const checklist = Blaze.getData(ui.item.get(0)).checklist;
+
+        Checklists.update(checklist._id, {
+          $set: {
+            sort: sortIndex.base,
+          },
+        });
+      },
+    });
+
+    function userIsMember() {
+      return Meteor.user() && Meteor.user().isBoardMember();
+    }
+
+    // Disable sorting if the current user is not a board member
+    this.autorun(() => {
+      if ($checklistsDom.data('sortable')) {
+        $checklistsDom.sortable('option', 'disabled', !userIsMember());
+      }
+    });
   },
 
   onDestroyed() {
@@ -103,6 +149,10 @@ BlazeComponent.extendComponent({
       'click .js-member': Popup.open('cardMember'),
       'click .js-add-members': Popup.open('cardMembers'),
       'click .js-add-labels': Popup.open('cardLabels'),
+      'click .js-received-date': Popup.open('editCardReceivedDate'),
+      'click .js-start-date': Popup.open('editCardStartDate'),
+      'click .js-due-date': Popup.open('editCardDueDate'),
+      'click .js-end-date': Popup.open('editCardEndDate'),
       'mouseenter .js-card-details' () {
         this.parentComponent().parentComponent().showOverlay.set(true);
         this.parentComponent().parentComponent().mouseHasEnterCardDetails = true;
@@ -165,8 +215,10 @@ Template.cardDetailsActionsPopup.events({
   'click .js-members': Popup.open('cardMembers'),
   'click .js-labels': Popup.open('cardLabels'),
   'click .js-attachments': Popup.open('cardAttachments'),
+  'click .js-received-date': Popup.open('editCardReceivedDate'),
   'click .js-start-date': Popup.open('editCardStartDate'),
   'click .js-due-date': Popup.open('editCardDueDate'),
+  'click .js-end-date': Popup.open('editCardEndDate'),
   'click .js-spent-time': Popup.open('editCardSpentTime'),
   'click .js-move-card': Popup.open('moveCard'),
   'click .js-copy-card': Popup.open('copyCard'),
@@ -291,9 +343,16 @@ Template.copyCardPopup.events({
       cursor.forEach(function() {
         'use strict';
         const checklist = arguments[0];
+        const checklistId = checklist._id;
         checklist.cardId = _id;
         checklist._id = null;
-        Checklists.insert(checklist);
+        const newChecklistId = Checklists.insert(checklist);
+        ChecklistItems.find({checklistId}).forEach(function(item) {
+          item._id = null;
+          item.checklistId = newChecklistId;
+          item.cardId = _id;
+          ChecklistItems.insert(item);
+        });
       });
 
       // copy card comments
@@ -311,17 +370,20 @@ Template.copyCardPopup.events({
 });
 
 Template.copyChecklistToManyCardsPopup.events({
-  'click .js-select-list' (evt) {
+  'click .js-done' () {
     const card = Cards.findOne(Session.get('currentCard'));
     const oldId = card._id;
     card._id = null;
-    card.listId = this._id;
-    const list = Lists.findOne(card.listId);
-    card.boardId = list.boardId;
-    const textarea = $(evt.currentTarget).parents('.content').find('textarea');
+    const lSelect = $('.js-select-lists')[0];
+    card.listId = lSelect.options[lSelect.selectedIndex].value;
+    const slSelect = $('.js-select-swimlanes')[0];
+    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    const bSelect = $('.js-select-boards')[0];
+    card.boardId = bSelect.options[bSelect.selectedIndex].value;
+    const textarea = $('#copy-card-title');
     const titleEntry = textarea.val().trim();
     // insert new card to the bottom of new list
-    card.sort = Lists.findOne(this._id).cards().count();
+    card.sort = Lists.findOne(card.listId).cards().count();
 
     if (titleEntry) {
       const titleList = JSON.parse(titleEntry);
@@ -342,9 +404,16 @@ Template.copyChecklistToManyCardsPopup.events({
         cursor.forEach(function() {
           'use strict';
           const checklist = arguments[0];
+          const checklistId = checklist._id;
           checklist.cardId = _id;
           checklist._id = null;
-          Checklists.insert(checklist);
+          const newChecklistId = Checklists.insert(checklist);
+          ChecklistItems.find({checklistId}).forEach(function(item) {
+            item._id = null;
+            item.checklistId = newChecklistId;
+            item.cardId = _id;
+            ChecklistItems.insert(item);
+          });
         });
 
         // copy card comments

client/components/cards/cardDetails.styl

@@ -77,14 +77,16 @@
         margin-right: 0
       &.card-details-item-labels,
       &.card-details-item-members,
+      &.card-details-item-received,
       &.card-details-item-start,
-      &.card-details-item-due
+      &.card-details-item-due,
+      &.card-details-item-end
         width: 50%
         flex-shrink: 1
 
   .card-details-item-title
-    font-size: 14px
-    color: darken(white, 45%)
+    font-size: 16px
+    color: #000
 
   .card-label
     padding-top: 5px

client/components/cards/checklists.jade

@@ -1,5 +1,5 @@
 template(name="checklists")
-  h2 {{_ 'checklists'}}
+  h3 {{_ 'checklists'}}
   if toggleDeleteDialog.get
     .board-overlay#card-details-overlay
     +checklistDeleteDialog(checklist = checklistToDelete)
@@ -18,24 +18,25 @@ template(name="checklists")
         | {{_ 'add-checklist'}}...
 
 template(name="checklistDetail")
-  +inlinedForm(classNames="js-edit-checklist-title" checklist = checklist)
-    +editChecklistItemForm(checklist = checklist)
-  else
-    .checklist-title
-      .checkbox.fa.fa-check-square-o
-      if canModifyCard
-        a.js-delete-checklist.toggle-delete-checklist-dialog {{_ "delete"}}...
+  .js-checklist.checklist
+    +inlinedForm(classNames="js-edit-checklist-title" checklist = checklist)
+      +editChecklistItemForm(checklist = checklist)
+    else
+      .checklist-title
+        span
+        if canModifyCard
+          a.js-delete-checklist.toggle-delete-checklist-dialog {{_ "delete"}}...
 
-      span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}}
-      if canModifyCard
-        h2.title.js-open-inlined-form.is-editable
-          +viewer
-            = checklist.title
-      else
-        h2.title
-          +viewer
+        span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}}
+        if canModifyCard
+          h2.title.js-open-inlined-form.is-editable
+            +viewer
               = checklist.title
-  +checklistItems(checklist = checklist)
+        else
+          h2.title
+            +viewer
+                = checklist.title
+    +checklistItems(checklist = checklist)
 
 template(name="checklistDeleteDialog")
   .js-confirm-checklist-delete
@@ -70,7 +71,7 @@ template(name="editChecklistItemForm")
 
 template(name="checklistItems")
   .checklist-items.js-checklist-items
-    each item in checklist.getItemsSorted
+    each item in checklist.items
       +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist)
         +editChecklistItemForm(type = 'item' item = item checklist = checklist)
       else
@@ -84,7 +85,7 @@ template(name="checklistItems")
           | {{_ 'add-checklist-item'}}...
 
 template(name='itemDetail')
-  .item.js-checklist-item
+  .js-checklist-item.checklist-item
     if canModifyCard
       .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
       .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")

client/components/cards/checklists.js

@@ -1,11 +1,14 @@
+const { calculateIndexData } = Utils;
+
 function initSorting(items) {
   items.sortable({
     tolerance: 'pointer',
     helper: 'clone',
     items: '.js-checklist-item:not(.placeholder)',
-    axis: 'y',
+    connectWith: '.js-checklist-items',
+    appendTo: '.board-canvas',
     distance: 7,
-    placeholder: 'placeholder',
+    placeholder: 'checklist-item placeholder',
     scroll: false,
     start(evt, ui) {
       ui.placeholder.height(ui.helper.height());
@@ -13,57 +16,54 @@ function initSorting(items) {
     },
     stop(evt, ui) {
       const parent = ui.item.parents('.js-checklist-items');
-      const orderedItems = [];
-      parent.find('.js-checklist-item').each(function(i, item) {
-        const checklistItem = Blaze.getData(item).item;
-        orderedItems.push(checklistItem._id);
-      });
-      items.sortable('cancel');
-      const formerParent = ui.item.parents('.js-checklist-items');
-      const checklist = Blaze.getData(parent.get(0)).checklist;
-      const oldChecklist = Blaze.getData(formerParent.get(0)).checklist;
-      if (oldChecklist._id !== checklist._id) {
-        const currentItem = Blaze.getData(ui.item.get(0)).item;
-        for (let i = 0; i < orderedItems.length; i++) {
-          const itemId = orderedItems[i];
-          if (itemId !== currentItem._id) continue;
-          const newItem = {
-            _id: checklist.getNewItemId(),
-            title: currentItem.title,
-            sort: i,
-            isFinished: currentItem.isFinished,
-          };
-          checklist.addFullItem(newItem);
-          orderedItems[i] = currentItem._id;
-          oldChecklist.removeItem(itemId);
-        }
-      } else {
-        checklist.sortItems(orderedItems);
+      const checklistId = Blaze.getData(parent.get(0)).checklist._id;
+      let prevItem = ui.item.prev('.js-checklist-item').get(0);
+      if (prevItem) {
+        prevItem = Blaze.getData(prevItem).item;
       }
+      let nextItem = ui.item.next('.js-checklist-item').get(0);
+      if (nextItem) {
+        nextItem = Blaze.getData(nextItem).item;
+      }
+      const nItems = 1;
+      const sortIndex = calculateIndexData(prevItem, nextItem, nItems);
+      const checklistDomElement = ui.item.get(0);
+      const checklistData = Blaze.getData(checklistDomElement);
+      const checklistItem = checklistData.item;
+
+      items.sortable('cancel');
+
+      checklistItem.move(checklistId, sortIndex.base);
     },
   });
 }
 
-Template.checklists.onRendered(function () {
-  const self = BlazeComponent.getComponentForElement(this.firstNode);
-  self.itemsDom = this.$('.card-checklist-items');
-  initSorting(self.itemsDom);
-  self.itemsDom.mousedown(function(evt) {
-    evt.stopPropagation();
-  });
+BlazeComponent.extendComponent({
+  onRendered() {
+    const self = this;
+    self.itemsDom = this.$('.js-checklist-items');
+    initSorting(self.itemsDom);
+    self.itemsDom.mousedown(function(evt) {
+      evt.stopPropagation();
+    });
 
-  function userIsMember() {
-    return Meteor.user() && Meteor.user().isBoardMember();
-  }
-
-  // Disable sorting if the current user is not a board member
-  self.autorun(() => {
-    const $itemsDom = $(self.itemsDom);
-    if ($itemsDom.data('sortable')) {
-      $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
+    function userIsMember() {
+      return Meteor.user() && Meteor.user().isBoardMember();
     }
-  });
-});
+
+    // Disable sorting if the current user is not a board member
+    self.autorun(() => {
+      const $itemsDom = $(self.itemsDom);
+      if ($itemsDom.data('sortable')) {
+        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
+      }
+    });
+  },
+
+  canModifyCard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+}).register('checklistDetail');
 
 BlazeComponent.extendComponent({
 
@@ -95,7 +95,12 @@ BlazeComponent.extendComponent({
     const checklist = this.currentData().checklist;
 
     if (title) {
-      checklist.addItem(title);
+      ChecklistItems.insert({
+        title,
+        checklistId: checklist._id,
+        cardId: checklist.cardId,
+        sort: checklist.itemCount(),
+      });
     }
     // We keep the form opened, empty it.
     textarea.value = '';
@@ -118,7 +123,7 @@ BlazeComponent.extendComponent({
     const checklist = this.currentData().checklist;
     const item = this.currentData().item;
     if (checklist && item && item._id) {
-      checklist.removeItem(item._id);
+      ChecklistItems.remove(item._id);
     }
   },
 
@@ -135,9 +140,8 @@ BlazeComponent.extendComponent({
 
     const textarea = this.find('textarea.js-edit-checklist-item');
     const title = textarea.value.trim();
-    const itemId = this.currentData().item._id;
-    const checklist = this.currentData().checklist;
-    checklist.editItem(itemId, title);
+    const item = this.currentData().item;
+    item.setTitle(title);
   },
 
   onCreated() {
@@ -211,12 +215,12 @@ BlazeComponent.extendComponent({
     const checklist = this.currentData().checklist;
     const item = this.currentData().item;
     if (checklist && item && item._id) {
-      checklist.toggleItem(item._id);
+      item.toggleItem();
     }
   },
   events() {
     return [{
-      'click .item .check-box': this.toggleItem,
+      'click .js-checklist-item .check-box': this.toggleItem,
     }];
   },
 }).register('itemDetail');

client/components/cards/checklists.styl

@@ -78,34 +78,60 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
   bottom: -600px
   right: 0
 
-.checklist-items
+.checklist
+  background: darken(white, 3%)
+
+  &.placeholder
+    background: darken(white, 20%)
+    border-radius: 2px
+
+  &.ui-sortable-helper
+    box-shadow: -2px 2px 8px rgba(0, 0, 0, .3),
+                0 0 1px rgba(0, 0, 0, .5)
+    transform: rotate(4deg)
+    cursor: grabbing
+
+
+.checklist-item
   margin: 0 0 0.5em 1.33em
+  line-height: 25px
+  font-size: 1.1em
+  margin-top: 3px
+  display: flex
+  background: darken(white, 3%)
 
-  .item
-    line-height: 25px
-    font-size: 1.1em
-    margin-top: 3px
-    display: flex
-    &:hover
-      background-color: darken(white, 8%)
+  &.placeholder
+    background: darken(white, 20%)
+    border-radius: 2px
 
-    .check-box
-      margin-top: 5px
-      &.is-checked
-        border-bottom: 2px solid #3cb500
-        border-right: 2px solid #3cb500
+  &.ui-sortable-helper
+    box-shadow: -2px 2px 8px rgba(0, 0, 0, .3),
+                0 0 1px rgba(0, 0, 0, .5)
+    transform: rotate(4deg)
+    cursor: grabbing
 
-    .item-title
-      flex: 1
-      padding-left: 10px;
-      &.is-checked
-        color: #8c8c8c
-        font-style: italic
+  &:hover
+    background-color: darken(white, 8%)
 
-  .js-delete-checklist-item
-    @extends .delete-text
-    padding: 12px 0 0 0
+  .check-box
+    margin-top: 5px
+    &.is-checked
+      border-bottom: 2px solid #3cb500
+      border-right: 2px solid #3cb500
 
-  .add-checklist-item
-    padding-top: 0.5em
-    display: inline-block
+  .item-title
+    flex: 1
+    padding-left: 10px;
+    &.is-checked
+      color: #8c8c8c
+      font-style: italic
+
+.js-delete-checklist-item
+  margin: 0 0 0.5em 1.33em
+  @extends .delete-text
+  padding: 12px 0 0 0
+
+.add-checklist-item
+  margin: 0 0 0.5em 1.33em
+  padding-top: 0.5em
+  display: inline-block

client/components/lists/listBody.js

@@ -37,11 +37,11 @@ BlazeComponent.extendComponent({
     const labelIds = formComponent.labels.get();
 
     const boardId = this.data().board()._id;
-    const board = Boards.findOne(boardId);
     let swimlaneId = '';
-    if (board.view === 'board-view-swimlanes')
+    const boardView = Meteor.user().profile.boardView;
+    if (boardView === 'board-view-swimlanes')
       swimlaneId = this.parentComponent().parentComponent().data()._id;
-    else
+    else if (boardView === 'board-view-lists')
       swimlaneId = Swimlanes.findOne({boardId})._id;
 
     if (title) {
@@ -106,8 +106,8 @@ BlazeComponent.extendComponent({
   },
 
   idOrNull(swimlaneId) {
-    const board = Boards.findOne(Session.get('currentBoard'));
-    if (board.view === 'board-view-swimlanes')
+    const currentUser = Meteor.user();
+    if (currentUser.profile.boardView === 'board-view-swimlanes')
       return swimlaneId;
     return undefined;
   },

client/components/lists/listHeader.jade

@@ -16,8 +16,8 @@ template(name="listHeader")
 
         if showCardsCountForList cards.count
           = cards.count
-          span.lowercase
-            |  {{_ 'cards'}}
+          span
+            |  {{_ 'cards-count'}}
       if isMiniScreen
         if currentList
           if isWatching

client/components/lists/listHeader.js

@@ -28,14 +28,15 @@ BlazeComponent.extendComponent({
   },
 
   showCardsCountForList(count) {
-    return count > this.limitToShowCardsCount();
+    const limit = this.limitToShowCardsCount();
+    return limit > 0 && count > limit;
   },
 
   events() {
     return [{
       'click .js-open-list-menu': Popup.open('listAction'),
-      'click .js-add-card' () {
-        const listDom = document.getElementById(`js-list-${this.currentData()._id}`);
+      'click .js-add-card' (evt) {
+        const listDom = $(evt.target).parents(`#js-list-${this.currentData()._id}`)[0];
         const listComponent = BlazeComponent.getComponentForElement(listDom);
         listComponent.openForm({
           position: 'top',

client/components/lists/listsGroup.js

@@ -1,13 +0,0 @@
-BlazeComponent.extendComponent({
-  currentCardIsInThisList(listId, swimlaneId) {
-    const currentCard = Cards.findOne(Session.get('currentCard'));
-    const currentBoardId = Session.get('currentBoard');
-    const board = Boards.findOne(currentBoardId);
-    if (board.view === 'board-view-lists')
-      return currentCard && currentCard.listId === listId;
-    else if (board.view === 'board-view-swimlanes')
-      return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-    else
-      return false;
-  },
-}).register('listsGroup');

client/components/main/header.styl

@@ -29,13 +29,12 @@
         font-size: 0.9em
         margin-right: 10px
 
-
     .wekan-logo
-      display: block
-      margin: 3px auto 0
+      margin: 3px auto auto
       width: 97px
       opacity: 0.6
       transition: opacity 0.15s
+      float: right
 
       &:hover
         opacity: 0.9

client/components/settings/peopleBody.styl

@@ -2,9 +2,9 @@
   overflow: scroll;
 
 table
-  font-family: arial, sans-serif;
   border-collapse: collapse;
   width: 100%;
+  color: #000;
 
   td, th
     border: 1px solid #d2d0d0;

client/components/settings/settingHeader.styl

@@ -22,4 +22,4 @@
   + span
     display: inline-block
     margin-top: 1px
-    margin-right: 10px
+    margin-right: 10px

client/components/swimlanes/swimlanes.js

@@ -1,5 +1,84 @@
 const { calculateIndex } = Utils;
 
+function currentCardIsInThisList(listId, swimlaneId) {
+  const currentCard = Cards.findOne(Session.get('currentCard'));
+  const currentUser = Meteor.user();
+  if (currentUser.profile.boardView === 'board-view-lists')
+    return currentCard && currentCard.listId === listId;
+  else if (currentUser.profile.boardView === 'board-view-swimlanes')
+    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+  else
+    return false;
+}
+
+function initSortable(boardComponent, $listsDom) {
+  // We want to animate the card details window closing. We rely on CSS
+  // transition for the actual animation.
+  $listsDom._uihooks = {
+    removeElement(node) {
+      const removeNode = _.once(() => {
+        node.parentNode.removeChild(node);
+      });
+      if ($(node).hasClass('js-card-details')) {
+        $(node).css({
+          flexBasis: 0,
+          padding: 0,
+        });
+        $listsDom.one(CSSEvents.transitionend, removeNode);
+      } else {
+        removeNode();
+      }
+    },
+  };
+
+  $listsDom.sortable({
+    tolerance: 'pointer',
+    helper: 'clone',
+    handle: '.js-list-header',
+    items: '.js-list:not(.js-list-composer)',
+    placeholder: 'list placeholder',
+    distance: 7,
+    start(evt, ui) {
+      ui.placeholder.height(ui.helper.height());
+      EscapeActions.executeUpTo('popup-close');
+      boardComponent.setIsDragging(true);
+    },
+    stop(evt, ui) {
+      // To attribute the new index number, we need to get the DOM element
+      // of the previous and the following card -- if any.
+      const prevListDom = ui.item.prev('.js-list').get(0);
+      const nextListDom = ui.item.next('.js-list').get(0);
+      const sortIndex = calculateIndex(prevListDom, nextListDom, 1);
+
+      $listsDom.sortable('cancel');
+      const listDomElement = ui.item.get(0);
+      const list = Blaze.getData(listDomElement);
+
+      Lists.update(list._id, {
+        $set: {
+          sort: sortIndex.base,
+        },
+      });
+
+      boardComponent.setIsDragging(false);
+    },
+  });
+
+  function userIsMember() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  }
+
+  // Disable drag-dropping while in multi-selection mode, or if the current user
+  // is not a board member
+  boardComponent.autorun(() => {
+    const $listDom = $listsDom;
+    if ($listDom.data('sortable')) {
+      $listsDom.sortable('option', 'disabled',
+        MultiSelection.isActive() || !userIsMember());
+    }
+  });
+}
+
 BlazeComponent.extendComponent({
   onRendered() {
     const boardComponent = this.parentComponent();
@@ -9,71 +88,7 @@ BlazeComponent.extendComponent({
       boardComponent.scrollLeft();
     }
 
-    // We want to animate the card details window closing. We rely on CSS
-    // transition for the actual animation.
-    $listsDom._uihooks = {
-      removeElement(node) {
-        const removeNode = _.once(() => {
-          node.parentNode.removeChild(node);
-        });
-        if ($(node).hasClass('js-card-details')) {
-          $(node).css({
-            flexBasis: 0,
-            padding: 0,
-          });
-          $listsDom.one(CSSEvents.transitionend, removeNode);
-        } else {
-          removeNode();
-        }
-      },
-    };
-
-    $listsDom.sortable({
-      tolerance: 'pointer',
-      helper: 'clone',
-      handle: '.js-list-header',
-      items: '.js-list:not(.js-list-composer)',
-      placeholder: 'list placeholder',
-      distance: 7,
-      start(evt, ui) {
-        ui.placeholder.height(ui.helper.height());
-        EscapeActions.executeUpTo('popup-close');
-        boardComponent.setIsDragging(true);
-      },
-      stop(evt, ui) {
-        // To attribute the new index number, we need to get the DOM element
-        // of the previous and the following card -- if any.
-        const prevListDom = ui.item.prev('.js-list').get(0);
-        const nextListDom = ui.item.next('.js-list').get(0);
-        const sortIndex = calculateIndex(prevListDom, nextListDom, 1);
-
-        $listsDom.sortable('cancel');
-        const listDomElement = ui.item.get(0);
-        const list = Blaze.getData(listDomElement);
-
-        Lists.update(list._id, {
-          $set: {
-            sort: sortIndex.base,
-          },
-        });
-
-        boardComponent.setIsDragging(false);
-      },
-    });
-
-    function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
-    }
-
-    // Disable drag-dropping while in multi-selection mode, or if the current user
-    // is not a board member
-    boardComponent.autorun(() => {
-      const $listDom = $listsDom;
-      if ($listDom.data('sortable')) {
-        $listsDom.sortable('option', 'disabled',
-          MultiSelection.isActive() || !userIsMember());
-      }
-    });
+    initSortable(boardComponent, $listsDom);
   },
   onCreated() {
     this.draggingActive = new ReactiveVar(false);
@@ -87,15 +102,7 @@ BlazeComponent.extendComponent({
   },
 
   currentCardIsInThisList(listId, swimlaneId) {
-    const currentCard = Cards.findOne(Session.get('currentCard'));
-    const currentBoardId = Session.get('currentBoard');
-    const board = Boards.findOne(currentBoardId);
-    if (board.view === 'board-view-lists')
-      return currentCard && currentCard.listId === listId;
-    else if (board.view === 'board-view-swimlanes')
-      return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-    else
-      return false;
+    return currentCardIsInThisList(listId, swimlaneId);
   },
 
   events() {
@@ -210,3 +217,19 @@ Template.swimlane.helpers({
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 });
+
+BlazeComponent.extendComponent({
+  currentCardIsInThisList(listId, swimlaneId) {
+    return currentCardIsInThisList(listId, swimlaneId);
+  },
+  onRendered() {
+    const boardComponent = this.parentComponent();
+    const $listsDom = this.$('.js-lists');
+
+    if (!Session.get('currentCard')) {
+      boardComponent.scrollLeft();
+    }
+
+    initSortable(boardComponent, $listsDom);
+  },
+}).register('listsGroup');

client/components/swimlanes/swimlanes.styl

@@ -39,7 +39,7 @@
       margin-top: 50px;
       font-weight: bold;
       min-height: 9px;
-      min-width: 30px;
+      width: 50px;
       overflow: hidden;
       -o-text-overflow: ellipsis;
       text-overflow: ellipsis;

client/components/users/userHeader.jade

@@ -86,5 +86,5 @@ template(name="changeSettingsPopup")
     li
       label.bold
         | {{_ 'show-cards-minimum-count'}}
-      input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="1" max="99" onkeydown="return false")
+      input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
       input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}")

client/lib/utils.js

@@ -33,6 +33,37 @@ Utils = {
     return $(window).width() <= 800;
   },
 
+  calculateIndexData(prevData, nextData, nItems = 1) {
+    let base, increment;
+    // If we drop the card to an empty column
+    if (!prevData && !nextData) {
+      base = 0;
+      increment = 1;
+    // If we drop the card in the first position
+    } else if (!prevData) {
+      base = nextData.sort - 1;
+      increment = -1;
+    // If we drop the card in the last position
+    } else if (!nextData) {
+      base = prevData.sort + 1;
+      increment = 1;
+    }
+    // In the general case take the average of the previous and next element
+    // sort indexes.
+    else {
+      const prevSortIndex = prevData.sort;
+      const nextSortIndex = nextData.sort;
+      increment = (nextSortIndex - prevSortIndex) / (nItems + 1);
+      base = prevSortIndex + increment;
+    }
+    // XXX Return a generator that yield values instead of a base with a
+    // increment number.
+    return {
+      base,
+      increment,
+    };
+  },
+
   // Determine the new sort index
   calculateIndex(prevCardDomElement, nextCardDomElement, nCards = 1) {
     let base, increment;

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
   wekandb:
-    image: mongo:3.2.18
+    image: mongo:3.2.19
     container_name: wekan-db
     restart: always
     command: mongod --smallfiles --oplogSize 128
@@ -16,7 +16,7 @@ services:
       - wekan-db-dump:/dump
 
   wekan:
-    image: wekanteam/wekan:latest
+    image: quay.io/wekan/wekan
     container_name: wekan-app
     restart: always
     networks:

i18n/ar.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "اضاف __card__ الى __list__",
     "act-createList": "اضاف __list__ الى __board__",
     "act-addBoardMember": "اضاف __member__ الى __board__",
-    "act-archivedBoard": "قام بأرشفة __board__",
-    "act-archivedCard": "قام بأرشفة __card__",
-    "act-archivedList": "قام بأرشفة __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "إستورد __board__",
     "act-importCard": "إستورد __card__",
     "act-importList": "إستورد __list__",
@@ -27,7 +27,7 @@
     "activities": "الأنشطة",
     "activity": "النشاط",
     "activity-added": "تمت إضافة %s ل %s",
-    "activity-archived": "إلى الأرشيف %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "إرفاق %s ل %s",
     "activity-created": "أنشأ %s",
     "activity-excluded": "استبعاد %s عن %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other بطاقات",
     "apply": "طبق",
     "app-is-offline": "يتمّ تحميل ويكان، يرجى الانتظار. سيؤدي تحديث الصفحة إلى فقدان البيانات. إذا لم يتم تحميل ويكان، يرجى التحقق من أن خادم ويكان لم يتوقف. ",
-    "archive": "أرشيف",
-    "archive-all": "أرشيف الكل",
-    "archive-board": "أرشيف اللوحة",
-    "archive-card": "أرشيف البطاقة",
-    "archive-list": "قائمة الأرشيفات",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "أرشف المُحدّد",
-    "archiveBoardPopup-title": "أرشيف اللوحة ؟",
-    "archived-items": "عناصر مؤرشفة",
-    "archived-boards": "لوحات مؤرشفة",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "استعادة اللوحة",
-    "no-archived-boards": "لا توجد لوحات مؤرشفة.",
-    "archives": "أرشيفات",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "تعيين عضو",
     "attached": "أُرفق)",
     "attachment": "مرفق",
@@ -102,11 +102,11 @@
     "board-view-lists": "القائمات",
     "bucket-example": "مثل « todo list » على سبيل المثال",
     "cancel": "إلغاء",
-    "card-archived": "هذه البطاقة أُرشفت.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "%s تعليقات لهذه البطاقة",
     "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
     "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
-    "card-delete-suggest-archive": "يمكنك أرشفة بطاقة لحذفها من اللوحة والمحافظة على النشاط.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "مستحق",
     "card-due-on": "مستحق في",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "أعضاء",
     "cardMorePopup-title": "المزيد",
     "cards": "بطاقات",
+    "cards-count": "بطاقات",
     "change": "Change",
     "change-avatar": "تعديل الصورة الشخصية",
     "change-password": "تغيير كلمة المرور",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "غلق",
     "close-board": "غلق اللوحة",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "مغادرة اللوحة ؟",
     "link-card": "ربط هذه البطاقة",
-    "list-archive-cards": "أرضفت بطاقات هذه القائمة",
-    "list-archive-cards-pop": "سيقتضي هذا أرشفة جميع بطاقات هذه القائمة. لمشاهدة أرشيف البطاقات أو إعادتها إلى اللوحة، اضغط على -القائمة- ثم - أرشيف العناصر-",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "نقل بطاقات هذه القائمة",
     "list-select-cards": "تحديد بطاقات هذه القائمة",
     "listActionPopup-title": "قائمة الإجراءات",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "المزيد",
     "link-list": "رابط إلى هذه القائمة",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "يمكنك أرشفة قائمة لحذفها من اللوحة والمحافظة على النشاط.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "القائمات",
     "swimlanes": "Swimlanes",
     "log-out": "تسجيل الخروج",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "لوحاتي",
     "name": "اسم",
-    "no-archived-cards": "لا توجد بطاقات مؤرشفة.",
-    "no-archived-lists": "لا توجد قوائم مؤرشفة.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "لا توجد نتائج",
     "normal": "عادي",
     "normal-desc": "يمكن مشاهدة و تعديل  البطاقات. لا يمكن تغيير إعدادات الضبط.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "تم رفع الصورة الشخصية",
     "username": "اسم المستخدم",
     "view-it": "شاهدها",
-    "warn-list-archived": "انتبه : هذه البطاقة في أرشيف القائمات",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "مُشاهد",
     "watching": "مشاهدة",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "السماح بتغيير البريد الإلكتروني",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/bg.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Действия",
     "activity": "Дейности",
     "activity-added": "добави %s към %s",
-    "activity-archived": "архивира %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "прикачи %s към %s",
     "activity-created": "създаде %s",
     "activity-excluded": "изключи %s от %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Приложи",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Архив",
-    "archive-all": "Архивирай всички",
-    "archive-board": "Архивирай дъската",
-    "archive-card": "Архивирай картата",
-    "archive-list": "Архивирай списъка",
-    "archive-swimlane": "Архивирай коридора",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Архиви",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "прикачен",
     "attachment": "Прикаченн файл",
@@ -102,11 +102,11 @@
     "board-view-lists": "Списъци",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "Тази карта е архивирана",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Тази карта има %s коментар.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Готова за",
     "card-due-on": "Готова за",
     "card-spent": "Изработено време",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Членове",
     "cardMorePopup-title": "Още",
     "cards": "Карти",
+    "cards-count": "Карти",
     "change": "Change",
     "change-avatar": "Промени аватара",
     "change-password": "Промени паролата",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Архивирай всички карти в този списък",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Премести всички карти в този списък",
     "list-select-cards": "Избери всички карти в този списък",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Още",
     "link-list": "Връзка към този списък",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Списъци",
     "swimlanes": "Коридори",
     "log-out": "Изход",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Моите дъски",
     "name": "Име",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Качихте аватар",
     "username": "Потребителско име",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Наблюдавай",
     "watching": "Наблюдава",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Разреши промяна на имейла",
     "createdAt": "Създаден на",
     "verified": "Потвърден",
-    "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"
 }

i18n/br.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Oberiantizoù",
     "activity": "Oberiantiz",
     "activity-added": "%s ouzhpennet da %s",
-    "activity-archived": "%s diellaouet",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s liammet ouzh %s",
     "activity-created": "%s krouet",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Izili",
     "cardMorePopup-title": "Muioc’h",
     "cards": "Kartennoù",
+    "cards-count": "Kartennoù",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Kemmañ ger-tremen",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "du",
     "color-blue": "glas",
     "color-green": "gwer",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Muioc’h",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/ca.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "afegit/da __card__ a __list__",
     "act-createList": "afegit/da __list__ a __board__",
     "act-addBoardMember": "afegit/da __member__ a __board__",
-    "act-archivedBoard": "__board__ arxivat",
-    "act-archivedCard": "__card__ arxivat/da",
-    "act-archivedList": "__list__ arxivat/da",
-    "act-archivedSwimlane": "arxivada __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "__board__ importat",
     "act-importCard": "__card__ importat",
     "act-importList": "__list__ importat",
@@ -27,7 +27,7 @@
     "activities": "Activitats",
     "activity": "Activitat",
     "activity-added": "ha afegit %s a %s",
-    "activity-archived": "ha arxivat %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "ha adjuntat %s a %s",
     "activity-created": "ha creat %s",
     "activity-excluded": "ha exclòs %s de %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Aplica",
     "app-is-offline": "Wekan s'està carregant, esperau si us plau. Refrescar la pàgina causarà la pérdua de les dades. Si Wekan no carrega, verificau que el servei de Wekan no estigui aturat",
-    "archive": "Desa",
-    "archive-all": "Desa Tot",
-    "archive-board": "Arxiva tauler",
-    "archive-card": "Arxiva fitxa",
-    "archive-list": "Arxiva llista",
-    "archive-swimlane": "Arxiva Carril de Natació",
-    "archive-selection": "Arxiva selecció",
-    "archiveBoardPopup-title": "Arxivar el tauler?",
-    "archived-items": "Elements arxivats",
-    "archived-boards": "Taulers Arxivats",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restaura Tauler",
-    "no-archived-boards": "Taulers no arxivats",
-    "archives": "Arxivats",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assignar membre",
     "attached": "adjuntat",
     "attachment": "Adjunt",
@@ -102,11 +102,11 @@
     "board-view-lists": "Llistes",
     "bucket-example": "Igual que “Bucket List”,  per exemple",
     "cancel": "Cancel·la",
-    "card-archived": "Aquesta fitxa està arxivada.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Aquesta fitxa té %s comentaris.",
     "card-delete-notice": "L'esborrat és permanent. Perdreu totes les accions associades a aquesta fitxa.",
     "card-delete-pop": "Totes les accions s'eliminaran de l'activitat i no podreu tornar a obrir la fitxa. No es pot desfer.",
-    "card-delete-suggest-archive": "Podeu arxivar una fitxa per extreure-la del tauler i preservar l'activitat.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Finalitza",
     "card-due-on": "Finalitza a",
     "card-spent": "Temps Dedicat",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membres",
     "cardMorePopup-title": "Més",
     "cards": "Fitxes",
+    "cards-count": "Fitxes",
     "change": "Canvia",
     "change-avatar": "Canvia Avatar",
     "change-password": "Canvia la clau",
@@ -140,7 +141,7 @@
     "clipboard": "Portaretalls o estirar i amollar",
     "close": "Tanca",
     "close-board": "Tanca tauler",
-    "close-board-pop": "Podràs restaurar el tauler, seleccionant \"Arxivats\" de la finistra principal",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "negre",
     "color-blue": "blau",
     "color-green": "verd",
@@ -263,8 +264,8 @@
     "leave-board-pop": "De debò voleu abandonar __boardTitle__? Se us eliminarà de totes les fitxes d'aquest tauler.",
     "leaveBoardPopup-title": "Abandonar Tauler?",
     "link-card": "Enllaç a aquesta fitxa",
-    "list-archive-cards": "Arxiva totes les fitxes d'aquesta llista",
-    "list-archive-cards-pop": "Això eliminarà totes les fitxes d'aquesta llista del tauler. Per veure les fitxes arxivades i recuperar-les en el tauler, feu clic a \" Menú \"/ \" Articles Arxivat \".",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Mou totes les fitxes d'aquesta llista",
     "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
     "listActionPopup-title": "Accions de la llista",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Més",
     "link-list": "Enllaça a aquesta llista",
     "list-delete-pop": "Totes les accions seran esborrades de la llista d'activitats i no serà possible recuperar la llista",
-    "list-delete-suggest-archive": "Pots arxivar una llista per eliminar-la del tauler i preservar la seva activitat",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Llistes",
     "swimlanes": "Carrils de Natació",
     "log-out": "Finalitza la  sessió",
@@ -293,9 +294,9 @@
     "muted-info": "No seràs notificat dels canvis en aquest tauler",
     "my-boards": "Els meus taulers",
     "name": "Nom",
-    "no-archived-cards": "No hi ha fitxes arxivades.",
-    "no-archived-lists": "No hi ha llistes arxivades.",
-    "no-archived-swimlanes": "Cap Carril de Natació arxivat",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Sense resultats",
     "normal": "Normal",
     "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar actualitzat",
     "username": "Nom d'Usuari",
     "view-it": "Vist",
-    "warn-list-archived": "Avís: aquesta fitxa està en una llista arxivada",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Observa",
     "watching": "En observació",
     "watching-info": "Seràs notificat de cada canvi en aquest tauler",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Permet modificar correu electrònic",
     "createdAt": "Creat ",
     "verified": "Verificat",
-    "active": "Actiu"
+    "active": "Actiu",
+    "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"
 }

i18n/cs.i18n.json

@@ -2,17 +2,17 @@
     "accept": "Přijmout",
     "act-activity-notify": "[Wekan] Notifikace aktivit",
     "act-addAttachment": "přiložen __attachment__ do __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
+    "act-addChecklist": "přidán checklist __checklist__ do __card__",
+    "act-addChecklistItem": "přidán __checklistItem__ do checklistu __checklist__ v __card__",
     "act-addComment": "komentář k __card__: __comment__",
     "act-createBoard": "přidání __board__",
     "act-createCard": "přidání __card__ do __list__",
     "act-createList": "přidání __list__ do __board__",
     "act-addBoardMember": "přidání __member__ do __board__",
-    "act-archivedBoard": "archivace __board__",
-    "act-archivedCard": "archivace __card__",
-    "act-archivedList": "archivace __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ bylo přesunuto do koše",
+    "act-archivedCard": "__card__ bylo přesunuto do koše",
+    "act-archivedList": "__list__ bylo přesunuto do koše",
+    "act-archivedSwimlane": "__swimlane__ bylo přesunuto do koše",
     "act-importBoard": "import __board__",
     "act-importCard": "import __card__",
     "act-importList": "import __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktivity",
     "activity": "Aktivita",
     "activity-added": "%s přidáno k %s",
-    "activity-archived": "%s archivováno",
+    "activity-archived": "%s bylo přesunuto do koše",
     "activity-attached": "přiloženo %s k %s",
     "activity-created": "%s vytvořeno",
     "activity-excluded": "%s vyjmuto z %s",
@@ -45,7 +45,7 @@
     "add-attachment": "Přidat přílohu",
     "add-board": "Přidat tablo",
     "add-card": "Přidat kartu",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "Přidat Swimlane",
     "add-checklist": "Přidat zaškrtávací seznam",
     "add-checklist-item": "Přidat položku do zaškrtávacího seznamu",
     "add-cover": "Přidat obal",
@@ -56,27 +56,27 @@
     "addMemberPopup-title": "Členové",
     "admin": "Administrátor",
     "admin-desc": "Může zobrazovat a upravovat karty, mazat členy a měnit nastavení tabla.",
-    "admin-announcement": "Announcement",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
+    "admin-announcement": "Oznámení",
+    "admin-announcement-active": "Aktivní oznámení v celém systému",
+    "admin-announcement-title": "Oznámení od administrátora",
     "all-boards": "Všechna tabla",
     "and-n-other-card": "A __count__ další karta(y)",
     "and-n-other-card_plural": "A __count__ dalších karet",
     "apply": "Použít",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archiv",
-    "archive-all": "Archivovat vše",
-    "archive-board": "Archivovat tablo",
-    "archive-card": "Archivovat kartu",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archivovat výběr",
-    "archiveBoardPopup-title": "Archivovat tablo?",
-    "archived-items": "Archivované položky",
-    "archived-boards": "Archivaná tabla",
+    "app-is-offline": "Wekan se načítá, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se Wekan nenačte, zkontrolujte prosím, jestli se server s Wekanem nezastavil.",
+    "archive": "Přesunout do koše",
+    "archive-all": "Přesunout všechno do koše",
+    "archive-board": "Přesunout tablo do koše",
+    "archive-card": "Přesunout kartu do koše",
+    "archive-list": "Přesunout seznam do koše",
+    "archive-swimlane": "Přesunout swimlane do koše",
+    "archive-selection": "Přesunout výběr do koše",
+    "archiveBoardPopup-title": "Chcete přesunout tablo do koše?",
+    "archived-items": "Koš",
+    "archived-boards": "Tabla v koši",
     "restore-board": "Obnovit tablo",
-    "no-archived-boards": "Žádná archivovaná tabla",
-    "archives": "Archivy",
+    "no-archived-boards": "Žádná tabla v koši",
+    "archives": "Koš",
     "assign-member": "Přiřadit člena",
     "attached": "přiloženo",
     "attachment": "Příloha",
@@ -94,22 +94,22 @@
     "boardChangeColorPopup-title": "Změnit pozadí tabla",
     "boardChangeTitlePopup-title": "Přejmenovat tablo",
     "boardChangeVisibilityPopup-title": "Upravit viditelnost",
-    "boardChangeWatchPopup-title": "Change Watch",
+    "boardChangeWatchPopup-title": "Změnit sledování",
     "boardMenuPopup-title": "Menu tabla",
     "boards": "Tabla",
-    "board-view": "Board View",
+    "board-view": "Náhled tabla",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Seznamy",
     "bucket-example": "Například \"Než mě odvedou\"",
     "cancel": "Zrušit",
-    "card-archived": "Tato karta je archivována.",
+    "card-archived": "Karta byla přesunuta do koše.",
     "card-comments-title": "Tato karta má %s komentářů.",
     "card-delete-notice": "Smazání je trvalé. Přijdete o všechny akce asociované s touto kartou.",
     "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu znovu otevřít. Toto nelze vrátit zpět.",
-    "card-delete-suggest-archive": "Kartu můžete archivovat a tím ji odstranit z tabla a přitom zachovat aktivity.",
+    "card-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
     "card-due": "Termín",
     "card-due-on": "Do",
-    "card-spent": "Spent Time",
+    "card-spent": "Strávený čas",
     "card-edit-attachments": "Upravit přílohy",
     "card-edit-labels": "Upravit štítky",
     "card-edit-members": "Upravit členy",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Členové",
     "cardMorePopup-title": "Více",
     "cards": "Karty",
+    "cards-count": "Karty",
     "change": "Změnit",
     "change-avatar": "Změnit avatar",
     "change-password": "Změnit heslo",
@@ -140,7 +141,7 @@
     "clipboard": "Schránka nebo potáhnout a pustit",
     "close": "Zavřít",
     "close-board": "Zavřít tablo",
-    "close-board-pop": "Budete moci obnovit tablo kliknutím na tlačítko \"Archivy\" v hlavním menu.",
+    "close-board-pop": "Kliknutím na tlačítko \"Recyklovat\" budete moci obnovit tablo z koše.",
     "color-black": "černá",
     "color-blue": "modrá",
     "color-green": "zelená",
@@ -153,21 +154,21 @@
     "color-yellow": "žlutá",
     "comment": "Komentář",
     "comment-placeholder": "Text komentáře",
-    "comment-only": "Comment only",
-    "comment-only-desc": "Can comment on cards only.",
+    "comment-only": "Pouze komentáře",
+    "comment-only-desc": "Může přidávat komentáře pouze do karet.",
     "computer": "Počítač",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-checklist-delete-dialog": "Opravdu chcete smazat tento checklist?",
     "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti",
     "copyCardPopup-title": "Kopírovat kartu",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Kopírovat checklist do více karet",
+    "copyChecklistToManyCardsPopup-instructions": "Názvy a popisy cílové karty v tomto formátu JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Nadpis první karty\", \"description\":\"Popis druhé karty\"}, {\"title\":\"Nadpis druhé karty\",\"description\":\"Popis druhé karty\"},{\"title\":\"Nadpis poslední kary\",\"description\":\"Popis poslední karty\"} ]",
     "create": "Vytvořit",
     "createBoardPopup-title": "Vytvořit tablo",
     "chooseBoardSourcePopup-title": "Importovat tablo",
     "createLabelPopup-title": "Vytvořit štítek",
     "current": "Aktuální",
-    "date": "Date",
+    "date": "Datum",
     "decline": "Zamítnout",
     "default-avatar": "Výchozí avatar",
     "delete": "Smazat",
@@ -181,11 +182,11 @@
     "edit": "Upravit",
     "edit-avatar": "Změnit avatar",
     "edit-profile": "Upravit profil",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
+    "edit-wip-limit": "Upravit WIP Limit",
+    "soft-wip-limit": "Mírný WIP limit",
     "editCardStartDatePopup-title": "Změnit datum startu úkolu",
     "editCardDueDatePopup-title": "Změnit datum dokončení úkolu",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "editCardSpentTimePopup-title": "Změnit strávený čas",
     "editLabelPopup-title": "Změnit štítek",
     "editNotificationPopup-title": "Změnit notifikace",
     "editProfilePopup-title": "Upravit profil",
@@ -193,7 +194,7 @@
     "email-enrollAccount-subject": "Byl vytvořen účet na __siteName__",
     "email-enrollAccount-text": "Ahoj __user__,\n\nMůžeš začít používat službu kliknutím na odkaz níže.\n\n__url__\n\nDěkujeme.",
     "email-fail": "Odeslání emailu selhalo",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "Chyba při pokusu o odeslání emailu",
     "email-invalid": "Neplatný email",
     "email-invite": "Pozvat pomocí emailu",
     "email-invite-subject": "__inviter__ odeslal pozvánku",
@@ -203,7 +204,7 @@
     "email-sent": "Email byl odeslán",
     "email-verifyEmail-subject": "Ověř svou emailovou adresu na",
     "email-verifyEmail-text": "Ahoj __user__,\n\nPro ověření emailové adresy klikni na odkaz níže.\n\n__url__\n\nDěkujeme.",
-    "enable-wip-limit": "Enable WIP Limit",
+    "enable-wip-limit": "Povolit WIP Limit",
     "error-board-doesNotExist": "Toto tablo neexistuje",
     "error-board-notAdmin": "K provedení změny musíš být administrátor tohoto tabla",
     "error-board-notAMember": "K provedení změny musíš být členem tohoto tabla",
@@ -213,43 +214,43 @@
     "error-user-doesNotExist": "Tento uživatel neexistuje",
     "error-user-notAllowSelf": "Nemůžeš pozvat sám sebe",
     "error-user-notCreated": "Tento uživatel není vytvořen",
-    "error-username-taken": "This username is already taken",
-    "error-email-taken": "Email has already been taken",
+    "error-username-taken": "Toto uživatelské jméno již existuje",
+    "error-email-taken": "Tento email byl již použit",
     "export-board": "Exportovat tablo",
     "filter": "Filtr",
     "filter-cards": "Filtrovat karty",
     "filter-clear": "Vyčistit filtr",
-    "filter-no-label": "No label",
-    "filter-no-member": "No member",
+    "filter-no-label": "Žádný štítek",
+    "filter-no-member": "Žádný člen",
     "filter-on": "Filtr je zapnut",
     "filter-on-desc": "Filtrujete karty tohoto tabla. Pro úpravu filtru klikni sem.",
     "filter-to-selection": "Filtrovat výběr",
     "fullname": "Celé jméno",
     "header-logo-title": "Jit zpět na stránku s tably.",
-    "hide-system-messages": "Hide system messages",
+    "hide-system-messages": "Skrýt systémové zprávy",
     "headerBarCreateBoardPopup-title": "Vytvořit tablo",
     "home": "Domů",
     "import": "Import",
-    "import-board": "import board",
+    "import-board": "Importovat tablo",
     "import-board-c": "Importovat tablo",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "import-board-title-wekan": "Importovat tablo z Wekanu",
+    "import-sandstorm-warning": "Importované tablo spaže všechny existující data v tablu a nahradí je importovaným tablem.",
+    "from-trello": "Z Trella",
+    "from-wekan": "Z Wekanu",
     "import-board-instruction-trello": "Na svém Trello tablu, otevři 'Menu', pak 'More', 'Print and Export', 'Export JSON', a zkopíruj výsledný text",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "Ve vašem Wekan tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
     "import-json-placeholder": "Sem vlož validní JSON data",
-    "import-map-members": "Map members",
+    "import-map-members": "Mapovat členy",
     "import-members-map": "Toto importované tablo obsahuje několik členů. Namapuj členy z importu na uživatelské účty Wekan.",
     "import-show-user-mapping": "Zkontrolovat namapování členů",
     "import-user-select": "Vyber uživatele Wekan, kterého chceš použít pro tohoto člena",
-    "importMapMembersAddPopup-title": "Select Wekan member",
-    "info": "Version",
+    "importMapMembersAddPopup-title": "Vybrat Wekan uživatele",
+    "info": "Verze",
     "initials": "Iniciály",
-    "invalid-date": "Invalid date",
-    "invalid-time": "Invalid time",
-    "invalid-user": "Invalid user",
+    "invalid-date": "Neplatné datum",
+    "invalid-time": "Neplatný čas",
+    "invalid-user": "Neplatný uživatel",
     "joined": "spojeno",
     "just-invited": "Právě jsi byl pozván(a) do tohoto tabla",
     "keyboard-shortcuts": "Klávesové zkratky",
@@ -260,20 +261,20 @@
     "language": "Jazyk",
     "last-admin-desc": "Nelze změnit role, protože musí existovat alespoň jeden administrátor.",
     "leave-board": "Opustit tablo",
-    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
-    "leaveBoardPopup-title": "Leave Board ?",
+    "leave-board-pop": "Opravdu chcete opustit tablo __boardTitle__? Odstraníte se tím i ze všech karet v tomto tablu.",
+    "leaveBoardPopup-title": "Opustit tablo?",
     "link-card": "Odkázat na tuto kartu",
-    "list-archive-cards": "Archivovat všechny karty na tomto seznamu",
-    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení archivovaných karet a jejich opětovné obnovení, klikni v \"Menu\" > \"Archivované položky\".",
+    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do koše",
+    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v koši a jejich opětovné obnovení, klikni v \"Menu\" > \"Archivované položky\".",
     "list-move-cards": "Přesunout všechny karty v tomto seznamu",
     "list-select-cards": "Vybrat všechny karty v tomto seznamu",
     "listActionPopup-title": "Vypsat akce",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Akce swimlane",
     "listImportCardPopup-title": "Importovat Trello kartu",
     "listMorePopup-title": "Více",
-    "link-list": "Link to this list",
-    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "link-list": "Odkaz na tento seznam",
+    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
+    "list-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
     "lists": "Seznamy",
     "swimlanes": "Swimlanes",
     "log-out": "Odhlásit",
@@ -284,31 +285,31 @@
     "menu": "Menu",
     "move-selection": "Přesunout výběr",
     "moveCardPopup-title": "Přesunout kartu",
-    "moveCardToBottom-title": "Move to Bottom",
-    "moveCardToTop-title": "Move to Top",
+    "moveCardToBottom-title": "Přesunout dolu",
+    "moveCardToTop-title": "Přesunout nahoru",
     "moveSelectionPopup-title": "Přesunout výběr",
     "multi-selection": "Multi-výběr",
     "multi-selection-on": "Multi-výběr je zapnut",
-    "muted": "Muted",
-    "muted-info": "You will never be notified of any changes in this board",
+    "muted": "Umlčeno",
+    "muted-info": "Nikdy nedostanete oznámení o změně v tomto tablu.",
     "my-boards": "Moje tabla",
     "name": "Jméno",
-    "no-archived-cards": "Žádné archivované karty.",
-    "no-archived-lists": "Žádné archivované seznamy.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "Žádné karty v koši",
+    "no-archived-lists": "Žádné seznamy v koši",
+    "no-archived-swimlanes": "Žádné swimlane v koši",
     "no-results": "Žádné výsledky",
     "normal": "Normální",
     "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
     "not-accepted-yet": "Pozvánka ještě nebyla přijmuta",
-    "notify-participate": "Receive updates to any cards you participate as creater or member",
-    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "notify-participate": "Dostane aktualizace do všech karet, ve kterých se účastní jako tvůrce nebo člen",
+    "notify-watch": "Dostane aktualitace to všech tabel, seznamů nebo karet, které sledujete",
     "optional": "volitelný",
     "or": "nebo",
     "page-maybe-private": "Tato stránka může být soukromá. Můžete ji zobrazit po <a href='%s'>přihlášení</a>.",
     "page-not-found": "Stránka nenalezena.",
     "password": "Heslo",
     "paste-or-dragdrop": "vložit, nebo přetáhnout a pustit soubor obrázku (pouze obrázek)",
-    "participating": "Participating",
+    "participating": "Zúčastnění",
     "preview": "Náhled",
     "previewAttachedImagePopup-title": "Náhled",
     "previewClipboardImagePopup-title": "Náhled",
@@ -320,8 +321,8 @@
     "quick-access-description": "Pro přidání odkazu do této lišty označ tablo hvězdičkou.",
     "remove-cover": "Odstranit obal",
     "remove-from-board": "Odstranit z tabla",
-    "remove-label": "Remove Label",
-    "listDeletePopup-title": "Delete List ?",
+    "remove-label": "Odstranit štítek",
+    "listDeletePopup-title": "Smazat seznam?",
     "remove-member": "Odebrat uživatele",
     "remove-member-from-card": "Odstranit z karty",
     "remove-member-pop": "Odstranit __name__ (__username__) z __boardTitle__? Uživatel bude odebrán ze všech karet na tomto tablu. Na tuto skutečnost bude upozorněn.",
@@ -331,13 +332,13 @@
     "restore": "Obnovit",
     "save": "Uložit",
     "search": "Hledat",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
-    "select-color": "Select Color",
-    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
-    "setWipLimitPopup-title": "Set WIP Limit",
+    "search-cards": "Hledat nadpisy a popisy karet v tomto tablu",
+    "search-example": "Hledaný text",
+    "select-color": "Vybrat barvu",
+    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů v seznamu.",
+    "setWipLimitPopup-title": "Nastavit WIP Limit",
     "shortcut-assign-self": "Přiřadit sebe k aktuální kartě",
-    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-emoji": "Automatické dokončování emoji",
     "shortcut-autocomplete-members": "Automatický výběr uživatel",
     "shortcut-clear-filters": "Vyčistit všechny filtry",
     "shortcut-close-dialog": "Zavřít dialog",
@@ -345,9 +346,9 @@
     "shortcut-show-shortcuts": "Otevřít tento seznam odkazů",
     "shortcut-toggle-filterbar": "Přepnout lištu filtrování",
     "shortcut-toggle-sidebar": "Přepnout lištu tabla",
-    "show-cards-minimum-count": "Show cards count if list contains more than",
-    "sidebar-open": "Open Sidebar",
-    "sidebar-close": "Close Sidebar",
+    "show-cards-minimum-count": "Zobrazit počet karet pokud seznam obsahuje více než ",
+    "sidebar-open": "Otevřít boční panel",
+    "sidebar-close": "Zavřít boční panel",
     "signupPopup-title": "Vytvořit účet",
     "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno navrchu seznamu.",
     "starred-boards": "Tabla s hvězdičkou",
@@ -356,64 +357,64 @@
     "team": "Tým",
     "this-board": "toto tablo",
     "this-card": "tuto kartu",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spent time cards",
-    "time": "Time",
+    "spent-time-hours": "Strávený čas (hodiny)",
+    "overtime-hours": "Přesčas (hodiny)",
+    "overtime": "Přesčas",
+    "has-overtime-cards": "Obsahuje karty s přesčasy",
+    "has-spenttime-cards": "Obsahuje karty se stráveným časem",
+    "time": "Čas",
     "title": "Název",
-    "tracking": "Tracking",
-    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "tracking": "Pozorující",
+    "tracking-info": "Budete informováni o všech změnách v kartách, u kterých jste tvůrce nebo člen.",
     "unassign-member": "Vyřadit člena",
     "unsaved-description": "Popis neni uložen.",
-    "unwatch": "Unwatch",
+    "unwatch": "Přestat sledovat",
     "upload": "Nahrát",
     "upload-avatar": "Nahrát avatar",
     "uploaded-avatar": "Avatar nahrán",
     "username": "Uživatelské jméno",
     "view-it": "Zobrazit",
-    "warn-list-archived": "varování: tato karta je v archivovaném seznamu",
-    "watch": "Watch",
-    "watching": "Watching",
-    "watching-info": "You will be notified of any change in this board",
-    "welcome-board": "Welcome Board",
-    "welcome-swimlane": "Milestone 1",
-    "welcome-list1": "Basics",
-    "welcome-list2": "Advanced",
+    "warn-list-archived": "varování: tuto kartu obsahuje seznam v koši",
+    "watch": "Sledovat",
+    "watching": "Sledující",
+    "watching-info": "Bude vám oznámena každá změna v tomto tablu",
+    "welcome-board": "Uvítací tablo",
+    "welcome-swimlane": "Milník 1",
+    "welcome-list1": "Základní",
+    "welcome-list2": "Pokročilé",
     "what-to-do": "Co chcete dělat?",
-    "wipLimitErrorPopup-title": "Invalid WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
-    "admin-panel": "Admin Panel",
+    "wipLimitErrorPopup-title": "Neplatný WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto seznamu je vyšší než definovaný WIP limit.",
+    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento seznam, nebo nastavte vyšší WIP limit.",
+    "admin-panel": "Administrátorský panel",
     "settings": "Nastavení",
     "people": "Lidé",
     "registration": "Registrace",
-    "disable-self-registration": "Disable Self-Registration",
+    "disable-self-registration": "Vypnout svévolnou registraci",
     "invite": "Pozvánka",
-    "invite-people": "Invite People",
-    "to-boards": "To board(s)",
+    "invite-people": "Pozvat lidi",
+    "to-boards": "Do tabel",
     "email-addresses": "Emailové adresy",
-    "smtp-host-description": "The address of the SMTP server that handles your emails.",
-    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
-    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host-description": "Adresa SMTP serveru, který zpracovává vaše emaily.",
+    "smtp-port-description": "Port, který používá Váš SMTP server pro odchozí emaily.",
+    "smtp-tls-description": "Zapnout TLS podporu pro SMTP server",
     "smtp-host": "SMTP Host",
     "smtp-port": "SMTP Port",
     "smtp-username": "Uživatelské jméno",
     "smtp-password": "Heslo",
-    "smtp-tls": "TLS support",
+    "smtp-tls": "podpora TLS",
     "send-from": "Od",
-    "send-smtp-test": "Send a test email to yourself",
-    "invitation-code": "Invitation Code",
+    "send-smtp-test": "Poslat si zkušební email.",
+    "invitation-code": "Kód pozvánky",
     "email-invite-register-subject": "__inviter__ odeslal pozvánku",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
-    "email-smtp-test-text": "You have successfully sent an email",
-    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval ke spolupráci ve Wekanu.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
+    "email-smtp-test-subject": "SMTP Testovací email z Wekanu",
+    "email-smtp-test-text": "Email byl úspěšně odeslán",
+    "error-invitation-code-not-exist": "Kód pozvánky neexistuje.",
     "error-notAuthorized": "Nejste autorizován k prohlížení této stránky.",
-    "outgoing-webhooks": "Outgoing Webhooks",
-    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "new-outgoing-webhook": "New Outgoing Webhook",
+    "outgoing-webhooks": "Odchozí Webhooky",
+    "outgoingWebhooksPopup-title": "Odchozí Webhooky",
+    "new-outgoing-webhook": "Nové odchozí Webhooky",
     "no-name": "(Neznámé)",
     "Wekan_version": "Wekan verze",
     "Node_version": "Node verze",
@@ -421,10 +422,10 @@
     "OS_Cpus": "OS Počet CPU",
     "OS_Freemem": "OS Volná paměť",
     "OS_Loadavg": "OS Průměrná zátěž systém",
-    "OS_Platform": "OS Platform",
-    "OS_Release": "OS Release",
+    "OS_Platform": "Platforma OS",
+    "OS_Release": "Verze OS",
     "OS_Totalmem": "OS Celková paměť",
-    "OS_Type": "OS Type",
+    "OS_Type": "Typ OS",
     "OS_Uptime": "OS Doba běhu systému",
     "hours": "hodin",
     "minutes": "minut",
@@ -433,7 +434,13 @@
     "no": "Ne",
     "accounts": "Účty",
     "accounts-allowEmailChange": "Povolit změnu Emailu",
-    "createdAt": "Created at",
-    "verified": "Verified",
-    "active": "Active"
+    "createdAt": "Vytvořeno v",
+    "verified": "Ověřen",
+    "active": "Aktivní",
+    "card-received": "Přijato",
+    "card-received-on": "Přijaté v",
+    "card-end": "Konec",
+    "card-end-on": "Končí v",
+    "editCardReceivedDatePopup-title": "Změnit datum přijetí",
+    "editCardEndDatePopup-title": "Změnit datum konce"
 }

i18n/de.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "hat __card__ zu __list__ hinzugefügt",
     "act-createList": "hat __list__ zu __board__ hinzugefügt",
     "act-addBoardMember": "hat __member__ zu __board__ hinzugefügt",
-    "act-archivedBoard": "hat __board__ archiviert",
-    "act-archivedCard": "hat __card__ archiviert",
-    "act-archivedList": "hat __list__ archiviert",
-    "act-archivedSwimlane": "__swimlane__ wurde archiviert",
+    "act-archivedBoard": "__board__ in den Papierkorb verschoben",
+    "act-archivedCard": "__card__ in den Papierkorb verschoben",
+    "act-archivedList": "__list__ in den Papierkorb verschoben",
+    "act-archivedSwimlane": "__swimlane__ in den Papierkorb verschoben",
     "act-importBoard": "hat __board__ importiert",
     "act-importCard": "hat __card__ importiert",
     "act-importList": "hat __list__ importiert",
@@ -27,7 +27,7 @@
     "activities": "Aktivitäten",
     "activity": "Aktivität",
     "activity-added": "hat %s zu %s hinzugefügt",
-    "activity-archived": "hat %s archiviert",
+    "activity-archived": "%s in den Papierkorb verschoben",
     "activity-attached": "hat %s an %s angehängt",
     "activity-created": "hat %s erstellt",
     "activity-excluded": "hat %s von %s ausgeschlossen",
@@ -64,23 +64,23 @@
     "and-n-other-card_plural": "und __count__ andere Karten",
     "apply": "Übernehmen",
     "app-is-offline": "Wekan lädt gerade, bitte warten Sie. Wenn Sie die Seite neu laden, gehen nicht übertragene Änderungen verloren. Sollte Wekan nicht geladen werden, überprüfen Sie bitte, ob der Server noch läuft.",
-    "archive": "Archiv",
-    "archive-all": "Alles archivieren",
-    "archive-board": "Board archivieren",
-    "archive-card": "Karte archivieren",
-    "archive-list": "Liste archivieren",
-    "archive-swimlane": "Swimlane archivieren",
-    "archive-selection": "Auswahl archivieren",
-    "archiveBoardPopup-title": "Board archivieren?",
-    "archived-items": "Archivierte Einträge",
-    "archived-boards": "Achivierte Boards",
+    "archive": "In den Papierkorb verschieben",
+    "archive-all": "Alles in den Papierkorb verschieben",
+    "archive-board": "Board in den Papierkorb verschieben",
+    "archive-card": "Karte in den Papierkorb verschieben",
+    "archive-list": "Liste in den Papierkorb verschieben",
+    "archive-swimlane": "Swimlane in den Papierkorb verschieben",
+    "archive-selection": "Auswahl in den Papierkorb verschieben",
+    "archiveBoardPopup-title": "Board in den Papierkorb verschieben?",
+    "archived-items": "Papierkorb",
+    "archived-boards": "Boards im Papierkorb",
     "restore-board": "Board wiederherstellen",
-    "no-archived-boards": "Keine archivierten Boards",
-    "archives": "Archive",
+    "no-archived-boards": "Keine Boards im Papierkorb.",
+    "archives": "Papierkorb",
     "assign-member": "Mitglied zuweisen",
     "attached": "angehängt",
     "attachment": "Anhang",
-    "attachment-delete-pop": "Das Löschen eines Anhangs kann nicht wieder rückgängig gemacht werden.",
+    "attachment-delete-pop": "Das Löschen eines Anhangs kann nicht rückgängig gemacht werden.",
     "attachmentDeletePopup-title": "Anhang löschen?",
     "attachments": "Anhänge",
     "auto-watch": "Neue Boards nach Erstellung automatisch beobachten",
@@ -102,13 +102,13 @@
     "board-view-lists": "Listen",
     "bucket-example": "z.B. \"Löffelliste\"",
     "cancel": "Abbrechen",
-    "card-archived": "Diese Karte wurde archiviert.",
+    "card-archived": "Diese Karte wurde in den Papierkorb verschoben",
     "card-comments-title": "Diese Karte hat %s Kommentar(e).",
-    "card-delete-notice": "Löschen ist unwiderruflich. Alle Aktionen die dieser Karte zugeordnet sind werden ebenfalls gelöscht.",
-    "card-delete-pop": "Alle Aktionen werden vom Aktivitätsfeed entfernt und die Karte kann nicht mehr geöffnet werden. Das Löschen kann nicht widerrufen werden!",
-    "card-delete-suggest-archive": "Sie können eine Karte archivieren, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
-    "card-due": "Ende",
-    "card-due-on": "Ende am",
+    "card-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Alle Aktionen, die dieser Karte zugeordnet sind, werden ebenfalls gelöscht.",
+    "card-delete-pop": "Alle Aktionen werden aus dem Aktivitätsfeed entfernt und die Karte kann nicht wiedereröffnet werden. Die Aktion kann nicht rückgängig gemacht werden.",
+    "card-delete-suggest-archive": "Sie können eine Karte in den Papierkorb verschieben, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
+    "card-due": "Fällig",
+    "card-due-on": "Fällig am",
     "card-spent": "Aufgewendete Zeit",
     "card-edit-attachments": "Anhänge ändern",
     "card-edit-labels": "Labels ändern",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Mitglieder",
     "cardMorePopup-title": "Mehr",
     "cards": "Karten",
+    "cards-count": "Karten",
     "change": "Ändern",
     "change-avatar": "Profilbild ändern",
     "change-password": "Passwort ändern",
@@ -140,7 +141,7 @@
     "clipboard": "Zwischenablage oder Drag & Drop",
     "close": "Schließen",
     "close-board": "Board schließen",
-    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie den \"Archiv\"-Button in der Kopfzeile der Startseite anklicken.",
+    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Papierkorb\" in der Kopfzeile der Startseite anklicken.",
     "color-black": "schwarz",
     "color-blue": "blau",
     "color-green": "grün",
@@ -184,7 +185,7 @@
     "edit-wip-limit": "WIP-Limit bearbeiten",
     "soft-wip-limit": "Soft WIP-Limit",
     "editCardStartDatePopup-title": "Startdatum ändern",
-    "editCardDueDatePopup-title": "Enddatum ändern",
+    "editCardDueDatePopup-title": "Fälligkeitsdatum ändern",
     "editCardSpentTimePopup-title": "Aufgewendete Zeit ändern",
     "editLabelPopup-title": "Label ändern",
     "editNotificationPopup-title": "Benachrichtigung ändern",
@@ -255,7 +256,7 @@
     "keyboard-shortcuts": "Tastaturkürzel",
     "label-create": "Label erstellen",
     "label-default": "%s Label (Standard)",
-    "label-delete-pop": "Diese Aktion ist unwiderruflich. Das Label wird von allen Karten entfernt und seine Historie wird gelöscht.",
+    "label-delete-pop": "Aktion kann nicht rückgängig gemacht werden. Das Label wird von allen Karten entfernt und seine Historie gelöscht.",
     "labels": "Labels",
     "language": "Sprache",
     "last-admin-desc": "Sie können keine Rollen ändern, weil es mindestens einen Administrator geben muss.",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Sind Sie sicher, dass Sie __boardTitle__ verlassen möchten? Sie werden von allen Karten in diesem Board entfernt.",
     "leaveBoardPopup-title": "Board verlassen?",
     "link-card": "Link zu dieser Karte",
-    "list-archive-cards": "Alle Karten in dieser Liste archivieren",
-    "list-archive-cards-pop": "Alle Karten von dieser Liste werden vom Board entfernt. Um archivierte Karten anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archivierte Einträge\".",
+    "list-archive-cards": "Alle Karten dieser Liste in den Papierkorb verschieben",
+    "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Papierkorb\".",
     "list-move-cards": "Alle Karten in dieser Liste verschieben",
     "list-select-cards": "Alle Karten in dieser Liste auswählen",
     "listActionPopup-title": "Listenaktionen",
@@ -272,8 +273,8 @@
     "listImportCardPopup-title": "Eine Trello-Karte importieren",
     "listMorePopup-title": "Mehr",
     "link-list": "Link zu dieser Liste",
-    "list-delete-pop": "Alle Aktionen werden aus dem Verlauf gelöscht. Die Liste kann nicht wiederhergestellt werden.",
-    "list-delete-suggest-archive": "Listen können archiviert werden, um sie aus dem Board zu entfernen und den Verlauf zu erhalten.",
+    "list-delete-pop": "Alle Aktionen werden aus dem Verlauf gelöscht und die Liste kann nicht wiederhergestellt werden.",
+    "list-delete-suggest-archive": "Listen können in den Papierkorb verschoben werden, um sie aus dem Board zu entfernen und die Aktivitäten zu behalten.",
     "lists": "Listen",
     "swimlanes": "Swimlanes",
     "log-out": "Ausloggen",
@@ -293,9 +294,9 @@
     "muted-info": "Sie werden nicht über Änderungen auf diesem Board benachrichtigt",
     "my-boards": "Meine Boards",
     "name": "Name",
-    "no-archived-cards": "Keine archivierten Karten.",
-    "no-archived-lists": "Keine archivierten Listen.",
-    "no-archived-swimlanes": "Keine archivierten Swimlanes",
+    "no-archived-cards": "Keine Karten im Papierkorb.",
+    "no-archived-lists": "Keine Listen im Papierkorb.",
+    "no-archived-swimlanes": "Keine Swimlanes im Papierkorb.",
     "no-results": "Keine Ergebnisse",
     "normal": "Normal",
     "normal-desc": "Kann Karten anzeigen und bearbeiten, aber keine Einstellungen ändern.",
@@ -357,9 +358,9 @@
     "this-board": "dieses Board",
     "this-card": "diese Karte",
     "spent-time-hours": "Aufgewendete Zeit (Stunden)",
-    "overtime-hours": "Überzeit (Stunden)",
-    "overtime": "Überzeit",
-    "has-overtime-cards": "Hat Karten mit Überzeit",
+    "overtime-hours": "Mehrarbeit (Stunden)",
+    "overtime": "Mehrarbeit",
+    "has-overtime-cards": "Hat Karten mit Mehrarbeit",
     "has-spenttime-cards": "Hat Karten mit aufgewendeten Zeiten",
     "time": "Zeit",
     "title": "Titel",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Profilbild hochgeladen",
     "username": "Benutzername",
     "view-it": "Ansehen",
-    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer archivierten Liste",
+    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer Liste im Papierkorb!",
     "watch": "Beobachten",
     "watching": "Beobachten",
     "watching-info": "Sie werden über alle Änderungen in diesem Board benachrichtigt",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Ändern der E-Mailadresse zulassen",
     "createdAt": "Erstellt am",
     "verified": "Geprüft",
-    "active": "Aktiv"
+    "active": "Aktiv",
+    "card-received": "Empfangen",
+    "card-received-on": "Empfangen am",
+    "card-end": "Ende",
+    "card-end-on": "Endet am",
+    "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
+    "editCardEndDatePopup-title": "Enddatum ändern"
 }

i18n/el.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Εφαρμογή",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Λίστες",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Ακύρωση",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Έως",
     "card-due-on": "Έως τις",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Μέλοι",
     "cardMorePopup-title": "Περισσότερα",
     "cards": "Κάρτες",
+    "cards-count": "Κάρτες",
     "change": "Αλλαγή",
     "change-avatar": "Change Avatar",
     "change-password": "Αλλαγή Κωδικού",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Κλείσιμο",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "μαύρο",
     "color-blue": "μπλε",
     "color-green": "πράσινο",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Περισσότερα",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Λίστες",
     "swimlanes": "Swimlanes",
     "log-out": "Αποσύνδεση",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Όνομα",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Κανένα αποτέλεσμα",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Όνομα Χρήστη",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/en-GB.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -86,7 +86,7 @@
     "auto-watch": "Automatically watch boards when they are created",
     "avatar-too-big": "The avatar is too large (70KB max)",
     "back": "Back",
-    "board-change-color": "Change color",
+    "board-change-color": "Change colour",
     "board-nb-stars": "%s stars",
     "board-not-found": "Board not found",
     "board-private-info": "This board will be <strong>private</strong>.",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to the Recycle Bin to remove it from the board and preserve its activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve its activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -333,7 +334,7 @@
     "search": "Search",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
-    "select-color": "Select Color",
+    "select-color": "Select Colour",
     "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
     "setWipLimitPopup-title": "Set WIP Limit",
     "shortcut-assign-self": "Assign yourself to current card",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in a list in the Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any changes in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/en.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/eo.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "Aldonis __card__ al __list__",
     "act-createList": "Aldonis __card__ al __board__",
     "act-addBoardMember": "Aldonis __member__ al __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktivaĵoj",
     "activity": "Aktivaĵo",
     "activity-added": "Aldonis %s al %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "Kreiis %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apliki",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Arkivi",
-    "archive-all": "Arkivi ĉion",
-    "archive-board": "Archive Board",
-    "archive-card": "Arkivi karton",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arkivi elekton",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Arkivoj",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listoj",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "Karto arkivita",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membroj",
     "cardMorePopup-title": "Pli",
     "cards": "Kartoj",
+    "cards-count": "Kartoj",
     "change": "Ŝanĝi",
     "change-avatar": "Change Avatar",
     "change-password": "Ŝangi pasvorton",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Fermi",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "nigra",
     "color-blue": "blua",
     "color-green": "verda",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Ligi al ĉitiu karto",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Movu ĉiujn kartojn en tiu listo.",
     "list-select-cards": "Elektu ĉiujn kartojn en tiu listo.",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Pli",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listoj",
     "swimlanes": "Swimlanes",
     "log-out": "Elsaluti",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nomo",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Neniaj rezultoj",
     "normal": "Normala",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Uzantnomo",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Rigardi",
     "watching": "Rigardante",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/es-AR.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "agregada __card__ a __list__",
     "act-createList": "agregada __list__ a __board__",
     "act-addBoardMember": "agregado __member__ a __board__",
-    "act-archivedBoard": "__board__ archivado",
-    "act-archivedCard": "__card__ archivada",
-    "act-archivedList": "__list__ archivada",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ movido a Papelera de Reciclaje",
+    "act-archivedCard": "__card__ movido a Papelera de Reciclaje",
+    "act-archivedList": "__list__ movido a Papelera de Reciclaje",
+    "act-archivedSwimlane": "__swimlane__ movido a Papelera de Reciclaje",
     "act-importBoard": "__board__ importado",
     "act-importCard": "__card__ importada",
     "act-importList": "__list__ importada",
@@ -27,7 +27,7 @@
     "activities": "Actividades",
     "activity": "Actividad",
     "activity-added": "agregadas %s a %s",
-    "activity-archived": "archivadas %s",
+    "activity-archived": "%s movido a Papelera de Reciclaje",
     "activity-attached": "adjuntadas %s a %s",
     "activity-created": "creadas %s",
     "activity-excluded": "excluidas %s de %s",
@@ -45,7 +45,7 @@
     "add-attachment": "Agregar Adjunto",
     "add-board": "Agregar Tablero",
     "add-card": "Agregar Tarjeta",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "Agregar Calle",
     "add-checklist": "Agregar Lista de Tareas",
     "add-checklist-item": "Agregar ítem a lista de tareas",
     "add-cover": "Agregar Portadas",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Y __count__ otras tarjetas",
     "apply": "Aplicar",
     "app-is-offline": "Wekan está cargándose, por favor espere. Refrescar la página va a causar pérdida de datos. Si Wekan no se carga, por favor revise que el servidor de Wekan no se haya detenido.",
-    "archive": "Archivar",
-    "archive-all": "Archivar Todo",
-    "archive-board": "Archivar Tablero",
-    "archive-card": "Archivar Tarjeta",
-    "archive-list": "Archivar Lista",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archivar selección",
-    "archiveBoardPopup-title": "Archivar Tablero?",
-    "archived-items": "Items Archivados",
-    "archived-boards": "Tableros Archivados",
+    "archive": "Mover a Papelera de Reciclaje",
+    "archive-all": "Mover Todo a la Papelera de Reciclaje",
+    "archive-board": "Mover Tablero a la Papelera de Reciclaje",
+    "archive-card": "Mover Tarjeta a la Papelera de Reciclaje",
+    "archive-list": "Mover Lista a la Papelera de Reciclaje",
+    "archive-swimlane": "Mover Calle a la Papelera de Reciclaje",
+    "archive-selection": "Mover selección a la Papelera de Reciclaje",
+    "archiveBoardPopup-title": "¿Mover Tablero a la Papelera de Reciclaje?",
+    "archived-items": "Papelera de Reciclaje",
+    "archived-boards": "Tableros en la Papelera de Reciclaje",
     "restore-board": "Restaurar Tablero",
-    "no-archived-boards": "Tableros no archivados.",
-    "archives": "Archivos",
+    "no-archived-boards": "No hay tableros en la Papelera de Reciclaje",
+    "archives": "Papelera de Reciclaje",
     "assign-member": "Asignar miembro",
     "attached": "adjunto(s)",
     "attachment": "Adjunto",
@@ -97,16 +97,16 @@
     "boardChangeWatchPopup-title": "Alternar Seguimiento",
     "boardMenuPopup-title": "Menú del Tablero",
     "boards": "Tableros",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "Vista de Tablero",
+    "board-view-swimlanes": "Calles",
     "board-view-lists": "Listas",
     "bucket-example": "Como \"Lista de Contenedores\" por ejemplo",
     "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta está archivada",
+    "card-archived": "Esta tarjeta es movida a la Papelera de Reciclaje",
     "card-comments-title": "Esta tarjeta tiene %s comentario.",
     "card-delete-notice": "Borrar es permanente. Perderás todas las acciones asociadas con esta tarjeta.",
     "card-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podrás re-abrir la tarjeta. No hay deshacer.",
-    "card-delete-suggest-archive": "Tu puedes archivar una tarjeta para removerla del tablero y preservar la actividad.",
+    "card-delete-suggest-archive": "Tu puedes mover una tarjeta a la Papelera de Reciclaje para removerla del tablero y preservar la actividad.",
     "card-due": "Vence",
     "card-due-on": "Vence en",
     "card-spent": "Tiempo Empleado",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Miembros",
     "cardMorePopup-title": "Mas",
     "cards": "Tarjetas",
+    "cards-count": "Tarjetas",
     "change": "Cambiar",
     "change-avatar": "Cambiar Avatar",
     "change-password": "Cambiar Contraseña",
@@ -140,7 +141,7 @@
     "clipboard": "Portapapeles o arrastrar y soltar",
     "close": "Cerrar",
     "close-board": "Cerrar Tablero",
-    "close-board-pop": "Podrás restaurar el tablero apretando el botón \"Archivos\" del encabezado en inicio.",
+    "close-board-pop": "Podrás restaurar el tablero apretando el botón \"Papelera de Reciclaje\" del encabezado en inicio.",
     "color-black": "negro",
     "color-blue": "azul",
     "color-green": "verde",
@@ -159,9 +160,9 @@
     "confirm-checklist-delete-dialog": "¿Estás segur@ que querés borrar la lista de ítems?",
     "copy-card-link-to-clipboard": "Copiar enlace a tarjeta en el portapapeles",
     "copyCardPopup-title": "Copiar Tarjeta",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Copiar Plantilla Checklist a Muchas Tarjetas",
+    "copyChecklistToManyCardsPopup-instructions": "Títulos y Descripciones de la Tarjeta Destino en este formato JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Título de primera tarjeta\", \"description\":\"Descripción de primera tarjeta\"}, {\"title\":\"Título de segunda tarjeta\",\"description\":\"Descripción de segunda tarjeta\"},{\"title\":\"Título de última tarjeta\",\"description\":\"Descripción de última tarjeta\"} ]",
     "create": "Crear",
     "createBoardPopup-title": "Crear Tablero",
     "chooseBoardSourcePopup-title": "Importar tablero",
@@ -187,7 +188,7 @@
     "editCardDueDatePopup-title": "Cambiar fecha de vencimiento",
     "editCardSpentTimePopup-title": "Cambiar tiempo empleado",
     "editLabelPopup-title": "Cambiar Etiqueta",
-    "editNotificationPopup-title": "Editar Notificació",
+    "editNotificationPopup-title": "Editar Notificación",
     "editProfilePopup-title": "Editar Perfil",
     "email": "Email",
     "email-enrollAccount-subject": "Una cuenta creada para vos en __siteName__",
@@ -263,19 +264,19 @@
     "leave-board-pop": "¿Estás seguro que querés dejar __boardTitle__? Vas a salir de todas las tarjetas en este tablero.",
     "leaveBoardPopup-title": "¿Dejar Tablero?",
     "link-card": "Enlace a esta tarjeta",
-    "list-archive-cards": "Archivar todas las tarjetas en esta lista",
-    "list-archive-cards-pop": "Esto va a eliminar las tarjetas en esta lista del tablero. Para ver tarjetas archivadas y traerlas de vuelta al tablero, clickeá \"Menú\" > \"Items Archivados\".",
+    "list-archive-cards": "Mover todas las tarjetas en esta lista a la Papelera de Reciclaje",
+    "list-archive-cards-pop": "Esto va a remover las tarjetas en esta lista del tablero. Para ver tarjetas en la Papelera de Reciclaje y traerlas de vuelta al tablero, clickeá \"Menú\" > \"Papelera de Reciclaje\".",
     "list-move-cards": "Mueve todas las tarjetas en esta lista",
     "list-select-cards": "Selecciona todas las tarjetas en esta lista",
     "listActionPopup-title": "Listar Acciones",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Acciones de la Calle",
     "listImportCardPopup-title": "Importar una tarjeta Trello",
     "listMorePopup-title": "Mas",
     "link-list": "Enlace a esta lista",
     "list-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podás recuperar la lista. No se puede deshacer.",
-    "list-delete-suggest-archive": "Podés archivar la lista para eliminarla del tablero y preservar la actividad.",
+    "list-delete-suggest-archive": "Podés mover la lista a la Papelera de Reciclaje para remvoerla del tablero y preservar la actividad.",
     "lists": "Listas",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "Calles",
     "log-out": "Salir",
     "log-in": "Entrar",
     "loginPopup-title": "Entrar",
@@ -293,9 +294,9 @@
     "muted-info": "No serás notificado de ningún cambio en este tablero",
     "my-boards": "Mis Tableros",
     "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas archivadas.",
-    "no-archived-lists": "No hay listas archivadas.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No hay tarjetas en la Papelera de Reciclaje",
+    "no-archived-lists": "No hay listas en la Papelera de Reciclaje",
+    "no-archived-swimlanes": "No hay calles en la Papelera de Reciclaje",
     "no-results": "No hay resultados",
     "normal": "Normal",
     "normal-desc": "Puede ver y editar tarjetas. No puede cambiar opciones.",
@@ -331,8 +332,8 @@
     "restore": "Restaurar",
     "save": "Grabar",
     "search": "Buscar",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "Buscar en títulos y descripciones de tarjeta en este tablero",
+    "search-example": "¿Texto a buscar?",
     "select-color": "Seleccionar Color",
     "set-wip-limit-value": "Fijar un límite para el número máximo de tareas en esta lista",
     "setWipLimitPopup-title": "Establecer Límite TEP",
@@ -360,7 +361,7 @@
     "overtime-hours": "Sobretiempo (horas)",
     "overtime": "Sobretiempo",
     "has-overtime-cards": "Tiene tarjetas con sobretiempo",
-    "has-spenttime-cards": "Has spent time cards",
+    "has-spenttime-cards": "Ha gastado tarjetas de tiempo",
     "time": "Hora",
     "title": "Título",
     "tracking": "Seguimiento",
@@ -373,12 +374,12 @@
     "uploaded-avatar": "Cargado un avatar",
     "username": "Nombre de usuario",
     "view-it": "Verlo",
-    "warn-list-archived": "cuidado; esta tarjeta está en una lista archivada",
+    "warn-list-archived": "cuidado; esta tarjeta está en la Papelera de Reciclaje",
     "watch": "Seguir",
     "watching": "Siguiendo",
     "watching-info": "Serás notificado de cualquier cambio en este tablero",
     "welcome-board": "Tablero de Bienvenida",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "Hito 1",
     "welcome-list1": "Básicos",
     "welcome-list2": "Avanzado",
     "what-to-do": "¿Qué querés hacer?",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Permitir Cambio de Email",
     "createdAt": "Creado en",
     "verified": "Verificado",
-    "active": "Activo"
+    "active": "Activo",
+    "card-received": "Recibido",
+    "card-received-on": "Recibido en",
+    "card-end": "Termino",
+    "card-end-on": "Termina en",
+    "editCardReceivedDatePopup-title": "Cambiar fecha de recepción",
+    "editCardEndDatePopup-title": "Cambiar fecha de término"
 }

i18n/es.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "ha añadido __card__ a __list__",
     "act-createList": "ha añadido __list__ a __board__",
     "act-addBoardMember": "ha añadido a __member__ a __board__",
-    "act-archivedBoard": "ha archivado __board__",
-    "act-archivedCard": "ha archivado __card__",
-    "act-archivedList": "ha archivado __list__",
-    "act-archivedSwimlane": "ha archivado __swimlane__",
+    "act-archivedBoard": "__board__ se ha enviado a la papelera de reciclaje",
+    "act-archivedCard": "__card__ se ha enviado a la papelera de reciclaje",
+    "act-archivedList": "__list__ se ha enviado a la papelera de reciclaje",
+    "act-archivedSwimlane": "__swimlane__ se ha enviado a la papelera de reciclaje",
     "act-importBoard": "ha importado __board__",
     "act-importCard": "ha importado __card__",
     "act-importList": "ha importado __list__",
@@ -27,7 +27,7 @@
     "activities": "Actividades",
     "activity": "Actividad",
     "activity-added": "ha añadido %s a %s",
-    "activity-archived": "ha archivado %s",
+    "activity-archived": "%s se ha enviado a la papelera de reciclaje",
     "activity-attached": "ha adjuntado %s a %s",
     "activity-created": "ha creado %s",
     "activity-excluded": "ha excluido %s de %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "y otras __count__ tarjetas",
     "apply": "Aplicar",
     "app-is-offline": "Wekan se está cargando, por favor espere. Actualizar la página provocará la pérdida de datos. Si Wekan no se carga, por favor verifique que el servidor de Wekan no está detenido.",
-    "archive": "Archivar",
-    "archive-all": "Archivar todo",
-    "archive-board": "Archivar el tablero",
-    "archive-card": "Archivar la tarjeta",
-    "archive-list": "Archivar la lista",
-    "archive-swimlane": "Archivar el carril de flujo",
-    "archive-selection": "Archivar la selección",
-    "archiveBoardPopup-title": "¿Archivar el tablero?",
-    "archived-items": "Elementos archivados",
-    "archived-boards": "Tableros archivados",
+    "archive": "Enviar a la papelera de reciclaje",
+    "archive-all": "Enviar todo a la papelera de reciclaje",
+    "archive-board": "Enviar el tablero a la papelera de reciclaje",
+    "archive-card": "Enviar la tarjeta a la papelera de reciclaje",
+    "archive-list": "Enviar la lista a la papelera de reciclaje",
+    "archive-swimlane": "Enviar el carril de flujo a la papelera de reciclaje",
+    "archive-selection": "Enviar la selección a la papelera de reciclaje",
+    "archiveBoardPopup-title": "Enviar el tablero a la papelera de reciclaje",
+    "archived-items": "Papelera de reciclaje",
+    "archived-boards": "Tableros en la papelera de reciclaje",
     "restore-board": "Restaurar el tablero",
-    "no-archived-boards": "No hay tableros archivados.",
-    "archives": "Archivos",
+    "no-archived-boards": "No hay tableros en la papelera de reciclaje",
+    "archives": "Papelera de reciclaje",
     "assign-member": "Asignar miembros",
     "attached": "adjuntado",
     "attachment": "Adjunto",
@@ -97,17 +97,17 @@
     "boardChangeWatchPopup-title": "Cambiar vigilancia",
     "boardMenuPopup-title": "Menú del tablero",
     "boards": "Tableros",
-    "board-view": "Vista de tablero",
-    "board-view-swimlanes": "Carriles de flujo",
+    "board-view": "Vista del tablero",
+    "board-view-swimlanes": "Carriles",
     "board-view-lists": "Listas",
     "bucket-example": "Como “Cosas por hacer” por ejemplo",
     "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta está ahora archivada.",
+    "card-archived": "Esta tarjeta se ha enviado a la papelera de reciclaje.",
     "card-comments-title": "Esta tarjeta tiene %s comentarios.",
     "card-delete-notice": "la eliminación es permanente. Perderás todas las acciones asociadas a esta tarjeta.",
     "card-delete-pop": "Se eliminarán todas las acciones del historial de actividades y no se podrá volver a abrir la tarjeta. Esta acción no puede deshacerse.",
-    "card-delete-suggest-archive": "Puede archivar una tarjeta para eliminarla del tablero y conservar la actividad.",
-    "card-due": "Finalizar",
+    "card-delete-suggest-archive": "Puedes enviar una tarjeta a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
+    "card-due": "Vence",
     "card-due-on": "Vence el",
     "card-spent": "Tiempo consumido",
     "card-edit-attachments": "Editar los adjuntos",
@@ -115,8 +115,8 @@
     "card-edit-members": "Editar los miembros",
     "card-labels-title": "Cambia las etiquetas de la tarjeta",
     "card-members-title": "Añadir o eliminar miembros del tablero desde la tarjeta.",
-    "card-start": "Empezar",
-    "card-start-on": "Empieza el",
+    "card-start": "Comienza",
+    "card-start-on": "Comienza el",
     "cardAttachmentsPopup-title": "Adjuntar desde",
     "cardDeletePopup-title": "¿Eliminar la tarjeta?",
     "cardDetailsActionsPopup-title": "Acciones de la tarjeta",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Miembros",
     "cardMorePopup-title": "Más",
     "cards": "Tarjetas",
+    "cards-count": "Tarjetas",
     "change": "Cambiar",
     "change-avatar": "Cambiar el avatar",
     "change-password": "Cambiar la contraseña",
@@ -140,7 +141,7 @@
     "clipboard": "el portapapeles o con arrastrar y soltar",
     "close": "Cerrar",
     "close-board": "Cerrar el tablero",
-    "close-board-pop": "Podrá restaurar el tablero haciendo clic en el botón 'Archivos' en el encabezado al inicio.",
+    "close-board-pop": "Podrás restaurar el tablero haciendo clic en el botón \"Papelera de reciclaje\" en la cabecera.",
     "color-black": "negra",
     "color-blue": "azul",
     "color-green": "verde",
@@ -154,12 +155,12 @@
     "comment": "Comentar",
     "comment-placeholder": "Escribir comentario",
     "comment-only": "Sólo comentarios",
-    "comment-only-desc": "Solo se puede comentar en las tarjetas.",
+    "comment-only-desc": "Solo puedes comentar en las tarjetas.",
     "computer": "el ordenador",
     "confirm-checklist-delete-dialog": "¿Seguro que desea eliminar la lista de verificación?",
     "copy-card-link-to-clipboard": "Copiar el enlace de la tarjeta al portapapeles",
     "copyCardPopup-title": "Copiar la tarjeta",
-    "copyChecklistToManyCardsPopup-title": "Copiar la plantilla de la lista de verificación en varias tarjetas.",
+    "copyChecklistToManyCardsPopup-title": "Copiar la plantilla de la lista de verificación en varias tarjetas",
     "copyChecklistToManyCardsPopup-instructions": "Títulos y descripciones de las tarjetas de destino en formato JSON",
     "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Título de la primera tarjeta\", \"description\":\"Descripción de la primera tarjeta\"}, {\"title\":\"Título de la segunda tarjeta\",\"description\":\"Descripción de la segunda tarjeta\"},{\"title\":\"Título de la última tarjeta\",\"description\":\"Descripción de la última tarjeta\"} ]",
     "create": "Crear",
@@ -175,15 +176,15 @@
     "description": "Descripción",
     "disambiguateMultiLabelPopup-title": "Desambiguar la acción de etiqueta",
     "disambiguateMultiMemberPopup-title": "Desambiguar la acción de miembro",
-    "discard": "Descartar",
+    "discard": "Descartarla",
     "done": "Hecho",
     "download": "Descargar",
     "edit": "Editar",
     "edit-avatar": "Cambiar el avatar",
     "edit-profile": "Editar el perfil",
-    "edit-wip-limit": "Cambiar el límite del TEP",
-    "soft-wip-limit": "Límite del TEP flexible",
-    "editCardStartDatePopup-title": "Cambiar la fecha de inicio",
+    "edit-wip-limit": "Cambiar el límite del trabajo en proceso",
+    "soft-wip-limit": "Límite del trabajo en proceso flexible",
+    "editCardStartDatePopup-title": "Cambiar la fecha de comienzo",
     "editCardDueDatePopup-title": "Cambiar la fecha de vencimiento",
     "editCardSpentTimePopup-title": "Cambiar el tiempo consumido",
     "editLabelPopup-title": "Cambiar la etiqueta",
@@ -203,7 +204,7 @@
     "email-sent": "Correo enviado",
     "email-verifyEmail-subject": "Verifica tu dirección de correo en __siteName__",
     "email-verifyEmail-text": "Hola __user__,\n\nPara verificar tu cuenta de correo electrónico, haz clic en el siguiente enlace.\n\n__url__\n\nGracias.",
-    "enable-wip-limit": "Activar el límite del TEP",
+    "enable-wip-limit": "Activar el límite del trabajo en proceso",
     "error-board-doesNotExist": "El tablero no existe",
     "error-board-notAdmin": "Es necesario ser administrador de este tablero para hacer eso",
     "error-board-notAMember": "Es necesario ser miembro de este tablero para hacer eso",
@@ -216,9 +217,9 @@
     "error-username-taken": "Este nombre de usuario ya está en uso",
     "error-email-taken": "Esta dirección de correo ya está en uso",
     "export-board": "Exportar el tablero",
-    "filter": "Filtro",
+    "filter": "Filtrar",
     "filter-cards": "Filtrar tarjetas",
-    "filter-clear": "Limpiar filtro",
+    "filter-clear": "Limpiar el filtro",
     "filter-no-label": "Sin etiqueta",
     "filter-no-member": "Sin miembro",
     "filter-on": "Filtro activado",
@@ -238,7 +239,7 @@
     "from-trello": "Desde Trello",
     "from-wekan": "Desde Wekan",
     "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.",
-    "import-board-instruction-wekan": "En tu tablero Wekan, ve a 'Menú', luego 'Exportar el tablero', y copia el texto del fichero descargado.",
+    "import-board-instruction-wekan": "En tu tablero de Wekan, ve a 'Menú del tablero', luego 'Exportar el tablero', y copia aquí el texto del fichero descargado.",
     "import-json-placeholder": "Pega tus datos JSON válidos aquí",
     "import-map-members": "Mapa de miembros",
     "import-members-map": "El tablero importado tiene algunos miembros. Por favor mapea los miembros que deseas importar a los usuarios de Wekan",
@@ -262,20 +263,20 @@
     "leave-board": "Abandonar el tablero",
     "leave-board-pop": "¿Seguro que quieres abandonar __boardTitle__? Serás desvinculado de todas las tarjetas en este tablero.",
     "leaveBoardPopup-title": "¿Abandonar el tablero?",
-    "link-card": "Enlace a esta tarjeta",
-    "list-archive-cards": "Archivar todas las tarjetas de esta lista",
-    "list-archive-cards-pop": "Esto eliminara todas las tarjetas de esta lista del tablero. Para ver las tarjetas archivadas y recuperarlas en el tablero, haz clic en 'Menú' > 'Elementos archivados'.",
+    "link-card": "Enlazar a esta tarjeta",
+    "list-archive-cards": "Enviar todas las tarjetas de esta lista a la papelera de reciclaje",
+    "list-archive-cards-pop": "Esto eliminará todas las tarjetas de esta lista del tablero. Para ver las tarjetas en la papelera de reciclaje y devolverlas al tablero, haga clic en \"Menú\" > \"Papelera de reciclaje\".",
     "list-move-cards": "Mover todas las tarjetas de esta lista",
     "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
     "listActionPopup-title": "Acciones de la lista",
     "swimlaneActionPopup-title": "Acciones del carril de flujo",
     "listImportCardPopup-title": "Importar una tarjeta de Trello",
     "listMorePopup-title": "Más",
-    "link-list": "Enlace a esta lista",
+    "link-list": "Enlazar a esta lista",
     "list-delete-pop": "Todas las acciones serán eliminadas del historial de actividades y no se podrá recuperar la lista. Esta acción no puede deshacerse.",
-    "list-delete-suggest-archive": "Puede archivar una lista para quitarla del tablero y preservar así sus actividades.",
+    "list-delete-suggest-archive": "Puedes enviar una lista a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
     "lists": "Listas",
-    "swimlanes": "Carriles de flujo",
+    "swimlanes": "Carriles",
     "log-out": "Finalizar la sesión",
     "log-in": "Iniciar sesión",
     "loginPopup-title": "Iniciar sesión",
@@ -293,9 +294,9 @@
     "muted-info": "No serás notificado de ningún cambio en este tablero",
     "my-boards": "Mis tableros",
     "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas archivadas.",
-    "no-archived-lists": "No hay listas archivadas.",
-    "no-archived-swimlanes": "No hay carriles de flujo archivados.",
+    "no-archived-cards": "No hay tarjetas en la papelera de reciclaje",
+    "no-archived-lists": "No hay listas en la papelera de reciclaje",
+    "no-archived-swimlanes": "No hay carriles de flujo en la papelera de reciclaje",
     "no-results": "Sin resultados",
     "normal": "Normal",
     "normal-desc": "Puedes ver y editar tarjetas. No puedes cambiar la configuración.",
@@ -329,13 +330,13 @@
     "rename": "Renombrar",
     "rename-board": "Renombrar el tablero",
     "restore": "Restaurar",
-    "save": "Guardar",
+    "save": "Añadir",
     "search": "Buscar",
     "search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
     "search-example": "¿Texto a buscar?",
     "select-color": "Selecciona un color",
     "set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
-    "setWipLimitPopup-title": "Fijar el límite del TEP",
+    "setWipLimitPopup-title": "Fijar el límite del trabajo en proceso",
     "shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
     "shortcut-autocomplete-emoji": "Autocompletar emoji",
     "shortcut-autocomplete-members": "Autocompletar miembros",
@@ -363,17 +364,17 @@
     "has-spenttime-cards": "Se ha excedido el tiempo de las tarjetas",
     "time": "Hora",
     "title": "Título",
-    "tracking": "Seguimiento",
+    "tracking": "Siguiendo",
     "tracking-info": "Serás notificado de cualquier cambio en las tarjetas en las que participas como creador o miembro.",
     "unassign-member": "Desvincular al miembro",
-    "unsaved-description": "Tienes una descripción sin guardar.",
+    "unsaved-description": "Tienes una descripción por añadir.",
     "unwatch": "Dejar de vigilar",
     "upload": "Cargar",
     "upload-avatar": "Cargar un avatar",
     "uploaded-avatar": "Avatar cargado",
     "username": "Nombre de usuario",
-    "view-it": "Verlo",
-    "warn-list-archived": "advertencia: esta tarjeta está en una lista archivada",
+    "view-it": "Verla",
+    "warn-list-archived": "advertencia: esta tarjeta está en una lista en la papelera de reciclaje",
     "watch": "Vigilar",
     "watching": "Vigilando",
     "watching-info": "Serás notificado de cualquier cambio en este tablero",
@@ -382,9 +383,9 @@
     "welcome-list1": "Básicos",
     "welcome-list2": "Avanzados",
     "what-to-do": "¿Qué deseas hacer?",
-    "wipLimitErrorPopup-title": "Límite del TEP no válido",
-    "wipLimitErrorPopup-dialog-pt1": "El número de tareas en esta lista es mayor que el límite del TEP que has definido.",
-    "wipLimitErrorPopup-dialog-pt2": "Por favor, mueve algunas tareas fuera de esta lista, o fija un límite del TEP más alto.",
+    "wipLimitErrorPopup-title": "El límite del trabajo en proceso no es válido.",
+    "wipLimitErrorPopup-dialog-pt1": "El número de tareas en esta lista es mayor que el límite del trabajo en proceso que has definido.",
+    "wipLimitErrorPopup-dialog-pt2": "Por favor, mueve algunas tareas fuera de esta lista, o fija un límite del trabajo en proceso más alto.",
     "admin-panel": "Panel del administrador",
     "settings": "Ajustes",
     "people": "Personas",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Permitir cambiar el correo electrónico",
     "createdAt": "Creado en",
     "verified": "Verificado",
-    "active": "Activo"
+    "active": "Activo",
+    "card-received": "Recibido",
+    "card-received-on": "Recibido el",
+    "card-end": "Finalizado",
+    "card-end-on": "Finalizado el",
+    "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
+    "editCardEndDatePopup-title": "Cambiar la fecha de finalización"
 }

i18n/eu.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__ __list__ zerrrendara gehituta",
     "act-createList": "__list__ __board__ arbelera gehituta",
     "act-addBoardMember": "__member__ __board__ arbelera gehituta",
-    "act-archivedBoard": "__board__ artxibatuta",
-    "act-archivedCard": "__card__ artxibatuta",
-    "act-archivedList": "__list__ artxibatuta",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "__board__ inportatuta",
     "act-importCard": "__card__ inportatuta",
     "act-importList": "__list__ inportatuta",
@@ -27,7 +27,7 @@
     "activities": "Jarduerak",
     "activity": "Jarduera",
     "activity-added": "%s %s(e)ra gehituta",
-    "activity-archived": "%s artxibatu du",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s %s(e)ra erantsita",
     "activity-created": "%s sortuta",
     "activity-excluded": "%s %s(e)tik kanpo utzita",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Eta beste  __count__ txartel",
     "apply": "Aplikatu",
     "app-is-offline": "Wekan kargatzen ari da, itxaron mesedez. Orria freskatzeak datuen galera ekarriko luke. Wekan kargatzen ez bada, egiaztatu Wekan zerbitzaria gelditu ez dela.",
-    "archive": "Artxibatu",
-    "archive-all": "Artxibatu guztiak",
-    "archive-board": "Artxibatu arbela",
-    "archive-card": "Artxibatu txartela",
-    "archive-list": "Artxibatu zerrenda",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Artxibatu hautaketa",
-    "archiveBoardPopup-title": "Artxibatu arbela?",
-    "archived-items": "Artxibatutako elementuak",
-    "archived-boards": "Artxibatu arbelak",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Berreskuratu arbela",
-    "no-archived-boards": "Ez dago artxibatutako arbelik",
-    "archives": "Artxiboak",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Esleitu kidea",
     "attached": "erantsita",
     "attachment": "Eranskina",
@@ -102,11 +102,11 @@
     "board-view-lists": "Zerrendak",
     "bucket-example": "Esaterako \"Pertz zerrenda\"",
     "cancel": "Utzi",
-    "card-archived": "Txartel hau artxibatuta dago.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Txartel honek iruzkin %s  dauka.",
     "card-delete-notice": "Ezabaketa behin betiko da. Txartel honi lotutako ekintza guztiak galduko dituzu.",
     "card-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu txartela berrireki. Ez dago desegiterik.",
-    "card-delete-suggest-archive": "Txartel bat artxibatu dezakezu arbeletik kendu nahi baduzu bere jarduera gordez.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Epemuga",
     "card-due-on": "Epemuga",
     "card-spent": "Erabilitako denbora",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Kideak",
     "cardMorePopup-title": "Gehiago",
     "cards": "Txartelak",
+    "cards-count": "Txartelak",
     "change": "Aldatu",
     "change-avatar": "Aldatu avatarra",
     "change-password": "Aldatu pasahitza",
@@ -140,7 +141,7 @@
     "clipboard": "Kopiatu eta itsatsi edo arrastatu eta jaregin",
     "close": "Itxi",
     "close-board": "Itxi arbela",
-    "close-board-pop": "Arbela berrezarri ahal  izango duzu hasiera orriko goiburuko \"Artxiboak\" botoia sakatuz",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "beltza",
     "color-blue": "urdina",
     "color-green": "berdea",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Ziur zaude __boardTitle__ utzi nahi duzula? Arbel honetako txartel guztietatik ezabatua izango zara.",
     "leaveBoardPopup-title": "Arbela utzi?",
     "link-card": "Lotura txartel honetara",
-    "list-archive-cards": "Artxibatu zerrendako txartel guztiak",
-    "list-archive-cards-pop": "Honek zerrenda honetako txartel guztiak arbeletik ezabatuko ditu. Artxibatutako txartelak ikusteko eta arbelera berreskuratzeko, zoaz \"Menua > Artxibatutako elementuak\" atalera.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Lekuz aldatu zerrendako txartel guztiak",
     "list-select-cards": "Aukeratu zerrenda honetako txartel guztiak",
     "listActionPopup-title": "Zerrendaren ekintzak",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Gehiago",
     "link-list": "Lotura zerrenda honetara",
     "list-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu zerrenda berreskuratu. Ez dago desegiterik.",
-    "list-delete-suggest-archive": "Zerrenda bat artxibatu dezakezu arbeletik kendu nahi baduzu bere jarduera gordez.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Zerrendak",
     "swimlanes": "Swimlanes",
     "log-out": "Itxi saioa",
@@ -293,9 +294,9 @@
     "muted-info": "Ez zaizkizu jakinaraziko arbel honi egindako aldaketak",
     "my-boards": "Nire arbelak",
     "name": "Izena",
-    "no-archived-cards": "Artxibatutako txartelik ez.",
-    "no-archived-lists": "Artxibatutako zerrendarik ez.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Emaitzarik ez",
     "normal": "Arrunta",
     "normal-desc": "Txartelak ikusi eta editatu ditzake. Ezin ditu ezarpenak aldatu.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar bat igo da",
     "username": "Erabiltzaile-izena",
     "view-it": "Ikusi",
-    "warn-list-archived": "abisua: txartel hau artxibatutako zerrenda batean dago",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Ikuskatu",
     "watching": "Ikuskatzen",
     "watching-info": "Arbel honi egindako aldaketak jakinaraziko zaizkizu",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Baimendu e-mail aldaketa",
     "createdAt": "Noiz sortua",
     "verified": "Egiaztatuta",
-    "active": "Gaituta"
+    "active": "Gaituta",
+    "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"
 }

i18n/fa.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__  به __list__ اضافه شد",
     "act-createList": "__list__ به __board__ اضافه شد",
     "act-addBoardMember": "__member__ به __board__ اضافه شد",
-    "act-archivedBoard": "__board__ بایگانی شد",
-    "act-archivedCard": "__card__ بایگانی شد",
-    "act-archivedList": "__list__ بایگانی شد",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "__board__ وارد شده",
     "act-importCard": "__card__ وارد شده",
     "act-importList": "__list__ وارد شده",
@@ -27,7 +27,7 @@
     "activities": "فعالیت ها",
     "activity": "فعالیت",
     "activity-added": "%s به %s اضافه شد",
-    "activity-archived": "%s بایگانی شد",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s به %s پیوست شد",
     "activity-created": "%s ایجاد شد",
     "activity-excluded": "%s  از %s مستثنی گردید",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "و __count__ کارت دیگر",
     "apply": "اعمال",
     "app-is-offline": "Wekan در حال بارگذاری است. لطفا صبر کنید. نوسازی صفحه، منجر به از دست رفتن داده‌ها می‌شود. اگر Wekan بارگذاری نشد، لطفا بررسی کنید که سرور Wekan متوقف نشده باشد.",
-    "archive": "بایگانی",
-    "archive-all": "بایگانی کردن همه",
-    "archive-board": "بایگانی تخته",
-    "archive-card": "بایگانی کارت",
-    "archive-list": "فهرست بایگانی",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "بایگانی موارد انتخاب شده",
-    "archiveBoardPopup-title": "بایگانی تخته؟",
-    "archived-items": "موارد  بایگانی شده",
-    "archived-boards": "تخته‌های بایگانی شده",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "بازیابی تخته",
-    "no-archived-boards": "تخته بایگانی شده وجود ندارد.",
-    "archives": "بایگانی‌ها",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "تعیین عضو",
     "attached": "ضمیمه شده",
     "attachment": "ضمیمه",
@@ -102,11 +102,11 @@
     "board-view-lists": "فهرست‌ها",
     "bucket-example": "برای مثال چیزی شبیه \"لیست سبدها\"",
     "cancel": "انصراف",
-    "card-archived": "این کارت بایگانی شد.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "این کارت دارای %s نظر است.",
     "card-delete-notice": "حذف دائمی. تمامی موارد مرتبط با این کارت از بین خواهند رفت.",
     "card-delete-pop": "همه اقدامات از این پردازه (خوراک) حذف خواهد شد و امکان بازگرداندن کارت وجود نخواهد داشت.",
-    "card-delete-suggest-archive": "شما می توانید یک کارت را با  حفظ فعالیت های آن بایگانی کنید.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "ناشی از",
     "card-due-on": "مقتضی بر",
     "card-spent": "زمان صرف شده",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "اعضا",
     "cardMorePopup-title": "بیشتر",
     "cards": "کارت‌ها",
+    "cards-count": "کارت‌ها",
     "change": "تغییر",
     "change-avatar": "تغییر تصویر",
     "change-password": "تغییر کلمه عبور",
@@ -140,7 +141,7 @@
     "clipboard": "ذخیره در حافظه ویا بردار-رهاکن",
     "close": "بستن",
     "close-board": "بستن برد",
-    "close-board-pop": "شما می توانید با کلیک بر دکمه \"بایگانی\" از قسمت بالای خانه، تخته را بازآوری نمایید.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "مشکی",
     "color-blue": "آبی",
     "color-green": "سبز",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "ارجاع به این کارت",
-    "list-archive-cards": "بایگانی تمامی کارتهای این لیست",
-    "list-archive-cards-pop": "این اقدام، همه کارت های این لیست از تخته راحذف خواهد کرد. جهت مشاهده کارت های بایگانی و بازگرداندن آنها ، \"Menu\",\"Archived Item\" را کلیک کنید.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "انتقال تمام کارت های این لیست",
     "list-select-cards": "انتخاب تمام کارت های این لیست",
     "listActionPopup-title": "لیست اقدامات",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "بیشتر",
     "link-list": "پیوند به این فهرست",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "لیست ها",
     "swimlanes": "Swimlanes",
     "log-out": "خروج",
@@ -293,9 +294,9 @@
     "muted-info": "شما هیچگاه از تغییرات این تخته مطلع نخواهید شد",
     "my-boards": "تخته‌های من",
     "name": "نام",
-    "no-archived-cards": "کارتی در بایگانی نیست",
-    "no-archived-lists": "فهرستی در بایگانی نیست.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "بدون نتیجه",
     "normal": "عادی",
     "normal-desc": "امکان نمایش و تنظیم کارت بدون امکان تغییر تنظیمات",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "تصویر ارسال شد",
     "username": "نام کاربری",
     "view-it": "مشاهده",
-    "warn-list-archived": "هشدار: این کارت در یک لیست بایگانی شده است",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "دیده بانی",
     "watching": "درحال دیده بانی",
     "watching-info": "شما از هر تغییری دراین تخته آگاه خواهید شد",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "اجازه تغییر رایانامه",
     "createdAt": "ساخته شده در",
     "verified": "معتبر",
-    "active": "فعال"
+    "active": "فعال",
+    "card-received": "رسیده",
+    "card-received-on": "رسیده در",
+    "card-end": "پایان",
+    "card-end-on": "پایان در",
+    "editCardReceivedDatePopup-title": "تغییر تاریخ رسید",
+    "editCardEndDatePopup-title": "تغییر تاریخ پایان"
 }

i18n/fi.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "lisätty __card__ listalle __list__",
     "act-createList": "lisätty __list__ taululle __board__",
     "act-addBoardMember": "lisätty __member__ taululle __board__",
-    "act-archivedBoard": "arkistoitu __board__",
-    "act-archivedCard": "arkistoitu __card__",
-    "act-archivedList": "arkistoitu __list__",
-    "act-archivedSwimlane": "arkistoitu __swimlane__",
+    "act-archivedBoard": "__board__ siirretty roskakoriin",
+    "act-archivedCard": "__card__ siirretty roskakoriin",
+    "act-archivedList": "__list__ siirretty roskakoriin",
+    "act-archivedSwimlane": "__swimlane__ siirretty roskakoriin",
     "act-importBoard": "tuotu __board__",
     "act-importCard": "tuotu __card__",
     "act-importList": "tuotu __list__",
@@ -27,7 +27,7 @@
     "activities": "Toimet",
     "activity": "Toiminta",
     "activity-added": "lisätty %s kohteeseen %s",
-    "activity-archived": "arkistoitu %s",
+    "activity-archived": "%s siirretty roskakoriin",
     "activity-attached": "liitetty %s kohteeseen %s",
     "activity-created": "luotu %s",
     "activity-excluded": "poistettu %s kohteesta %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Ja __count__ muuta korttia",
     "apply": "Käytä",
     "app-is-offline": "Wekan latautuu, odota. Sivun uudelleenlataus aiheuttaa tietojen menettämisen. Jos Wekan ei lataudu, tarkista että Wekan palvelin ei ole pysähtynyt.",
-    "archive": "Arkistoi",
-    "archive-all": "Arkistoi kaikki",
-    "archive-board": "Arkistoi taulu",
-    "archive-card": "Arkistoi kortti",
-    "archive-list": "Arkistoi lista",
-    "archive-swimlane": "Arkistoi Swimlane",
-    "archive-selection": "Arkistoi valinta",
-    "archiveBoardPopup-title": "Arkistoi taulu?",
-    "archived-items": "Arkistoidut kohteet",
-    "archived-boards": "Arkistoidut taulut",
+    "archive": "Siirrä roskakoriin",
+    "archive-all": "Siirrä kaikki roskakoriin",
+    "archive-board": "Siirrä taulu roskakoriin",
+    "archive-card": "Siirrä kortti roskakoriin",
+    "archive-list": "Siirrä lista roskakoriin",
+    "archive-swimlane": "Siirrä Swimlane roskakoriin",
+    "archive-selection": "Siirrä valinta roskakoriin",
+    "archiveBoardPopup-title": "Siirrä taulu roskakoriin?",
+    "archived-items": "Roskakori",
+    "archived-boards": "Taulut roskakorissa",
     "restore-board": "Palauta taulu",
-    "no-archived-boards": "Ei arkistoituja tauluja.",
-    "archives": "Arkistot",
+    "no-archived-boards": "Ei tauluja roskakorissa",
+    "archives": "Roskakori",
     "assign-member": "Valitse jäsen",
     "attached": "liitetty",
     "attachment": "Liitetiedosto",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listat",
     "bucket-example": "Kuten “Laatikko lista” esimerkiksi",
     "cancel": "Peruuta",
-    "card-archived": "Tämä kortti on arkistoitu.",
+    "card-archived": "Tämä kortti on siirretty roskakoriin.",
     "card-comments-title": "Tässä kortissa on %s kommenttia.",
     "card-delete-notice": "Poistaminen on lopullista. Menetät kaikki toimet jotka on liitetty tähän korttiin.",
     "card-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja et tule pystymään uudelleenavaamaan korttia. Tätä ei voi peruuttaa.",
-    "card-delete-suggest-archive": "Voit arkistoida kortin poistaaksesi sen taululta ja säilyttääksesi toimet.",
+    "card-delete-suggest-archive": "Voit siirtää kortin roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
     "card-due": "Erääntyy",
     "card-due-on": "Erääntyy",
     "card-spent": "Käytetty aika",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Jäsenet",
     "cardMorePopup-title": "Lisää",
     "cards": "Kortit",
+    "cards-count": "korttia",
     "change": "Muokkaa",
     "change-avatar": "Muokkaa profiilikuvaa",
     "change-password": "Vaihda salasana",
@@ -140,7 +141,7 @@
     "clipboard": "Leikepöytä tai raahaa ja pudota",
     "close": "Sulje",
     "close-board": "Sulje taulu",
-    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Arkistot” painiketta kotiotsikosta.",
+    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Roskakori” painiketta taululistan yläpalkista.",
     "color-black": "musta",
     "color-blue": "sininen",
     "color-green": "vihreä",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Haluatko varmasti poistua taululta __boardTitle__? Sinut poistetaan kaikista tämän taulun korteista.",
     "leaveBoardPopup-title": "Jää pois taululta ?",
     "link-card": "Linkki tähän korttiin",
-    "list-archive-cards": "Arkistoi kaikki kortit tässä listassa",
-    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit tältä taululta. Nähdäksesi arkistoidut kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Arkistoidut kohteet”.",
+    "list-archive-cards": "Siirrä kaikki tämän listan kortit roskakoriin",
+    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi roskakorissa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Roskakori”.",
     "list-move-cards": "Siirrä kaikki kortit tässä listassa",
     "list-select-cards": "Valitse kaikki kortit tässä listassa",
     "listActionPopup-title": "Listaa toimet",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Lisää",
     "link-list": "Linkki tähän listaan",
     "list-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja listan poistaminen on lopullista. Tätä ei pysty peruuttamaan.",
-    "list-delete-suggest-archive": "Voit arkistoida listan jolloin sen voi palauttaa sisältöineen.",
+    "list-delete-suggest-archive": "Voit siirtää listan roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
     "lists": "Listat",
     "swimlanes": "Swimlanet",
     "log-out": "Kirjaudu ulos",
@@ -293,9 +294,9 @@
     "muted-info": "Et saa koskaan ilmoituksia tämän taulun muutoksista",
     "my-boards": "Tauluni",
     "name": "Nimi",
-    "no-archived-cards": "Ei arkistoituja kortteja.",
-    "no-archived-lists": "Ei arkistoituja listoja.",
-    "no-archived-swimlanes": "Ei arkistoituja swimlaneja.",
+    "no-archived-cards": "Ei kortteja roskakorissa.",
+    "no-archived-lists": "Ei listoja roskakorissa.",
+    "no-archived-swimlanes": "Ei Swimlaneja roskakorissa.",
     "no-results": "Ei tuloksia",
     "normal": "Normaali",
     "normal-desc": "Voi nähdä ja muokata kortteja. Ei voi muokata asetuksia.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Profiilikuva lähetetty",
     "username": "Käyttäjänimi",
     "view-it": "Näytä se",
-    "warn-list-archived": "varoitus: tämä kortti on arkistoitujen listalla",
+    "warn-list-archived": "varoitus: tämä kortti on roskakorissa olevassa listassa",
     "watch": "Seuraa",
     "watching": "Seurataan",
     "watching-info": "Sinulle ilmoitetaan tämän taulun muutoksista",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Salli sähköpostiosoitteen muuttaminen",
     "createdAt": "Luotu",
     "verified": "Varmistettu",
-    "active": "Aktiivinen"
+    "active": "Aktiivinen",
+    "card-received": "Vastaanotettu",
+    "card-received-on": "Vastaanotettu",
+    "card-end": "Loppuu",
+    "card-end-on": "Loppuu",
+    "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
+    "editCardEndDatePopup-title": "Vaihda loppumispäivää"
 }

i18n/fr.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "a ajouté __card__ à __list__",
     "act-createList": "a ajouté __list__ à __board__",
     "act-addBoardMember": "a ajouté __member__ à __board__",
-    "act-archivedBoard": "a archivé __board__",
-    "act-archivedCard": "a archivé __card__",
-    "act-archivedList": "a archivé __list__",
-    "act-archivedSwimlane": "a archivé le couloir __swimlane__",
+    "act-archivedBoard": "__board__ a été déplacé vers la corbeille",
+    "act-archivedCard": "__card__ a été déplacée vers la corbeille",
+    "act-archivedList": "__list__ a été déplacée vers la corbeille",
+    "act-archivedSwimlane": "__swimlane__ a été déplacé vers la corbeille",
     "act-importBoard": "a importé __board__",
     "act-importCard": "a importé __card__",
     "act-importList": "a importé __list__",
@@ -27,7 +27,7 @@
     "activities": "Activités",
     "activity": "Activité",
     "activity-added": "a ajouté %s à %s",
-    "activity-archived": "a archivé %s",
+    "activity-archived": "%s a été déplacé vers la corbeille",
     "activity-attached": "a attaché %s à %s",
     "activity-created": "a créé %s",
     "activity-excluded": "a exclu %s de %s",
@@ -40,7 +40,7 @@
     "activity-sent": "a envoyé %s vers %s",
     "activity-unjoined": "a quitté %s",
     "activity-checklist-added": "a ajouté une checklist à %s",
-    "activity-checklist-item-added": "a ajouté une checklist à '%s' dans %s",
+    "activity-checklist-item-added": "a ajouté un élément à la checklist '%s' dans %s",
     "add": "Ajouter",
     "add-attachment": "Ajouter une pièce jointe",
     "add-board": "Ajouter un tableau",
@@ -63,20 +63,20 @@
     "and-n-other-card": "Et __count__ autre carte",
     "and-n-other-card_plural": "Et __count__ autres cartes",
     "apply": "Appliquer",
-    "app-is-offline": "Chargement en cours de Wekan. Veuillez patienter. Vous risquez de perdre des données si vous recharger la page. Si Wekan ne se charge pas, veuillez vérifier si le serveur Wekan est arrêté.",
-    "archive": "Archiver",
-    "archive-all": "Tout archiver",
-    "archive-board": "Archiver le tableau",
-    "archive-card": "Archiver la carte",
-    "archive-list": "Archiver une liste",
-    "archive-swimlane": "Archiver le couloir",
-    "archive-selection": "Archiver la selection",
-    "archiveBoardPopup-title": "Archiver le tableau ?",
-    "archived-items": "Éléments archivés",
-    "archived-boards": "Tableaux archivés",
+    "app-is-offline": "Chargement en cours, veuillez patienter. Vous risquez de perdre des données si vous rechargez la page. Si le chargement échoue, veuillez vérifier l'état du serveur Wekan.",
+    "archive": "Déplacer vers la corbeille",
+    "archive-all": "Tout déplacer vers la corbeille",
+    "archive-board": "Déplacer le tableau vers la corbeille",
+    "archive-card": "Déplacer la carte vers la corbeille",
+    "archive-list": "Déplacer la liste vers la corbeille",
+    "archive-swimlane": "Déplacer le couloir vers la corbeille",
+    "archive-selection": "Déplacer la sélection vers la corbeille",
+    "archiveBoardPopup-title": "Déplacer le tableau vers la corbeille ?",
+    "archived-items": "Corbeille",
+    "archived-boards": "Tableaux dans la corbeille",
     "restore-board": "Restaurer le tableau",
-    "no-archived-boards": "Aucun tableau archivé",
-    "archives": "Archives",
+    "no-archived-boards": "Aucun tableau dans la corbeille.",
+    "archives": "Corbeille",
     "assign-member": "Affecter un membre",
     "attached": "joint",
     "attachment": "Pièce jointe",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listes",
     "bucket-example": "Comme « todo list » par exemple",
     "cancel": "Annuler",
-    "card-archived": "Cette carte est archivée.",
+    "card-archived": "Cette carte est déplacée vers la corbeille.",
     "card-comments-title": "Cette carte a %s commentaires.",
     "card-delete-notice": "La suppression est permanente. Vous perdrez toutes les actions associées à cette carte.",
     "card-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser cette carte. Cette action est irréversible.",
-    "card-delete-suggest-archive": "Vous pouvez archiver une carte pour la supprimer en préservant le suivi des activités.",
+    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers la corbeille afin de l'enlever du tableau tout en préservant l'activité.",
     "card-due": "À échéance",
     "card-due-on": "Échéance le",
     "card-spent": "Temps passé",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membres",
     "cardMorePopup-title": "Plus",
     "cards": "Cartes",
+    "cards-count": "Cartes",
     "change": "Modifier",
     "change-avatar": "Modifier l'avatar",
     "change-password": "Modifier le mot de passe",
@@ -140,7 +141,7 @@
     "clipboard": "Presse-papier ou glisser-déposer",
     "close": "Fermer",
     "close-board": "Fermer le tableau",
-    "close-board-pop": "Vous pouvez restaurer le tableau en cliquant sur le bouton « Archives » depuis le menu en entête.",
+    "close-board-pop": "Vous pourrez restaurer le tableau en cliquant le bouton « Corbeille » en entête.",
     "color-black": "noir",
     "color-blue": "bleu",
     "color-green": "vert",
@@ -156,7 +157,7 @@
     "comment-only": "Commentaire uniquement",
     "comment-only-desc": "Ne peut que commenter des cartes.",
     "computer": "Ordinateur",
-    "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer cette checklist ?",
+    "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist",
     "copy-card-link-to-clipboard": "Copier le lien vers la carte dans le presse-papier",
     "copyCardPopup-title": "Copier la carte",
     "copyChecklistToManyCardsPopup-title": "Copier le modèle de checklist vers plusieurs cartes",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Êtes-vous sur de vouloir quitter __boardTitle__ ? Vous ne serez plus associé aux cartes de ce tableau.",
     "leaveBoardPopup-title": "Quitter le tableau",
     "link-card": "Lier à cette carte",
-    "list-archive-cards": "Archiver toutes les cartes de cette liste",
-    "list-archive-cards-pop": "Cela archivera toutes les cartes de cette liste. Pour voir les cartes archivées et les ramener vers le tableau, cliquez sur « Menu » puis sur « Éléments archivés ».",
+    "list-archive-cards": "Déplacer toutes les cartes de la liste vers la corbeille",
+    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes dans la corbeille et les renvoyer vers le tableau, cliquez sur « Menu » puis « Corbeille ».",
     "list-move-cards": "Déplacer toutes les cartes de cette liste",
     "list-select-cards": "Sélectionner toutes les cartes de cette liste",
     "listActionPopup-title": "Actions sur la liste",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Plus",
     "link-list": "Lien vers cette liste",
     "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cette action ne peut pas être annulée.",
-    "list-delete-suggest-archive": "Vous pouvez archiver une liste pour la supprimer d'un tableau et conserver son activité.",
+    "list-delete-suggest-archive": "Vous pouvez déplacer une liste vers la corbeille pour l'enlever du tableau tout en conservant son activité.",
     "lists": "Listes",
     "swimlanes": "Couloirs",
     "log-out": "Déconnexion",
@@ -293,9 +294,9 @@
     "muted-info": "Vous ne serez jamais averti des modifications effectuées dans ce tableau",
     "my-boards": "Mes tableaux",
     "name": "Nom",
-    "no-archived-cards": "Pas de carte archivée.",
-    "no-archived-lists": "Pas de liste archivée.",
-    "no-archived-swimlanes": "Aucun couloir archivé.",
+    "no-archived-cards": "Aucune carte dans la corbeille.",
+    "no-archived-lists": "Aucune liste dans la corbeille.",
+    "no-archived-swimlanes": "Aucun couloir dans la corbeille.",
     "no-results": "Pas de résultats",
     "normal": "Normal",
     "normal-desc": "Peut voir et modifier les cartes. Ne peut pas changer les paramètres.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar téléchargé",
     "username": "Nom d'utilisateur",
     "view-it": "Le voir",
-    "warn-list-archived": "Attention : cette carte est dans une liste archivée",
+    "warn-list-archived": "Attention : cette carte est dans une liste se trouvant dans la corbeille",
     "watch": "Suivre",
     "watching": "Suivi",
     "watching-info": "Vous serez notifié de toute modification dans ce tableau",
@@ -433,7 +434,13 @@
     "no": "Non",
     "accounts": "Comptes",
     "accounts-allowEmailChange": "Autoriser le changement d'adresse mail",
-    "createdAt": "Créé à",
+    "createdAt": "Créé le",
     "verified": "Vérifié",
-    "active": "Actif"
+    "active": "Actif",
+    "card-received": "Reçue",
+    "card-received-on": "Reçue le",
+    "card-end": "Fin",
+    "card-end-on": "Se termine le",
+    "editCardReceivedDatePopup-title": "Changer la date de réception",
+    "editCardEndDatePopup-title": "Changer la date de fin"
 }

i18n/gl.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Actividades",
     "activity": "Actividade",
     "activity-added": "engadiuse %s a %s",
-    "activity-archived": "arquivouse%s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Arquivar",
-    "archive-all": "Arquivar todo",
-    "archive-board": "Arquivar taboleiro",
-    "archive-card": "Arquivar tarxeta",
-    "archive-list": "Arquivar lista",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arquivar selección",
-    "archiveBoardPopup-title": "Arquivar taboleiro?",
-    "archived-items": "Elementos arquivados",
-    "archived-boards": "Taboleiros arquivados",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restaurar taboleiro",
-    "no-archived-boards": "Non hai taboleiros arquivados.",
-    "archives": "Arquivos",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Anexo",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listas",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancelar",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Máis",
     "cards": "Tarxetas",
+    "cards-count": "Tarxetas",
     "change": "Cambiar",
     "change-avatar": "Cambiar o avatar",
     "change-password": "Cambiar o contrasinal",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "negro",
     "color-blue": "azul",
     "color-green": "verde",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Máis",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listas",
     "swimlanes": "Swimlanes",
     "log-out": "Pechar a sesión",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nome",
-    "no-archived-cards": "Non hai tarxetas arquivadas.",
-    "no-archived-lists": "Non hai listas arquivadas",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Non hai resultados",
     "normal": "Normal",
     "normal-desc": "Pode ver e editar tarxetas. Non pode cambiar a configuración.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Nome de usuario",
     "view-it": "Velo",
-    "warn-list-archived": "aviso: esta tarxeta está nunha lista arquivada",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Vixiar",
     "watching": "Vixiando",
     "watching-info": "Recibirá unha notificación sobre calquera cambio que se produza neste taboleiro",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/he.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "הכרטיס __card__ התווסף לרשימה __list__",
     "act-createList": "הרשימה __list__ התווספה ללוח __board__",
     "act-addBoardMember": "המשתמש __member__ נוסף ללוח __board__",
-    "act-archivedBoard": "הלוח  __board__ הועבר לארכיון",
-    "act-archivedCard": "הכרטיס __card__ הועבר לארכיון",
-    "act-archivedList": "הרשימה __card__ הועברה לארכיון",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "הלוח __board__ יובא",
     "act-importCard": "הכרטיס __card__ יובא",
     "act-importList": "הרשימה  __list__ יובאה",
@@ -27,7 +27,7 @@
     "activities": "פעילויות",
     "activity": "פעילות",
     "activity-added": "%s נוסף ל%s",
-    "activity-archived": "%s הועבר לארכיון",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s צורף ל%s",
     "activity-created": "%s נוצר",
     "activity-excluded": "%s לא נכלל ב%s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "ו־__count__ כרטיסים אחרים",
     "apply": "החלה",
     "app-is-offline": "Wekan בטעינה, נא להמתין. רענון העמוד עשוי להוביל לאובדן מידע. אם הטעינה של Wekan נעצרה, נא לבדוק ששרת ה־Wekan לא נעצר.",
-    "archive": "להעביר לארכיון",
-    "archive-all": "להעביר הכול לארכיון",
-    "archive-board": "להעביר לוח לארכיון",
-    "archive-card": "להעביר כרטיס בארכיון",
-    "archive-list": "שמירת רשימה בארכיון",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "להעביר בחירה לארכיון",
-    "archiveBoardPopup-title": "להעביר לוח זה לארכיון?",
-    "archived-items": "פריטים בארכיון",
-    "archived-boards": "לוחות שנשמרו בארכיון",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "שחזור לוח",
-    "no-archived-boards": "לא נשמרו לוחות בארכיון.",
-    "archives": "ארכיונים",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "הקצאת חבר",
     "attached": "מצורף",
     "attachment": "קובץ מצורף",
@@ -102,11 +102,11 @@
     "board-view-lists": "רשימות",
     "bucket-example": "כמו למשל „רשימת המשימות“",
     "cancel": "ביטול",
-    "card-archived": "כרטיס זה שמור בארכיון.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "לכרטיס זה %s תגובות.",
     "card-delete-notice": "מחיקה היא סופית. כל הפעולות המשויכות לכרטיס זה תלכנה לאיוד.",
     "card-delete-pop": "כל הפעולות יוסרו מלוח הפעילות ולא תהיה אפשרות לפתוח מחדש את הכרטיס. אין דרך חזרה.",
-    "card-delete-suggest-archive": "ניתן להעביר לארכיון כרטיס כדי להסירו מהלוח ולשמר את הפעילות.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "תאריך יעד",
     "card-due-on": "תאריך יעד",
     "card-spent": "זמן שהושקע",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "חברים",
     "cardMorePopup-title": "עוד",
     "cards": "כרטיסים",
+    "cards-count": "כרטיסים",
     "change": "שינוי",
     "change-avatar": "החלפת תמונת משתמש",
     "change-password": "החלפת ססמה",
@@ -140,7 +141,7 @@
     "clipboard": "לוח גזירים או גרירה ושחרור",
     "close": "סגירה",
     "close-board": "סגירת לוח",
-    "close-board-pop": "ניתן לשחזר את הלוח בלחיצה על כפתור „ארכיונים“ מהכותרת העליונה.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "שחור",
     "color-blue": "כחול",
     "color-green": "ירוק",
@@ -263,8 +264,8 @@
     "leave-board-pop": "לעזוב את __boardTitle__? שמך יוסר מכל הכרטיסים שבלוח זה.",
     "leaveBoardPopup-title": "לעזוב לוח ?",
     "link-card": "קישור לכרטיס זה",
-    "list-archive-cards": "העברת כל הכרטיסים שברשימה זו לארכיון",
-    "list-archive-cards-pop": "פעולה זו תסיר את כל הכרטיסים שברשימה הזו מהלוח. כדי לצפות בכרטיסים שבארכיון ולהחזיר אותם בחזרה ללוח, יש ללחוץ על „תפריט“ > „פריטים בארכיון“.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "העברת כל הכרטיסים שברשימה זו",
     "list-select-cards": "בחירת כל הכרטיסים שברשימה זו",
     "listActionPopup-title": "פעולות רשימה",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "עוד",
     "link-list": "קישור לרשימה זו",
     "list-delete-pop": "כל הפעולות תוסרנה מרצף הפעילות ולא תהיה לך אפשרות לשחזר את הרשימה. אין ביטול.",
-    "list-delete-suggest-archive": "ניתן לשמור רשימה בארכיון כדי להסיר אותה מהלוח ולשמור על הפעילות.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "רשימות",
     "swimlanes": "מסלול שחייה",
     "log-out": "יציאה",
@@ -293,9 +294,9 @@
     "muted-info": "מעתה לא תתקבלנה אצלך התרעות על שינויים בלוח זה",
     "my-boards": "הלוחות שלי",
     "name": "שם",
-    "no-archived-cards": "אין כרטיסים בארכיון.",
-    "no-archived-lists": "אין רשימות בארכיון.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "אין תוצאות",
     "normal": "רגיל",
     "normal-desc": "הרשאה לצפות ולערוך כרטיסים. לא ניתן לשנות הגדרות.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "הועלתה תמונה משתמש",
     "username": "שם משתמש",
     "view-it": "הצגה",
-    "warn-list-archived": "אזהרה: הכרטיס נמצא ברשימה שהועברה לארכיון",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "לעקוב",
     "watching": "במעקב",
     "watching-info": "מעתה יגיעו אליך דיווחים על כל שינוי בלוח זה",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "אפשר שינוי דוא\"ל",
     "createdAt": "נוצר ב",
     "verified": "עבר אימות",
-    "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"
 }

i18n/hu.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__ kártyát adott hozzá a listához: __list__",
     "act-createList": "__list__ listát adott hozzá a táblához: __board__",
     "act-addBoardMember": "__member__ tagot hozzáadta a táblához: __board__",
-    "act-archivedBoard": "archiválta a táblát: __board__",
-    "act-archivedCard": "archiválta a kártyát: __card__",
-    "act-archivedList": "archiválta a listát: __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "A __board__ tábla a lomtárba került.",
+    "act-archivedCard": "A __card__ kártya a lomtárba került.",
+    "act-archivedList": "A __list__ lista a lomtárba került.",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "importálta a táblát: __board__",
     "act-importCard": "importálta a kártyát: __card__",
     "act-importList": "importálta a listát: __list__",
@@ -27,7 +27,7 @@
     "activities": "Tevékenységek",
     "activity": "Tevékenység",
     "activity-added": "%s hozzáadva ehhez: %s",
-    "activity-archived": "%s archiválva",
+    "activity-archived": "%s lomtárba helyezve",
     "activity-attached": "%s mellékletet csatolt a kártyához: %s",
     "activity-created": "%s létrehozva",
     "activity-excluded": "%s kizárva innen: %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "És __count__ egyéb kártya",
     "apply": "Alkalmaz",
     "app-is-offline": "A Wekan betöltés alatt van, kérem várjon. Az oldal újratöltése adatvesztést okoz. Ha a Wekan nem töltődik be, akkor ellenőrizze, hogy a Wekan kiszolgáló nem állt-e le.",
-    "archive": "Archiválás",
-    "archive-all": "Összes archiválása",
-    "archive-board": "Tábla archiválása",
-    "archive-card": "Kártya archiválása",
-    "archive-list": "Lista archiválása",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Kijelölés archiválása",
-    "archiveBoardPopup-title": "Archiválja a táblát?",
-    "archived-items": "Archivált elemek",
-    "archived-boards": "Archivált táblák",
+    "archive": "Lomtárba",
+    "archive-all": "Összes lomtárba helyezése",
+    "archive-board": "Tábla lomtárba helyezése",
+    "archive-card": "Kártya lomtárba helyezése",
+    "archive-list": "Lista lomtárba helyezése",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Kijelölés lomtárba helyezése",
+    "archiveBoardPopup-title": "Lomtárba helyezi a táblát?",
+    "archived-items": "Lomtár",
+    "archived-boards": "Lomtárban lévő táblák",
     "restore-board": "Tábla visszaállítása",
-    "no-archived-boards": "Nincsenek archivált táblák.",
-    "archives": "Archívumok",
+    "no-archived-boards": "Nincs tábla a lomtárban.",
+    "archives": "Lomtár",
     "assign-member": "Tag hozzárendelése",
     "attached": "csatolva",
     "attachment": "Melléklet",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listák",
     "bucket-example": "Mint például „Bakancslista”",
     "cancel": "Mégse",
-    "card-archived": "Ez a kártya archiválva van.",
+    "card-archived": "Ez a kártya a lomtárba került.",
     "card-comments-title": "Ez a kártya %s hozzászólást tartalmaz.",
     "card-delete-notice": "A törlés végleges. Az összes műveletet elveszíti, amely ehhez a kártyához tartozik.",
     "card-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz képes többé újra megnyitni a kártyát. Nincs visszaállítási lehetőség.",
-    "card-delete-suggest-archive": "Archiválhat egy kártyát, hogy eltávolítsa a tábláról, és megőrizze a tevékenységet.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Esedékes",
     "card-due-on": "Esedékes ekkor",
     "card-spent": "Eltöltött idő",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Tagok",
     "cardMorePopup-title": "Több",
     "cards": "Kártyák",
+    "cards-count": "Kártyák",
     "change": "Változtatás",
     "change-avatar": "Avatár megváltoztatása",
     "change-password": "Jelszó megváltoztatása",
@@ -140,7 +141,7 @@
     "clipboard": "Vágólap vagy fogd és vidd",
     "close": "Bezárás",
     "close-board": "Tábla bezárása",
-    "close-board-pop": "Lehetősége lesz visszaállítani a táblát a kezdőlap fejlécében lévő „Archívumok” gombra kattintva.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "fekete",
     "color-blue": "kék",
     "color-green": "zöld",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Biztosan el szeretné hagyni ezt a táblát: __boardTitle__? El lesz távolítva a táblán lévő összes kártyáról.",
     "leaveBoardPopup-title": "Elhagyja a táblát?",
     "link-card": "Összekapcsolás ezzel a kártyával",
-    "list-archive-cards": "Az összes kártya archiválása ezen a listán",
-    "list-archive-cards-pop": "Ez el fogja távolítani a listán lévő összes kártyát a tábláról. Az archivált kártyák megtekintéséhez, és azok visszahozásához a táblára, kattintson a „Menü” → „Archivált elemek” menüpontra.",
+    "list-archive-cards": "Az összes kártya lomtárba helyezése ezen a listán.",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "A listán lévő összes kártya áthelyezése",
     "list-select-cards": "A listán lévő összes kártya kiválasztása",
     "listActionPopup-title": "Műveletek felsorolása",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Több",
     "link-list": "Összekapcsolás ezzel a listával",
     "list-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz lehetősége visszaállítani a listát. Nincs visszavonás.",
-    "list-delete-suggest-archive": "Archiválhat egy listát, hogy eltávolítsa a tábláról, és megőrizze a tevékenységet.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listák",
     "swimlanes": "Swimlanes",
     "log-out": "Kijelentkezés",
@@ -293,9 +294,9 @@
     "muted-info": "Soha sem lesz értesítve a táblán lévő semmilyen változásról.",
     "my-boards": "Saját tábláim",
     "name": "Név",
-    "no-archived-cards": "Nincsenek archivált kártyák.",
-    "no-archived-lists": "Nincsenek archivált listák.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "Nincs kártya a lomtárban.",
+    "no-archived-lists": "Nincs lista a lomtárban.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Nincs találat",
     "normal": "Normál",
     "normal-desc": "Megtekintheti és szerkesztheti a kártyákat. Nem változtathatja meg a beállításokat.",
@@ -331,8 +332,8 @@
     "restore": "Visszaállítás",
     "save": "Mentés",
     "search": "Keresés",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "Keresés a táblán lévő kártyák címében illetve leírásában",
+    "search-example": "keresőkifejezés",
     "select-color": "Szín kiválasztása",
     "set-wip-limit-value": "Korlát beállítása a listán lévő feladatok legnagyobb számához",
     "setWipLimitPopup-title": "WIP korlát beállítása",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Egy avatár feltöltve",
     "username": "Felhasználónév",
     "view-it": "Megtekintés",
-    "warn-list-archived": "figyelmeztetés: ez a kártya egy archivált listán van",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Megfigyelés",
     "watching": "Megfigyelés",
     "watching-info": "Értesítve lesz a táblán lévő összes változásról",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "E-mail megváltoztatásának engedélyezése",
     "createdAt": "Létrehozva",
     "verified": "Ellenőrizve",
-    "active": "Aktív"
+    "active": "Aktív",
+    "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"
 }

i18n/hy.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/id.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "Kartu__dilampirkan__ke__Daftar",
     "act-createList": "Daftar__ditambahkan__ke__Panel",
     "act-addBoardMember": "Partisipan__ditambahkan__ke__Kartu",
-    "act-archivedBoard": "Arsip__Panel",
-    "act-archivedCard": "Arsip__Kartu",
-    "act-archivedList": "Arsip __Daftar__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "Panel__diimpor",
     "act-importCard": "Kartu__diimpor__",
     "act-importList": "Daftar__diimpor__",
@@ -27,7 +27,7 @@
     "activities": "Daftar Kegiatan",
     "activity": "Kegiatan",
     "activity-added": "ditambahkan %s ke %s",
-    "activity-archived": "diarsipkan %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "dilampirkan %s ke %s",
     "activity-created": "dibuat %s",
     "activity-excluded": "tidak termasuk %s dari %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Dan__menghitung__kartu lain",
     "apply": "Terapkan",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Arsip",
-    "archive-all": "Arsipkan Semua",
-    "archive-board": "Arsip Panel",
-    "archive-card": "Arsip Kartu",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arsipkan yang dipilih",
-    "archiveBoardPopup-title": "Arsip Panel?",
-    "archived-items": "Arsip item",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Daftar Arsip",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Tugaskan anggota",
     "attached": "terlampir",
     "attachment": "Lampiran",
@@ -102,11 +102,11 @@
     "board-view-lists": "Daftar",
     "bucket-example": "Contohnya seperti “Bucket List” ",
     "cancel": "Batal",
-    "card-archived": "Kartu ini diarsipkan",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Kartu ini punya %s komentar",
     "card-delete-notice": "Menghapus sama dengan permanen. Anda akan kehilangan semua aksi yang terhubung ke kartu ini",
     "card-delete-pop": "Semua aksi akan dihapus dari aktivitas dan anda tidak bisa lagi buka kartu ini",
-    "card-delete-suggest-archive": "Anda bisa arsipkan kartu untuk menghapusnya dari panel dan mempertahankan aktivitas",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Jatuh Tempo",
     "card-due-on": "Jatuh Tempo pada",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Daftar Anggota",
     "cardMorePopup-title": "Lainnya",
     "cards": "Daftar Kartu",
+    "cards-count": "Daftar Kartu",
     "change": "Ubah",
     "change-avatar": "Ubah Avatar",
     "change-password": "Ubah Kata Sandi",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard atau drag & drop",
     "close": "Tutup",
     "close-board": "Tutup Panel",
-    "close-board-pop": "Anda bisa mengembalikan panel dengan klik tombol \"Arsip\" dari header beranda ",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "hitam",
     "color-blue": "biru",
     "color-green": "hijau",
@@ -245,7 +246,7 @@
     "import-show-user-mapping": "Review pemetaan partisipan",
     "import-user-select": "Pilih nama pengguna yang Anda mau gunakan sebagai anggota ini",
     "importMapMembersAddPopup-title": "Pilih anggota Wekan",
-    "info": "Version",
+    "info": "Versi",
     "initials": "Inisial",
     "invalid-date": "Tanggal tidak sah",
     "invalid-time": "Invalid time",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link ke kartu ini",
-    "list-archive-cards": "Arsipkan semua kartu ke daftar ini",
-    "list-archive-cards-pop": "Ini akan menghapus semua kartu di daftar inidari panel. Untuk menampilkan arsip kartu dan membawa mereka kembali ke panel, klik \"Menu\" > \"Arsip item\"",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Pindah semua kartu ke daftar ini",
     "list-select-cards": "Pilih semua kartu di daftar ini",
     "listActionPopup-title": "Daftar Tindakan",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Lainnya",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Daftar",
     "swimlanes": "Swimlanes",
     "log-out": "Keluar",
@@ -293,9 +294,9 @@
     "muted-info": "Anda tidak akan pernah dinotifikasi semua perubahan di panel ini",
     "my-boards": "Panel saya",
     "name": "Nama",
-    "no-archived-cards": "Tidak ada arsip kartu",
-    "no-archived-lists": "Tidak ada daftar arsip.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Tidak ada hasil",
     "normal": "Normal",
     "normal-desc": "Bisa tampilkan dan edit kartu. Tidak bisa ubah setting",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar diunggah",
     "username": "Nama Pengguna",
     "view-it": "Lihat",
-    "warn-list-archived": "Perhatian: Kartu ini dalam arsip daftar",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Amati",
     "watching": "Mengamati",
     "watching-info": "Anda akan diberitahu semua perubahan di panel ini",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/ig.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Ndị otu",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Gbanwe",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "Hụ ya",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Hụ",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Ekere na",
     "verified": "Verified",
-    "active": "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"
 }

i18n/it.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "ha aggiunto __card__ a __list__",
     "act-createList": "ha aggiunto __list__ a __board__",
     "act-addBoardMember": "ha aggiunto __member__ a __board__",
-    "act-archivedBoard": "ha archiviato __board__",
-    "act-archivedCard": "ha archiviato __card__",
-    "act-archivedList": "ha archiviato __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ spostata nel cestino",
+    "act-archivedCard": "__card__ spostata nel cestino",
+    "act-archivedList": "__list__ spostata nel cestino",
+    "act-archivedSwimlane": "__swimlane__ spostata nel cestino",
     "act-importBoard": "ha importato __board__",
     "act-importCard": "ha importato __card__",
     "act-importList": "ha importato __list__",
@@ -27,7 +27,7 @@
     "activities": "Attività",
     "activity": "Attività",
     "activity-added": "ha aggiunto %s a %s",
-    "activity-archived": "archiviato %s",
+    "activity-archived": "%s spostato nel cestino",
     "activity-attached": "allegato %s a %s",
     "activity-created": "creato %s",
     "activity-excluded": "escluso %s da %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "E __count__ altre schede",
     "apply": "Applica",
     "app-is-offline": "Wekan è in caricamento, attendi per favore. Ricaricare la pagina causerà una perdita di dati. Se Wekan non si carica, controlla per favore che non ci siano problemi al server.",
-    "archive": "Archivia",
-    "archive-all": "Archivia tutto",
-    "archive-board": "Archivia bacheca",
-    "archive-card": "Archivia scheda",
-    "archive-list": "Archivia Lista",
-    "archive-swimlane": "Archivia Corsia",
-    "archive-selection": "Archivia selezione",
-    "archiveBoardPopup-title": "Archivia Bacheca?",
-    "archived-items": "Elementi archiviati",
-    "archived-boards": "Bacheche Archiviate",
+    "archive": "Sposta nel cestino",
+    "archive-all": "Sposta tutto nel cestino",
+    "archive-board": "Sposta la bacheca nel cestino",
+    "archive-card": "Sposta la scheda nel cestino",
+    "archive-list": "Sposta la lista nel cestino",
+    "archive-swimlane": "Sposta la corsia nel cestino",
+    "archive-selection": "Sposta la selezione nel cestino",
+    "archiveBoardPopup-title": "Sposta la bacheca nel cestino",
+    "archived-items": "Cestino",
+    "archived-boards": "Bacheche cestinate",
     "restore-board": "Ripristina Bacheca",
-    "no-archived-boards": "Nessuna Bacheca Archiviata.",
-    "archives": "Archivi",
+    "no-archived-boards": "Nessuna bacheca nel cestino",
+    "archives": "Cestino",
     "assign-member": "Aggiungi membro",
     "attached": "allegato",
     "attachment": "Allegato",
@@ -102,11 +102,11 @@
     "board-view-lists": "Liste",
     "bucket-example": "Per esempio come \"una lista di cose da fare\"",
     "cancel": "Cancella",
-    "card-archived": "Questa scheda è archiviata.",
+    "card-archived": "Questa scheda è stata spostata nel cestino.",
     "card-comments-title": "Questa scheda ha %s commenti.",
     "card-delete-notice": "L'eliminazione è permanente. Tutte le azioni associate a questa scheda andranno perse.",
     "card-delete-pop": "Tutte le azioni saranno rimosse dal flusso attività e non sarai in grado di riaprire la scheda. Non potrai tornare indietro.",
-    "card-delete-suggest-archive": "Puoi archiviare una scheda per rimuoverla dalla bacheca e preservare la sua attività.",
+    "card-delete-suggest-archive": "Puoi cestinare una scheda per rimuoverla dalla bacheca e preservare la sua attività.",
     "card-due": "Scadenza",
     "card-due-on": "Scade",
     "card-spent": "Tempo trascorso",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membri",
     "cardMorePopup-title": "Altro",
     "cards": "Schede",
+    "cards-count": "Schede",
     "change": "Cambia",
     "change-avatar": "Cambia avatar",
     "change-password": "Cambia password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard o drag & drop",
     "close": "Chiudi",
     "close-board": "Chiudi bacheca",
-    "close-board-pop": "Sarai in grado di ripristinare la bacheca cliccando il tasto \"Archivi\" dall'intestazione della pagina principale.",
+    "close-board-pop": "Sarai in grado di ripristinare la bacheca cliccando il tasto \"Cestino\" dall'intestazione della pagina principale.",
     "color-black": "nero",
     "color-blue": "blu",
     "color-green": "verde",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Sei sicuro di voler abbandonare __boardTitle__? Sarai rimosso da tutte le schede in questa bacheca.",
     "leaveBoardPopup-title": "Abbandona Bacheca?",
     "link-card": "Link a questa scheda",
-    "list-archive-cards": "Archivia tutte le schede in questa lista",
-    "list-archive-cards-pop": "Questo rimuoverà dalla bacheca tutte le schede in questa lista. Per vedere le schede archiviate e portarle indietro alla bacheca, clicca “Menu” > “Elementi archiviati”",
+    "list-archive-cards": "Cestina tutte le schede in questa lista",
+    "list-archive-cards-pop": "Questo rimuoverà dalla bacheca tutte le schede in questa lista. Per vedere le schede cestinate e portarle indietro alla bacheca, clicca “Menu” > “Elementi cestinati”",
     "list-move-cards": "Sposta tutte le schede in questa lista",
     "list-select-cards": "Selezione tutte le schede in questa lista",
     "listActionPopup-title": "Azioni disponibili",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Altro",
     "link-list": "Link a questa lista",
     "list-delete-pop": "Tutte le azioni saranno rimosse dal flusso attività e non sarai in grado di recuperare la lista. Non potrai tornare indietro.",
-    "list-delete-suggest-archive": "Puoi archiviare una lista per rimuoverla dalla bacheca e preservarne l'attività.",
+    "list-delete-suggest-archive": "Puoi cestinare una scheda per rimuoverla dalla bacheca e preservare la sua attività.",
     "lists": "Liste",
     "swimlanes": "Corsie",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "Non sarai mai notificato delle modifiche in questa bacheca",
     "my-boards": "Le mie bacheche",
     "name": "Nome",
-    "no-archived-cards": "Nessuna scheda archiviata.",
-    "no-archived-lists": "Nessuna lista archiviata.",
-    "no-archived-swimlanes": "Nessuna scheda archiviata.",
+    "no-archived-cards": "Nessuna scheda nel cestino",
+    "no-archived-lists": "Nessuna lista nel cestino",
+    "no-archived-swimlanes": "Nessuna corsia nel cestino",
     "no-results": "Nessun risultato",
     "normal": "Normale",
     "normal-desc": "Può visionare e modificare le schede. Non può cambiare le impostazioni.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar caricato",
     "username": "Username",
     "view-it": "Vedi",
-    "warn-list-archived": "attenzione: questa scheda è in una lista archiviata",
+    "warn-list-archived": "attenzione: questa scheda è in una lista cestinata",
     "watch": "Segui",
     "watching": "Stai seguendo",
     "watching-info": "Sarai notificato per tutte le modifiche in questa bacheca",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Permetti modifica dell'email",
     "createdAt": "creato alle",
     "verified": "Verificato",
-    "active": "Attivo"
+    "active": "Attivo",
+    "card-received": "Ricevuta",
+    "card-received-on": "Ricevuta il",
+    "card-end": "Fine",
+    "card-end-on": "Termina il",
+    "editCardReceivedDatePopup-title": "Cambia data ricezione",
+    "editCardEndDatePopup-title": "Cambia data finale"
 }

i18n/ja.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__list__ に __card__ を追加しました",
     "act-createList": "__board__ に __list__ を追加しました",
     "act-addBoardMember": "__board__ に __member__ を追加しました",
-    "act-archivedBoard": "__board__ をアーカイブしました",
-    "act-archivedCard": "__card__ をアーカイブしました",
-    "act-archivedList": "__list__ をアーカイブしました",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "__board__ をインポートしました",
     "act-importCard": "__card__ をインポートしました",
     "act-importList": "__list__ をインポートしました",
@@ -27,7 +27,7 @@
     "activities": "アクティビティ",
     "activity": "アクティビティ",
     "activity-added": "%s を %s に追加しました",
-    "activity-archived": "%s をアーカイブしました",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s を %s に添付しました",
     "activity-created": "%s を作成しました",
     "activity-excluded": "%s を %s から除外しました",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "適用",
     "app-is-offline": "現在オフラインです。ページを更新すると保存していないデータは失われます。",
-    "archive": "アーカイブ",
-    "archive-all": "すべてをアーカイブ",
-    "archive-board": "ボードをアーカイブ",
-    "archive-card": "カードをアーカイブ",
-    "archive-list": "このリストをアーカイブ",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "選択したものをアーカイブ",
-    "archiveBoardPopup-title": "ボードをアーカイブしますか？",
-    "archived-items": "アーカイブされたアイテム",
-    "archived-boards": "アーカイブ済のボード",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "ボードをリストア",
-    "no-archived-boards": "アーカイブされたボードはありません",
-    "archives": "アーカイブ",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "メンバーの割当",
     "attached": "添付されました",
     "attachment": "添付ファイル",
@@ -102,11 +102,11 @@
     "board-view-lists": "リスト",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "キャンセル",
-    "card-archived": "カードはアーカイブされました。",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "%s 件のコメントがあります。",
     "card-delete-notice": "削除は取り消しできません。このカードに関係するすべてのアクションがなくなります。",
     "card-delete-pop": "すべての内容がアクティビティから削除されます。この削除は元に戻すことができません。",
-    "card-delete-suggest-archive": "アーカイブを使えば、内容を保存したままボード上からリストを表示しないようにできます。",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "期限",
     "card-due-on": "期限日",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "メンバー",
     "cardMorePopup-title": "さらに見る",
     "cards": "カード",
+    "cards-count": "カード",
     "change": "変更",
     "change-avatar": "アバターの変更",
     "change-password": "パスワードの変更",
@@ -140,7 +141,7 @@
     "clipboard": "クリップボードもしくはドラッグ＆ドロップ",
     "close": "閉じる",
     "close-board": "ボードを閉じる",
-    "close-board-pop": "ホームメニューの'アーカイブ'から、ボードを復元することができます。",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "黒",
     "color-blue": "青",
     "color-green": "緑",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "ボードから退出しますか？",
     "link-card": "このカードへのリンク",
-    "list-archive-cards": "リストの全カードをアーカイブする",
-    "list-archive-cards-pop": "ボードのこのリスト内のすべてのカードを取り除きます。アーカイブされたカードの確認やそれをボードに戻すには、メニューをクリックし、\"アーカイブされたアイテム\"をクリックしてください。",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "リストの全カードを移動する",
     "list-select-cards": "リストの全カードを選択",
     "listActionPopup-title": "操作一覧",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "さらに見る",
     "link-list": "このリストへのリンク",
     "list-delete-pop": "すべての内容がアクティビティから削除されます。この削除は元に戻すことができません。",
-    "list-delete-suggest-archive": "アーカイブを使えば、内容を保存したままボード上にリストを表示しないようにできます。",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "リスト",
     "swimlanes": "Swimlanes",
     "log-out": "ログアウト",
@@ -293,9 +294,9 @@
     "muted-info": "このボードの変更は通知されません",
     "my-boards": "自分のボード",
     "name": "名前",
-    "no-archived-cards": "アーカイブされたボードはありません",
-    "no-archived-lists": "アーカイブされたリストはありません",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "該当するものはありません",
     "normal": "通常",
     "normal-desc": "カードの閲覧と編集が可能。設定変更不可。",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "アップロードされたアバター",
     "username": "ユーザー名",
     "view-it": "見る",
-    "warn-list-archived": "警告：このカードはアーカイブされたリストにあります",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "ウォッチ",
     "watching": "ウォッチしています",
     "watching-info": "このボードの変更が通知されます",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "メールアドレスの変更を許可",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/ko.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__list__에 __card__ 추가",
     "act-createList": "__board__에 __list__ 추가",
     "act-addBoardMember": "__board__에 __member__ 추가",
-    "act-archivedBoard": "보관 된 __board__",
-    "act-archivedCard": "보관 된 __card__",
-    "act-archivedList": "보관 된 __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "가져온 __board__",
     "act-importCard": "가져온 __card__",
     "act-importList": "가져온 __list__",
@@ -27,7 +27,7 @@
     "activities": "활동 내역",
     "activity": "활동 상태",
     "activity-added": "%s를 %s에 추가함",
-    "activity-archived": "%s 저장됨",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s를 %s에 첨부함",
     "activity-created": "%s 생성됨",
     "activity-excluded": "%s를 %s에서 제외함",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "__count__ 개의 다른 카드들",
     "apply": "적용",
     "app-is-offline": "Wekan 로딩 중 입니다. 잠시 기다려주세요. 페이지를 새로고침 하시면 데이터가 손실될 수 있습니다. Wekan 을 불러오는데 실패한다면 서버가 중지되지 않았는지 확인 바랍니다.",
-    "archive": "보관",
-    "archive-all": "모두 보관",
-    "archive-board": "보드 저장소 보관",
-    "archive-card": "카드 저장소 보관",
-    "archive-list": "리스트 저장소 보관",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "저장소 선택",
-    "archiveBoardPopup-title": "보드를 저장소에 보관하시겠습니까?",
-    "archived-items": "보관된 아이템",
-    "archived-boards": "저장소 보관된 보드들",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "보드 복구",
-    "no-archived-boards": "보관된 보드가 없습니다.",
-    "archives": "저장소",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "멤버 지정",
     "attached": "첨부됨",
     "attachment": "첨부 파일",
@@ -102,11 +102,11 @@
     "board-view-lists": "목록들",
     "bucket-example": "예: “프로젝트 이름“ 입력",
     "cancel": "취소",
-    "card-archived": "이 카드를 보관합니다.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "이 카드에 %s 코멘트가 있습니다.",
     "card-delete-notice": "영구 삭제입니다. 이 카드와 관련된 모든 작업들을 잃게됩니다.",
     "card-delete-pop": "모든 작업이 활동 내역에서 제거되며 카드를 다시 열 수 없습니다. 복구가 안되니 주의하시기 바랍니다.",
-    "card-delete-suggest-archive": "카드를 보관하여 보드에서 제거하고 내용을 저장소에 보관 할 수 있습니다.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "종료일",
     "card-due-on": "종료일",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "멤버",
     "cardMorePopup-title": "더보기",
     "cards": "카드",
+    "cards-count": "카드",
     "change": "변경",
     "change-avatar": "아바타 변경",
     "change-password": "암호 변경",
@@ -140,7 +141,7 @@
     "clipboard": "클립보드 또는 드래그 앤 드롭",
     "close": "닫기",
     "close-board": "보드 닫기",
-    "close-board-pop": "홈 화면에서 \"저장소\" 버튼을 클릭하여 보드를 복원 할 수 있습니다.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "블랙",
     "color-blue": "블루",
     "color-green": "그린",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "카드에대한 링크",
-    "list-archive-cards": "목록에 있는 모든 카드를 저장소에 보관",
-    "list-archive-cards-pop": "보드의 목록에서 모든 카드를 삭제합니다. 보관된 카드를 보거나 그것들을 보드로 되돌릴려면, \"메뉴\" > \"보관된 아이템\"을 클릭합니다.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "목록에 있는 모든 카드를 이동",
     "list-select-cards": "목록에 있는 모든 카드를 선택",
     "listActionPopup-title": "동작 목록",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "더보기",
     "link-list": "이 리스트에 링크",
     "list-delete-pop": "모든 작업이 활동내역에서 제거되며 리스트를 복구 할 수 없습니다. 실행 취소는 불가능 합니다.",
-    "list-delete-suggest-archive": "리스트를 보관하여 보드에서 삭제하고 활동내역을 보존 할 수 있습니다.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "목록들",
     "swimlanes": "Swimlanes",
     "log-out": "로그아웃",
@@ -293,9 +294,9 @@
     "muted-info": "보드의 변경된 사항들의 알림을 받지 않습니다.",
     "my-boards": "내 보드",
     "name": "이름",
-    "no-archived-cards": "보관된 카드가 없습니다.",
-    "no-archived-lists": "보관된 목록이 없습니다.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "결과 값 없음",
     "normal": "표준",
     "normal-desc": "카드를 보거나 수정할 수 있습니다. 설정값은 변경할 수 없습니다.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "업로드한 아바타",
     "username": "아이디",
     "view-it": "보기",
-    "warn-list-archived": "경고: 이 카드는 저장소 목록에 있습니다.",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "감시",
     "watching": "감시 중",
     "watching-info": "\"이 보드의 변경사항을 알림으로 받습니다.",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/lv.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "pievienoja __card__ to __list__",
     "act-createList": "pievienoja __list__ to __board__",
     "act-addBoardMember": "pievienoja __member__ to __board__",
-    "act-archivedBoard": "arhivēja __board__",
-    "act-archivedCard": "arhivēja __card__",
-    "act-archivedList": "arhivēja __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "importēja __board__",
     "act-importCard": "importēja __card__",
     "act-importList": "importēja __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktivitātes",
     "activity": "Aktivitāte",
     "activity-added": "pievienoja %s pie %s",
-    "activity-archived": "arhivēja %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "pievienoja %s pie %s",
     "activity-created": "izveidoja%s",
     "activity-excluded": "izslēdza%s no%s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/mn.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Архив",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Гишүүд",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Аватар өөрчлөх",
     "change-password": "Нууц үг солих",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Гарах",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Миний самбарууд",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/nb.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "la __card__ til __list__",
     "act-createList": "la __list__ til __board__",
     "act-addBoardMember": "la __member__ til __board__",
-    "act-archivedBoard": "arkiverte __board__",
-    "act-archivedCard": "arkiverte __card__",
-    "act-archivedList": "arkiverte __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "importerte __board__",
     "act-importCard": "importerte __card__",
     "act-importList": "importerte __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktiviteter",
     "activity": "Aktivitet",
     "activity-added": "la %s til %s",
-    "activity-archived": "arkiverte %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "la %s til %s",
     "activity-created": "opprettet %s",
     "activity-excluded": "ekskluderte %s fra %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Og __count__ andre kort",
     "apply": "Lagre",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Arkiv",
-    "archive-all": "Arkiver alle",
-    "archive-board": "Arkiver tavle",
-    "archive-card": "Arkiver kort",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arkiver merkede",
-    "archiveBoardPopup-title": "Arkivere tavle?",
-    "archived-items": "Arkiverte punkter",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Arkiv",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Tildel medlem",
     "attached": "la ved",
     "attachment": "Vedlegg",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Som \"Bucket List\" for eksempel",
     "cancel": "Avbryt",
-    "card-archived": "Dette kortet er arkivert.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Dette kortet har %s kommentar.",
     "card-delete-notice": "Sletting er permanent. Du vil miste alle hendelser knyttet til dette kortet.",
     "card-delete-pop": "Alle handlinger vil fjernes fra feeden for aktiviteter og du vil ikke kunne åpne kortet på nytt. Det er ingen mulighet å angre.",
-    "card-delete-suggest-archive": "Du kan arkivere kortet for å fjerne det fra tavlen. All aktivitet vil beholdes.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Frist",
     "card-due-on": "Frist til",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Medlemmer",
     "cardMorePopup-title": "Mer",
     "cards": "Kort",
+    "cards-count": "Kort",
     "change": "Endre",
     "change-avatar": "Endre avatar",
     "change-password": "Endre passord",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Mer",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/nl.i18n.json

@@ -5,29 +5,29 @@
     "act-addChecklist": "__checklist__ toegevoegd aan __card__",
     "act-addChecklistItem": "__checklistItem__ aan checklist toegevoegd aan __checklist__ op __card__",
     "act-addComment": "gereageerd op __card__:__comment__",
-    "act-createBoard": "aangemaakte__bord__",
-    "act-createCard": "toegevoegd__kaart__aan__lijst__",
-    "act-createList": "toegevoegd__lijst__aan_bord__",
-    "act-addBoardMember": "__member__to__board__ toegevoegd",
-    "act-archivedBoard": "gearchiveerd __board__",
-    "act-archivedCard": "gearchiveerd __card__",
-    "act-archivedList": "gearchiveerd __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-createBoard": "aangemaakte __bord__",
+    "act-createCard": "toegevoegd __kaart__ aan __lijst__",
+    "act-createList": "toegevoegd __lijst__ aan __bord__",
+    "act-addBoardMember": "__member__ aan __board__ toegevoegd",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": " __board__ geïmporteerd",
-    "act-importCard": "__card__ geimporteerd",
-    "act-importList": "__list__ geimporteerd",
-    "act-joinMember": "toegevoegd __member__to__card__",
-    "act-moveCard": "verplaatst __card__from__oldList__to__list__",
-    "act-removeBoardMember": "verwijderd __member__from__board__",
-    "act-restoredCard": "hersteld __card__to__board__",
-    "act-unjoinMember": "verwijderd __member__from__card__",
+    "act-importCard": "__card__ geïmporteerd",
+    "act-importList": "__list__ geïmporteerd",
+    "act-joinMember": "__member__ aan __card__ toegevoegd",
+    "act-moveCard": "verplaatst __card__ van __oldList__ naar __list__",
+    "act-removeBoardMember": "verwijderd __member__ van __board__",
+    "act-restoredCard": "hersteld __card__ naar __board__",
+    "act-unjoinMember": "verwijderd __member__ van __card__",
     "act-withBoardTitle": "[Wekan] __board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Acties",
     "activities": "Activiteiten",
     "activity": "Activiteit",
     "activity-added": "%s toegevoegd aan %s",
-    "activity-archived": "%s gearchiveerd",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "%s bijgevoegd aan %s",
     "activity-created": "%s aangemaakt",
     "activity-excluded": "%s uitgesloten van %s",
@@ -45,7 +45,7 @@
     "add-attachment": "Voeg Bijlage Toe",
     "add-board": "Voeg Bord Toe",
     "add-card": "Voeg Kaart Toe",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "Swimlane Toevoegen",
     "add-checklist": "Voeg Checklist Toe",
     "add-checklist-item": "Voeg item toe aan checklist",
     "add-cover": "Voeg Cover Toe",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "En __count__ andere kaarten",
     "apply": "Aanmelden",
     "app-is-offline": "Wekan is aan het laden, wacht alstublieft. Het verversen van de pagina zorgt voor verlies van gegevens. Als Wekan niet laadt, check of de Wekan server is gestopt.",
-    "archive": "Archiveren",
-    "archive-all": "Alles Archiveren",
-    "archive-board": "Archiveer Bord",
-    "archive-card": "Archiveer Kaart",
-    "archive-list": "Archiveer Lijst",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archiveer Selectie",
-    "archiveBoardPopup-title": "Archiveer Bord?",
-    "archived-items": "Gearchiveerde Items",
-    "archived-boards": "Gearchiveerde Borden",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Herstel Bord",
-    "no-archived-boards": "Geen Gearchiveerde Borden.",
-    "archives": "Archieven",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Wijs lid aan",
     "attached": "bijgevoegd",
     "attachment": "Bijlage",
@@ -97,16 +97,16 @@
     "boardChangeWatchPopup-title": "Verander naar 'Watch'",
     "boardMenuPopup-title": "Bord menu",
     "boards": "Borden",
-    "board-view": "Board View",
+    "board-view": "Bord overzicht",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lijsten",
     "bucket-example": "Zoals \"Bucket List\" bijvoorbeeld",
     "cancel": "Annuleren",
-    "card-archived": "Deze kaart is gearchiveerd.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Deze kaart heeft %s reactie.",
     "card-delete-notice": "Verwijdering is permanent. Als je dit doet, verlies je alle informatie die op deze kaart is opgeslagen.",
     "card-delete-pop": "Alle acties worden verwijderd van de activiteiten feed, en er zal geen mogelijkheid zijn om de kaart opnieuw te openen. Deze actie kan je niet ongedaan maken.",
-    "card-delete-suggest-archive": "Om de kaart van het bord af te halen, zonder daarbij activiteiten te missen in de activiteiten feed, kan je klikken op \"archiveren\".",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Deadline: ",
     "card-due-on": "Deadline: ",
     "card-spent": "gespendeerde tijd",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Leden",
     "cardMorePopup-title": "Meer",
     "cards": "Kaarten",
+    "cards-count": "Kaarten",
     "change": "Wijzig",
     "change-avatar": "Wijzig avatar",
     "change-password": "Wijzig wachtwoord",
@@ -140,7 +141,7 @@
     "clipboard": "Vanuit clipboard of sleep het bestand hierheen",
     "close": "Sluiten",
     "close-board": "Sluit bord",
-    "close-board-pop": "Je kan het bord weer herstellen door op het \"Archief\" knop te drukken vanuit de voorpagina.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "zwart",
     "color-blue": "blauw",
     "color-green": "groen",
@@ -159,9 +160,9 @@
     "confirm-checklist-delete-dialog": "Weet u zeker dat u de checklist wilt verwijderen",
     "copy-card-link-to-clipboard": "Kopieer kaart link naar klembord",
     "copyCardPopup-title": "Kopieer kaart",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Checklist sjabloon kopiëren naar meerdere kaarten",
+    "copyChecklistToManyCardsPopup-instructions": "Doel kaart titels en omschrijvingen in dit JSON formaat",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Titel eerste kaart\", \"description\":\"Omschrijving eerste kaart\"}, {\"title\":\"Titel tweede kaart\",\"description\":\"Omschrijving tweede kaart\"},{\"title\":\"Titel laatste kaart\",\"description\":\"Omschrijving laatste kaart\"} ]",
     "create": "Aanmaken",
     "createBoardPopup-title": "Bord aanmaken",
     "chooseBoardSourcePopup-title": "Importeer bord",
@@ -263,24 +264,24 @@
     "leave-board-pop": "Weet u zeker dat u __boardTitle__ wilt verlaten? U wordt verwijderd van alle kaarten binnen dit bord",
     "leaveBoardPopup-title": "Bord verlaten?",
     "link-card": "Link naar deze kaart",
-    "list-archive-cards": "Achiveer alle kaarten in deze lijst",
-    "list-archive-cards-pop": "Deze actie zal alle kaarten in deze lijst archiveren. Om de gearchiveerde kaarten te bekijken, klik \"Menu\" > \"Gearchiveerde Items\"",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Verplaats alle kaarten in deze lijst",
     "list-select-cards": "Selecteer alle kaarten in deze lijst",
     "listActionPopup-title": "Lijst acties",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Swimlane handelingen",
     "listImportCardPopup-title": "Importeer een Trello kaart",
     "listMorePopup-title": "Meer",
     "link-list": "Link naar deze lijst",
     "list-delete-pop": "Alle acties zullen verwijderd worden van de activiteiten feed, en je zult deze niet meer kunnen herstellen. Je kan deze actie niet ongedaan maken.",
-    "list-delete-suggest-archive": "Je het beste een lijst archiveren om het zo van het bord af te halen, maar toch de activiteit te bewaren op de feed.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lijsten",
     "swimlanes": "Swimlanes",
     "log-out": "Uitloggen",
     "log-in": "Inloggen",
     "loginPopup-title": "Inloggen",
     "memberMenuPopup-title": "Instellingen van leden",
-    "members": "Lede",
+    "members": "Leden",
     "menu": "Menu",
     "move-selection": "Verplaats selectie",
     "moveCardPopup-title": "Verplaats kaart",
@@ -293,9 +294,9 @@
     "muted-info": "Je zal nooit meer geïnformeerd worden bij veranderingen in dit bord.",
     "my-boards": "Mijn Borden",
     "name": "Naam",
-    "no-archived-cards": "Geen gearchiveerde kaarten.",
-    "no-archived-lists": "Geen gearchiveerde lijsten.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Geen resultaten",
     "normal": "Normaal",
     "normal-desc": "Kan de kaarten zien en wijzigen. Kan de instellingen niet wijzigen.",
@@ -331,8 +332,8 @@
     "restore": "Herstel",
     "save": "Opslaan",
     "search": "Zoek",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "Zoeken in kaart titels en omschrijvingen op dit bord",
+    "search-example": "Tekst om naar te zoeken?",
     "select-color": "Selecteer kleur",
     "set-wip-limit-value": "Zet een limiet voor het maximaal aantal taken in deze lijst",
     "setWipLimitPopup-title": "Zet een WIP limiet",
@@ -360,7 +361,7 @@
     "overtime-hours": "Overwerk (in uren)",
     "overtime": "Overwerk",
     "has-overtime-cards": "Heeft kaarten met overwerk",
-    "has-spenttime-cards": "Has spent time cards",
+    "has-spenttime-cards": "Heeft tijd besteed aan kaarten",
     "time": "Tijd",
     "title": "Titel",
     "tracking": "Volgen",
@@ -373,12 +374,12 @@
     "uploaded-avatar": "Avatar is geüpload",
     "username": "Gebruikersnaam",
     "view-it": "Bekijk het",
-    "warn-list-archived": "Waarschuwing: deze kaart is gearchiveerd",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Bekijk",
     "watching": "Bekijken",
     "watching-info": "Je zal op de hoogte worden gesteld als er een verandering gebeurt op dit bord.",
     "welcome-board": "Welkom Bord",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "Mijlpaal 1",
     "welcome-list1": "Basis",
     "welcome-list2": "Geadvanceerd",
     "what-to-do": "Wat wil je doen?",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Sta E-mailadres wijzigingen toe",
     "createdAt": "Gemaakt op",
     "verified": "Geverifieerd",
-    "active": "Actief"
+    "active": "Actief",
+    "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"
 }

i18n/pl.i18n.json

@@ -1,18 +1,18 @@
 {
     "accept": "Akceptuj",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
+    "act-activity-notify": "[Wekan] Powiadomienia - aktywności",
+    "act-addAttachment": "załączono __attachement__ do __karty__",
+    "act-addChecklist": "dodano listę zadań __checklist__ to __card__",
+    "act-addChecklistItem": "dodano __checklistItem__ do listy zadań __checklist__ na karcie __card__",
     "act-addComment": "commented on __card__: __comment__",
     "act-createBoard": "created __board__",
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktywności",
     "activity": "Aktywność",
     "activity-added": "dodano %s z %s",
-    "activity-archived": "zarchiwizowano %s",
+    "activity-archived": "%s przeniesiono do Kosza",
     "activity-attached": "załączono %s z %s",
     "activity-created": "utworzono %s",
     "activity-excluded": "wyłączono %s z %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Zastosuj",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Zarchiwizuj",
-    "archive-all": "Zarchiwizuj wszystkie",
-    "archive-board": "Zarchiwizuj tablicę",
-    "archive-card": "Zarchiwizuj kartę",
-    "archive-list": "Zarchiwizuj listę",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Zarchiwizuj zaznaczone",
-    "archiveBoardPopup-title": "Zarchiwizować tablicę?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archiwizuj tablicę",
+    "archive": "Przenieś do Kosza",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Przywróć tablicę",
-    "no-archived-boards": "Brak zarchiwizowanych tablic",
-    "archives": "Zarchiwizowane",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Dodaj członka",
     "attached": "załączono",
     "attachment": "Załącznik",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listy",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Anuluj",
-    "card-archived": "Ta karta jest zarchiwizowana.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Ta karta ma %s komentarzy.",
     "card-delete-notice": "Usunięcie jest trwałe. Stracisz wszystkie akcje powiązane z tą kartą.",
     "card-delete-pop": "Wszystkie akcje będą usunięte z widoku aktywności, nie można będzie ponownie otworzyć karty.  Usunięcie jest nieodwracalne.",
-    "card-delete-suggest-archive": "Możesz zarchiwizować kartę w celu usunięcia jej z tablicy oraz zachowania jej aktywności.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Członkowie",
     "cardMorePopup-title": "Więcej",
     "cards": "Karty",
+    "cards-count": "Karty",
     "change": "Zmień",
     "change-avatar": "Zmień Avatar",
     "change-password": "Zmień hasło",
@@ -140,7 +141,7 @@
     "clipboard": "Schowek lub przeciągnij & upuść",
     "close": "Zamknij",
     "close-board": "Zamknij tablicę",
-    "close-board-pop": "Możesz przywrócić tablicę klikając przycisk \"Zarchiwizowane\" z głównej belki.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "czarny",
     "color-blue": "niebieski",
     "color-green": "zielony",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link do tej karty",
-    "list-archive-cards": "Zarchiwizuj wszystkie karty z tej listy",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Przenieś wszystkie karty z tej listy",
     "list-select-cards": "Zaznacz wszystkie karty z tej listy",
     "listActionPopup-title": "Lista akcji",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Więcej",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listy",
     "swimlanes": "Swimlanes",
     "log-out": "Wyloguj",
@@ -293,9 +294,9 @@
     "muted-info": "Nie zostaniesz powiadomiony o zmianach w tablicy",
     "my-boards": "Moje tablice",
     "name": "Nazwa",
-    "no-archived-cards": "Brak zarchiwizowanych kart.",
-    "no-archived-lists": "Brak zarchiwizowanych list.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Brak wyników",
     "normal": "Normal",
     "normal-desc": "Może widzieć i edytować karty. Nie może zmieniać ustawiań.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Wysłany avatar",
     "username": "Nazwa użytkownika",
     "view-it": "Zobacz",
-    "warn-list-archived": "ostrzeżenie: ta karta jest na zarchiwizowanej liście",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Obserwuj",
     "watching": "Obserwujesz",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Zezwól na zmianę adresu email",
     "createdAt": "Stworzono o",
     "verified": "Zweryfikowane",
-    "active": "Aktywny"
+    "active": "Aktywny",
+    "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"
 }

i18n/pt-BR.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__ adicionado à __list__",
     "act-createList": "__list__ adicionada à __board__",
     "act-addBoardMember": "__member__ adicionado à __board__",
-    "act-archivedBoard": "__board__ arquivado",
-    "act-archivedCard": "__card__ arquivado",
-    "act-archivedList": "__list__ arquivada",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "__board__ importado",
     "act-importCard": "__card__ importado",
     "act-importList": "__list__ importada",
@@ -27,7 +27,7 @@
     "activities": "Atividades",
     "activity": "Atividade",
     "activity-added": "adicionou %s a %s",
-    "activity-archived": "arquivou %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "anexou %s a %s",
     "activity-created": "criou %s",
     "activity-excluded": "excluiu %s de %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "E __count__ outros cartões",
     "apply": "Aplicar",
     "app-is-offline": "O Wekan está carregando, por favor espere. Recarregar a página irá causar perda de dado. Se o Wekan não carregar por favor verifique se o servidor Wekan não está parado.",
-    "archive": "Arquivar",
-    "archive-all": "Arquivar Tudo",
-    "archive-board": "Arquivar Quadro",
-    "archive-card": "Arquivar Cartão",
-    "archive-list": "Lista de Arquivos",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arquivar seleção",
-    "archiveBoardPopup-title": "Arquivar Quadro?",
-    "archived-items": "Itens Arquivados",
-    "archived-boards": "Quadros Arquivados",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restaurar Quadro",
-    "no-archived-boards": "Nenhum Quadro Arquivado",
-    "archives": "Arquivos",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Atribuir Membro",
     "attached": "anexado",
     "attachment": "Anexo",
@@ -97,16 +97,16 @@
     "boardChangeWatchPopup-title": "Alterar observação",
     "boardMenuPopup-title": "Menu do Quadro",
     "boards": "Quadros",
-    "board-view": "Board View",
+    "board-view": "Visão de quadro",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listas",
     "bucket-example": "\"Bucket List\", por exemplo",
     "cancel": "Cancelar",
-    "card-archived": "Este cartão está arquivado.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Este cartão possui %s comentários.",
     "card-delete-notice": "A exclusão será permanente. Você perderá todas as ações associadas a este cartão.",
     "card-delete-pop": "Todas as ações serão removidas da lista de Atividades e vocês não poderá re-abrir o cartão. Não há como desfazer.",
-    "card-delete-suggest-archive": "Você pode arquivar um cartão para removê-lo do quadro e preservar suas atividades.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Data fim",
     "card-due-on": "Finaliza em",
     "card-spent": "Tempo Gasto",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Mais",
     "cards": "Cartões",
+    "cards-count": "Cartões",
     "change": "Alterar",
     "change-avatar": "Alterar Avatar",
     "change-password": "Alterar Senha",
@@ -140,7 +141,7 @@
     "clipboard": "Área de Transferência ou arraste e solte",
     "close": "Fechar",
     "close-board": "Fechar Quadro",
-    "close-board-pop": "Você estará habilitado para restaurar o quadro clicando no botão \"Arquivos\" à partir da barra de início.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "preto",
     "color-blue": "azul",
     "color-green": "verde",
@@ -159,9 +160,9 @@
     "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar lista de verificação",
     "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência",
     "copyCardPopup-title": "Copiar o cartão",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Copiar modelo de checklist para vários cartões",
+    "copyChecklistToManyCardsPopup-instructions": "Títulos e descrições do cartão de destino neste formato JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Título do primeiro cartão\", \"description\":\"Descrição do primeiro cartão\"}, {\"title\":\"Título do segundo cartão\",\"description\":\"Descrição do segundo cartão\"},{\"title\":\"Título do último cartão\",\"description\":\"Descrição do último cartão\"} ]",
     "create": "Criar",
     "createBoardPopup-title": "Criar Quadro",
     "chooseBoardSourcePopup-title": "Importar quadro",
@@ -182,7 +183,7 @@
     "edit-avatar": "Alterar Avatar",
     "edit-profile": "Editar Perfil",
     "edit-wip-limit": "Editar Limite WIP",
-    "soft-wip-limit": "Soft WIP Limit",
+    "soft-wip-limit": "Limite de WIP",
     "editCardStartDatePopup-title": "Altera data de início",
     "editCardDueDatePopup-title": "Altera data fim",
     "editCardSpentTimePopup-title": "Editar tempo gasto",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Tem a certeza de que pretende sair de __boardTitle__? Você será removido de todos os cartões neste quadro.",
     "leaveBoardPopup-title": "Sair do Quadro ?",
     "link-card": "Vincular a este cartão",
-    "list-archive-cards": "Arquivar todos os cartões nesta lista",
-    "list-archive-cards-pop": "Isto removerá todos os cartões desta lista do quadro. Para visualizar os cartões arquivados e trazê-los de volta para o quadro, clique em “Menu” > “Itens Arquivados”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Mover todos os cartões desta lista",
     "list-select-cards": "Selecionar todos os cartões nesta lista",
     "listActionPopup-title": "Listar Ações",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Mais",
     "link-list": "Vincular a esta lista",
     "list-delete-pop": "Todas as ações serão removidas da lista de atividades e você não poderá recuperar a lista. Não há como desfazer.",
-    "list-delete-suggest-archive": "Você pode arquivar uma lista para removê-la do quadro e preservar as atividades.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listas",
     "swimlanes": "Swimlanes",
     "log-out": "Sair",
@@ -293,9 +294,9 @@
     "muted-info": "Você nunca receberá qualquer notificação desse board",
     "my-boards": "Meus Quadros",
     "name": "Nome",
-    "no-archived-cards": "Nenhum cartão arquivado",
-    "no-archived-lists": "Sem listas arquivadas",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Nenhum resultado.",
     "normal": "Normal",
     "normal-desc": "Pode ver e editar cartões. Não pode alterar configurações.",
@@ -331,8 +332,8 @@
     "restore": "Restaurar",
     "save": "Salvar",
     "search": "Buscar",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "Pesquisa em títulos e descrições de cartões neste quadro",
+    "search-example": "Texto para procurar",
     "select-color": "Selecionar Cor",
     "set-wip-limit-value": "Defina um limite máximo para o número de tarefas nesta lista",
     "setWipLimitPopup-title": "Definir Limite WIP",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar carregado",
     "username": "Nome de usuário",
     "view-it": "Visualizar",
-    "warn-list-archived": "aviso: este cartão está em uma lista arquivada",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Observar",
     "watching": "Observando",
     "watching-info": "Você será notificado em qualquer alteração desse board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Permitir Mudança de Email",
     "createdAt": "Criado em",
     "verified": "Verificado",
-    "active": "Ativo"
+    "active": "Ativo",
+    "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"
 }

i18n/pt.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "Arquivo %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "Criado %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Mais",
     "cards": "Cartões",
+    "cards-count": "Cartões",
     "change": "Alterar",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Mais",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nome",
-    "no-archived-cards": "Nenhum cartão arquivado.",
-    "no-archived-lists": "Nenhuma lista arquivada.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Nenhum resultado",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verificado",
-    "active": "Ativo"
+    "active": "Ativo",
+    "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"
 }

i18n/ro.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Arhive",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Ataşament",
@@ -102,11 +102,11 @@
     "board-view-lists": "Liste",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Închide",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Liste",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nume",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/ru.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "добавил __card__ в __list__",
     "act-createList": "добавил __list__ для __board__",
     "act-addBoardMember": "добавил __member__ в __board__",
-    "act-archivedBoard": "__board__ помещена в архив",
-    "act-archivedCard": "поместил __card__ в архив",
-    "act-archivedList": "поместил __list__ в архив",
-    "act-archivedSwimlane": "поместил __swimlane__ в архив",
+    "act-archivedBoard": "Доска __board__ перемещена в Корзину",
+    "act-archivedCard": "Карточка __card__ перемещена в Корзину",
+    "act-archivedList": "Список __list__ перемещён в Корзину",
+    "act-archivedSwimlane": "Дорожка __swimlane__ перемещена в Корзину",
     "act-importBoard": "__board__ импортирована",
     "act-importCard": "__card__ импортирована",
     "act-importList": "__list__ импортирован",
@@ -27,7 +27,7 @@
     "activities": "История действий",
     "activity": "Действия участников",
     "activity-added": "добавил %s на %s",
-    "activity-archived": "отправил в архив %s",
+    "activity-archived": "%s перемещено в Корзину",
     "activity-attached": "прикрепил %s к %s",
     "activity-created": "создал %s",
     "activity-excluded": "исключил %s из %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "И __count__ другие карточки",
     "apply": "Применить",
     "app-is-offline": "Wekan загружается, пожалуйста подождите. Обновление страницы может привести к потере данных. Если Wekan не загрузился, пожалуйста проверьте что связь с сервером доступна.",
-    "archive": "Архивировать",
-    "archive-all": "Архивировать все",
-    "archive-board": "Архивировать доску",
-    "archive-card": "Архивировать карточку",
-    "archive-list": "Архивировать список",
-    "archive-swimlane": "Архивировать дорожку",
-    "archive-selection": "Архивировать выбранное",
-    "archiveBoardPopup-title": "Заархивировать доску?",
-    "archived-items": "Объекты в архиве",
-    "archived-boards": "Доски в архиве",
+    "archive": "Переместить в Корзину",
+    "archive-all": "Переместить всё в Корзину",
+    "archive-board": "Переместить Доску в Корзину",
+    "archive-card": "Переместить Карточку в Корзину",
+    "archive-list": "Переместить Список в Корзину",
+    "archive-swimlane": "Переместить Дорожку в Корзину",
+    "archive-selection": "Переместить выбранное в Корзину",
+    "archiveBoardPopup-title": "Переместить Доску в Корзину?",
+    "archived-items": "Корзина",
+    "archived-boards": "Доски находящиеся в Корзине",
     "restore-board": "Востановить доску",
-    "no-archived-boards": "Нет архивных досок.",
-    "archives": "Архивы",
+    "no-archived-boards": "В Корзине нет никаких Досок",
+    "archives": "Корзина",
     "assign-member": "Назначить участника",
     "attached": "прикреплено",
     "attachment": "Вложение",
@@ -102,20 +102,20 @@
     "board-view-lists": "Списки",
     "bucket-example": "Например “Список дел”",
     "cancel": "Отмена",
-    "card-archived": "Эта карточка помещена в архив.",
+    "card-archived": "Эта карточка перемещена в Корзину",
     "card-comments-title": "Комментарии (%s)",
     "card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.",
     "card-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете заново открыть карточку. Действие необратимо",
-    "card-delete-suggest-archive": "Вы можете заархивировать карточку, чтобы убрать ее с доски, сохранив всю историю действий участников.",
-    "card-due": "До",
-    "card-due-on": "Завершить до",
+    "card-delete-suggest-archive": "Вы можете переместить карточку в Корзину, чтобы удалить ее с доски и сохранить активность .",
+    "card-due": "Выполнить к",
+    "card-due-on": "Выполнить до",
     "card-spent": "Затраченное время",
     "card-edit-attachments": "Изменить вложения",
     "card-edit-labels": "Изменить метку",
     "card-edit-members": "Изменить участников",
     "card-labels-title": "Изменить метки для этой карточки.",
     "card-members-title": "Добавить или удалить с карточки участников доски.",
-    "card-start": "Начать",
+    "card-start": "Дата начала",
     "card-start-on": "Начнётся с",
     "cardAttachmentsPopup-title": "Прикрепить из",
     "cardDeletePopup-title": "Удалить карточку?",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Участники",
     "cardMorePopup-title": "Поделиться",
     "cards": "Карточки",
+    "cards-count": "Карточки",
     "change": "Изменить",
     "change-avatar": "Изменить аватар",
     "change-password": "Изменить пароль",
@@ -140,7 +141,7 @@
     "clipboard": "Буфер обмена или drag & drop",
     "close": "Закрыть",
     "close-board": "Закрыть доску",
-    "close-board-pop": "Вы можете восстановить доску, нажав  “Архивы” в заголовке.",
+    "close-board-pop": "Вы можете восстановить доску, нажав  “Корзина” в заголовке.",
     "color-black": "черный",
     "color-blue": "синий",
     "color-green": "зеленый",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Вы уверенны, что хотите покинуть __boardTitle__? Вы будете удалены из всех карточек на этой доске.",
     "leaveBoardPopup-title": "Покинуть доску?",
     "link-card": "Доступна по ссылке",
-    "list-archive-cards": "Архивировать все карточки в этом списке",
-    "list-archive-cards-pop": "Это действие переместит все карточки в архив и они перестанут быть видимым на доске. Для просмотра карточек в архиве нажмите “Меню” > “Объекты в архиве”.",
+    "list-archive-cards": "Переместить все карточки в этом списке в Корзину",
+    "list-archive-cards-pop": "Это действие переместит все карточки в Корзину и они перестанут быть видимым на доске. Для просмотра карточек в Корзине и их восстановления нажмите “Меню” > “Корзина”.",
     "list-move-cards": "Переместить все карточки в этом списке",
     "list-select-cards": "Выбрать все карточки в этом списке",
     "listActionPopup-title": "Список действий",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Поделиться",
     "link-list": "Ссылка на список",
     "list-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете восстановить список. Данное действие необратимо.",
-    "list-delete-suggest-archive": "Вы можете заархивировать список, чтобы убрать его с доски, сохранив всю историю действий участников.",
+    "list-delete-suggest-archive": "Вы можете переместить карточку в Корзину, чтобы удалить ее с доски и сохранить активность .",
     "lists": "Списки",
     "swimlanes": "Дорожки",
     "log-out": "Выйти",
@@ -293,9 +294,9 @@
     "muted-info": "Вы НИКОГДА не будете уведомлены ни о каких изменениях в этой доске.",
     "my-boards": "Мои доски",
     "name": "Имя",
-    "no-archived-cards": "Нет карточек в архиве.",
-    "no-archived-lists": "Нет списков в архиве.",
-    "no-archived-swimlanes": "Нет дорожек в архиве.\n",
+    "no-archived-cards": "В Корзине нет никаких Карточек",
+    "no-archived-lists": "В Корзине нет никаких Списков",
+    "no-archived-swimlanes": "В Корзине нет никаких Дорожек",
     "no-results": "Ничего не найдено",
     "normal": "Обычный",
     "normal-desc": "Может редактировать карточки. Не может управлять настройками.",
@@ -331,8 +332,8 @@
     "restore": "Восстановить",
     "save": "Сохранить",
     "search": "Поиск",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "Искать в названиях и описаниях карточек на этой доске",
+    "search-example": "Искать текст?",
     "select-color": "Выбрать цвет",
     "set-wip-limit-value": "Устанавливает ограничение на максимальное количество задач в этом списке",
     "setWipLimitPopup-title": "Задать лимит на кол-во задач",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Загруженный аватар",
     "username": "Имя пользователя",
     "view-it": "Просмотреть",
-    "warn-list-archived": "Внимание: Данная карточка находится в списке архива",
+    "warn-list-archived": "Внимание: Данная карточка находится в списке, который перемещен в Корзину",
     "watch": "Следить",
     "watching": "Отслеживается",
     "watching-info": "Вы будете уведомлены об любых изменениях в этой доске.",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Разрешить изменение электронной почты",
     "createdAt": "Создано на",
     "verified": "Проверено",
-    "active": "Действующий"
+    "active": "Действующий",
+    "card-received": "Получено",
+    "card-received-on": "Получено с",
+    "card-end": "Дата окончания",
+    "card-end-on": "Завершится до",
+    "editCardReceivedDatePopup-title": "Изменить дату получения",
+    "editCardEndDatePopup-title": "Изменить дату завершения"
 }

i18n/sr.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktivnosti",
     "activity": "Aktivnost",
     "activity-added": "dodao %s u %s",
-    "activity-archived": "arhivirao %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "prikačio %s u %s",
     "activity-created": "kreirao %s",
     "activity-excluded": "izuzmi %s iz %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Primeni",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Arhiviraj",
-    "archive-all": "Arhiviraj sve",
-    "archive-board": "Arhiviraj tablu",
-    "archive-card": "Arhiviraj karticu",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arhiviraj izabrano",
-    "archiveBoardPopup-title": "Da arhiviram tablu ?",
-    "archived-items": "Arhivirane stavke",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Arhive",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Dodeli člana",
     "attached": "Prikačeno",
     "attachment": "Prikačeni dokument",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Na primer \"Lista zadataka\"",
     "cancel": "Otkaži",
-    "card-archived": "Ova kartica je arhivirana",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Ova kartica ima %s komentar.",
     "card-delete-notice": "Brisanje je trajno. Izgubićeš sve akcije povezane sa ovom karticom.",
     "card-delete-pop": "Sve akcije će biti uklonjene sa liste aktivnosti i kartica neće moći biti ponovo otvorena. Nema vraćanja unazad.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Krajnji datum",
     "card-due-on": "Završava se",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Članovi",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "Nećete biti obavešteni o promenama u ovoj tabli",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Nema rezultata",
     "normal": "Normalno",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Korisničko ime",
     "view-it": "Pregledaj je",
-    "warn-list-archived": "upozorenje: ova kartica je u arhiviranoj listi",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Posmatraj",
     "watching": "Posmatranje",
     "watching-info": "Bićete obavešteni o promenama u ovoj tabli",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/sv.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "lade till __card__ to __list__",
     "act-createList": "lade till __list__ to __board__",
     "act-addBoardMember": "lade till __member__ to __board__",
-    "act-archivedBoard": "arkiverade __board__",
-    "act-archivedCard": "arkiverade __card__",
-    "act-archivedList": "arkiverade __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ flyttad till papperskorgen",
+    "act-archivedCard": "__card__ flyttad till papperskorgen",
+    "act-archivedList": "__list__ flyttad till papperskorgen",
+    "act-archivedSwimlane": "__swimlane__ flyttad till papperskorgen",
     "act-importBoard": "importerade __board__",
     "act-importCard": "importerade __card__",
     "act-importList": "importerade __list__",
@@ -27,7 +27,7 @@
     "activities": "Aktiviteter",
     "activity": "Aktivitet",
     "activity-added": "Lade %s till %s",
-    "activity-archived": "arkiverade %s",
+    "activity-archived": "%s flyttad till papperskorgen",
     "activity-attached": "bifogade %s to %s",
     "activity-created": "skapade %s",
     "activity-excluded": "exkluderade %s från %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Och __count__ andra kort",
     "apply": "Tillämpa",
     "app-is-offline": "Wekan laddar, vänta. Uppdatering av sidan kommer att leda till förlust av data. Om Wekan inte laddas, kontrollera att Wekan-servern inte har stoppats.",
-    "archive": "Arkivera",
-    "archive-all": "Arkivera",
-    "archive-board": "Arkiverad anslagstavla",
-    "archive-card": "Arkivera kort",
-    "archive-list": "Arkivera lista",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Arkivera val",
-    "archiveBoardPopup-title": "Arkivera anslagstavla?",
-    "archived-items": "Arkivera objekt",
-    "archived-boards": "Arkiverade anslagstavlor",
+    "archive": "Flytta till papperskorgen",
+    "archive-all": "Flytta alla till papperskorgen",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Papperskorgen",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Återställ anslagstavla",
-    "no-archived-boards": "Ingen arkiverad anslagstavla",
-    "archives": "Arkiv",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Papperskorgen",
     "assign-member": "Tilldela medlem",
     "attached": "bifogad",
     "attachment": "Bilaga",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listor",
     "bucket-example": "Gilla \"att-göra-innan-jag-dör-lista\" till exempel",
     "cancel": "Avbryt",
-    "card-archived": "Detta kort är arkiverat.",
+    "card-archived": "Detta kort flyttas till papperskorgen.",
     "card-comments-title": "Detta kort har %s kommentar.",
     "card-delete-notice": "Ta bort är permanent. Du kommer att förlora alla åtgärder i samband med detta kort.",
     "card-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsflöde och du kommer inte att kunna öppna kortet igen. Det går inte att ångra.",
-    "card-delete-suggest-archive": "Du kan arkivera ett kort för att ta bort det från anslagstavlan och bevara aktiviteten.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Förfaller",
     "card-due-on": "Förfaller på",
     "card-spent": "Spenderad tid",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Medlemmar",
     "cardMorePopup-title": "Mera",
     "cards": "Kort",
+    "cards-count": "Kort",
     "change": "Ändra",
     "change-avatar": "Ändra avatar",
     "change-password": "Ändra lösenord",
@@ -140,7 +141,7 @@
     "clipboard": "Urklipp eller dra och släpp",
     "close": "Stäng",
     "close-board": "Stäng anslagstavla",
-    "close-board-pop": "Du kommer att kunna återställa anslagstavlan genom att klicka på knappen ”Arkiv” från hem huvudet.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "svart",
     "color-blue": "blå",
     "color-green": "grön",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Är du säker på att du vill lämna __boardTitle__? Du kommer att tas bort från alla kort på den här anslagstavlan.",
     "leaveBoardPopup-title": "Lämna anslagstavla ?",
     "link-card": "Länka till detta kort",
-    "list-archive-cards": "Arkivera alla kort i denna lista",
-    "list-archive-cards-pop": "Detta tar bort alla kort i denna lista från anslagstavlan. Om du se arkiverade kort och få dem tillbaka till anslagstavlan, klicka på ”Meny” > ”Arkiverade objekt”.",
+    "list-archive-cards": "Flytta alla kort i den här listan till papperskorgen",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Flytta alla kort i denna lista",
     "list-select-cards": "Välj alla kort i denna lista",
     "listActionPopup-title": "Liståtgärder",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Mera",
     "link-list": "Länk till den här listan",
     "list-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsmatningen och du kommer inte att kunna återställa listan. Det går inte att ångra.",
-    "list-delete-suggest-archive": "Du kan arkivera en lista för att ta bort den från anslagstavlan och bevara aktiviteten.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Listor",
     "swimlanes": "Swimlanes",
     "log-out": "Logga ut",
@@ -293,9 +294,9 @@
     "muted-info": "Du kommer aldrig att meddelas om eventuella ändringar i denna anslagstavla",
     "my-boards": "Mina anslagstavlor",
     "name": "Namn",
-    "no-archived-cards": "Inga arkiverade kort.",
-    "no-archived-lists": "Inga arkiverade listor.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "Inga kort i papperskorgen.",
+    "no-archived-lists": "Inga listor i papperskorgen.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "Inga reslutat",
     "normal": "Normal",
     "normal-desc": "Kan se och redigera kort. Kan inte ändra inställningar.",
@@ -332,7 +333,7 @@
     "save": "Spara",
     "search": "Sök",
     "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-example": "Text att söka efter?",
     "select-color": "Välj färg",
     "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan",
     "setWipLimitPopup-title": "Ställ in WIP-gräns",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Laddade upp en avatar",
     "username": "Änvandarnamn",
     "view-it": "Visa det",
-    "warn-list-archived": "varning: detta kort är en arkiverad lista",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Bevaka",
     "watching": "Bevakar",
     "watching-info": "Du kommer att meddelas om alla ändringar på denna anslagstavla",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Tillåt e-poständring",
     "createdAt": "Skapad vid",
     "verified": "Verifierad",
-    "active": "Aktiv"
+    "active": "Aktiv",
+    "card-received": "Mottagen",
+    "card-received-on": "Received on",
+    "card-end": "Slut",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Ändra mottagningsdatum",
+    "editCardEndDatePopup-title": "Ändra slutdatum"
 }

i18n/ta.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "added __card__ to __list__",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "archived __card__",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "imported __card__",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Archive",
-    "archive-all": "Archive All",
-    "archive-board": "Archive Board",
-    "archive-card": "Archive Card",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Archive selection",
-    "archiveBoardPopup-title": "Archive Board?",
-    "archived-items": "Archived Items",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/th.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "เพิ่ม __card__ ไปยัง __list__",
     "act-createList": "เพิ่ม __list__ ไปยัง __board__",
     "act-addBoardMember": "เพิ่ม __member__ ไปยัง __board__",
-    "act-archivedBoard": "เก็บ __board__ ไว้",
-    "act-archivedCard": "เก็บ __card__ ไว้",
-    "act-archivedList": "เก็บ __list__ ไว้",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "นำเข้า __board__",
     "act-importCard": "นำเข้า __card__",
     "act-importList": "นำเข้า __list__",
@@ -27,7 +27,7 @@
     "activities": "กิจกรรม",
     "activity": "กิจกรรม",
     "activity-added": "เพิ่ม %s ไปยัง %s",
-    "activity-archived": "เก็บ %s ไว้",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "แนบ %s ไปยัง %s",
     "activity-created": "สร้าง %s",
     "activity-excluded": "ยกเว้น %s จาก %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "และการ์ดอื่น ๆ  __count__",
     "apply": "นำมาใช้",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "เอกสารที่เก็บไว้",
-    "archive-all": "เอกสารที่เก็บไว้ทั้งหมด",
-    "archive-board": "เอกสารบอร์ดที่เก็บไว้",
-    "archive-card": "เอกสารการ์ดที่เก็บไว้",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "คัดเลือกเอกสาร",
-    "archiveBoardPopup-title": "เก็บบอร์ดนี้หรือไม่",
-    "archived-items": "เก็บไว้ถาวร",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "เอกสารสำคัญ",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "กำหนดสมาชิก",
     "attached": "แนบมาด้วย",
     "attachment": "สิ่งที่แนบมา",
@@ -102,11 +102,11 @@
     "board-view-lists": "รายการ",
     "bucket-example": "ตัวอย่างเช่น “ระบบที่ต้องทำ”",
     "cancel": "ยกเลิก",
-    "card-archived": "การ์ดนี้ถูกเก็บไว้",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "การ์ดนี้มี %s ความเห็น.",
     "card-delete-notice": "เป็นการลบถาวร คุณจะสูญเสียข้อมูลที่เกี่ยวข้องกับการ์ดนี้ทั้งหมด",
     "card-delete-pop": "การดำเนินการทั้งหมดจะถูกลบจาก feed กิจกรรมและคุณไม่สามารถเปิดได้อีกครั้งหรือยกเลิกการทำ",
-    "card-delete-suggest-archive": "คุณสามารถเก็บการ์ดที่จะเอาออกจากบอร์ดนี้และยังคงเก็บกิจกรรม",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "ครบกำหนด",
     "card-due-on": "ครบกำหนดเมื่อ",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "สมาชิก",
     "cardMorePopup-title": "เพิ่มเติม",
     "cards": "การ์ด",
+    "cards-count": "การ์ด",
     "change": "เปลี่ยน",
     "change-avatar": "เปลี่ยนภาพ",
     "change-password": "เปลี่ยนรหัสผ่าน",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard หรือลากและวาง",
     "close": "ปิด",
     "close-board": "ปิดบอร์ด",
-    "close-board-pop": "คุณสามารถเรียกคืนบอร์ดนี้ด้วยการคลิกปุ่ม “เอกสารสำคัญ” เมนูหน้าแรก",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "ดำ",
     "color-blue": "น้ำเงิน",
     "color-green": "เขียว",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "เชื่อมโยงไปยังการ์ดใบนี้",
-    "list-archive-cards": "เก็บการ์ดทั้งหมดไว้ในรายการนี้",
-    "list-archive-cards-pop": "ลบการ์ดทั้งหมดในบอร์ด มันจะถูกนำไปเก็บไว้ที่เอกสารสำคัญ สามารถนำกลับมาใหม่ได้ด้วยการคลิก “เมนูบอร์ด” > “เก็บไว้ถาวร”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "ย้ายการ์ดทั้งหมดในรายการนี้",
     "list-select-cards": "เลือกการ์ดทั้งหมดในรายการนี้",
     "listActionPopup-title": "รายการการดำเนิน",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "เพิ่มเติม",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "รายการ",
     "swimlanes": "Swimlanes",
     "log-out": "ออกจากระบบ",
@@ -293,9 +294,9 @@
     "muted-info": "คุณจะไม่ได้รับแจ้งการเปลี่ยนแปลงใด ๆ ในบอร์ดนี้",
     "my-boards": "บอร์ดของฉัน",
     "name": "ชื่อ",
-    "no-archived-cards": "ไม่มีการ์ดที่ถูกเก็บ",
-    "no-archived-lists": "ไม่มีรายการที่ถูกเก็บ",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "ไม่มีข้อมูล",
     "normal": "ธรรมดา",
     "normal-desc": "สามารถดูและแก้ไขการ์ดได้ แต่ไม่สามารถเปลี่ยนการตั้งค่าได้",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "ภาพอัพโหลดแล้ว",
     "username": "ชื่อผู้ใช้งาน",
     "view-it": "ดู",
-    "warn-list-archived": "คำเตือน: การ์ดใบนี้อยู่ในรายชื่อที่เก็บไว้",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "เฝ้าดู",
     "watching": "เฝ้าดู",
     "watching-info": "คุณจะได้รับแจ้งหากมีการเปลี่ยนแปลงใด ๆ ในบอร์ดนี้",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/tr.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__ kartını ___list__ listesine ekledi",
     "act-createList": "__list__ listesini __board__ panosuna ekledi",
     "act-addBoardMember": "__member__ kullanıcısını __board__ panosuna ekledi",
-    "act-archivedBoard": "__board__ panosunu arşivledi",
-    "act-archivedCard": "__card__ kartını arşivledi",
-    "act-archivedList": "__list__ listesini arşivledi",
-    "act-archivedSwimlane": "__swimlane__ arşivlendi",
+    "act-archivedBoard": "__board__ Geri Dönüşüm Kutusu'na taşındı",
+    "act-archivedCard": "__card__ Geri Dönüşüm Kutusu'na taşındı",
+    "act-archivedList": "__list__ Geri Dönüşüm Kutusu'na taşındı",
+    "act-archivedSwimlane": "__swimlane__ Geri Dönüşüm Kutusu'na taşındı",
     "act-importBoard": "__board__ panosunu içe aktardı",
     "act-importCard": "__card__ kartını içe aktardı",
     "act-importList": "__list__ listesini içe aktardı",
@@ -27,7 +27,7 @@
     "activities": "Etkinlikler",
     "activity": "Etkinlik",
     "activity-added": "%s içine %s ekledi",
-    "activity-archived": "%s öğesini arşivledi",
+    "activity-archived": "%s Geri Dönüşüm Kutusu'na taşındı",
     "activity-attached": "%s içine %s ekledi",
     "activity-created": "%s öğesini oluşturdu",
     "activity-excluded": "%s içinden %s çıkarttı",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Ve __count__ diğer kart",
     "apply": "Uygula",
     "app-is-offline": "Wekan yükleniyor, lütfen bekleyin. Sayfayı yenilemek veri kaybına sebep olabilir. Eğer Wekan yüklenmezse, lütfen Wekan sunucusunun çalıştığından emin olun.",
-    "archive": "Arşivle",
-    "archive-all": "Tümünü Arşivle",
-    "archive-board": "Panoyu Arşivle",
-    "archive-card": "Kartı Arşivle",
-    "archive-list": "Listeyi Arşivle",
-    "archive-swimlane": "Kulvarı Arşivle",
-    "archive-selection": "Seçimi arşivle",
-    "archiveBoardPopup-title": "Pano Arşivlensin mi?",
-    "archived-items": "Arşivlenmiş Öğeler",
-    "archived-boards": "Arşivlenmiş Panolar",
+    "archive": "Geri Dönüşüm Kutusu'na taşı",
+    "archive-all": "Tümünü Geri Dönüşüm Kutusu'na taşı",
+    "archive-board": "Panoyu Geri Dönüşüm Kutusu'na taşı",
+    "archive-card": "Kartı Geri Dönüşüm Kutusu'na taşı",
+    "archive-list": "Listeyi Geri Dönüşüm Kutusu'na taşı",
+    "archive-swimlane": "Kulvarı Geri Dönüşüm Kutusu'na taşı",
+    "archive-selection": "Seçimi Geri Dönüşüm Kutusu'na taşı",
+    "archiveBoardPopup-title": "Panoyu Geri Dönüşüm Kutusu'na taşı",
+    "archived-items": "Geri Dönüşüm Kutusu",
+    "archived-boards": "Geri Dönüşüm Kutusu'ndaki panolar",
     "restore-board": "Panoyu Geri Getir",
-    "no-archived-boards": "Arşivlenmiş Pano Yok.",
-    "archives": "Arşiv",
+    "no-archived-boards": "Geri Dönüşüm Kutusu'nda pano yok.",
+    "archives": "Geri Dönüşüm Kutusu",
     "assign-member": "Üye ata",
     "attached": "dosya(sı) eklendi",
     "attachment": "Ek Dosya",
@@ -102,11 +102,11 @@
     "board-view-lists": "Listeler",
     "bucket-example": "Örn: \"Marketten Alacaklarım\"",
     "cancel": "İptal",
-    "card-archived": "Bu kart arşivlendi.",
+    "card-archived": "Bu kart Geri Dönüşüm Kutusu'na taşındı",
     "card-comments-title": "Bu kartta %s yorum var.",
     "card-delete-notice": "Silme işlemi kalıcıdır. Bu kartla ilişkili tüm eylemleri kaybedersiniz.",
     "card-delete-pop": "Son hareketler alanındaki tüm veriler silinecek, ayrıca bu kartı yeniden açamayacaksın. Bu işlemin geri dönüşü yok.",
-    "card-delete-suggest-archive": "Kartı panodan kaldırıp, buna rağmen aktivitelerini saklamak istiyorsan kartı arşivleyebilirsin.",
+    "card-delete-suggest-archive": "Kartları Geri Dönüşüm Kutusu'na taşıyarak panodan kaldırabilir ve içindeki aktiviteleri saklayabilirsiniz.",
     "card-due": "Bitiş",
     "card-due-on": "Bitiş tarihi:",
     "card-spent": "Harcanan Zaman",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Üyeler",
     "cardMorePopup-title": "Daha",
     "cards": "Kartlar",
+    "cards-count": "Kartlar",
     "change": "Değiştir",
     "change-avatar": "Avatar Değiştir",
     "change-password": "Parola Değiştir",
@@ -140,7 +141,7 @@
     "clipboard": "Yapıştır veya sürükleyip bırak",
     "close": "Kapat",
     "close-board": "Panoyu kapat",
-    "close-board-pop": "Arşivlenen panoyu ana sayfada yer alan başlıktaki menüden \"Arşivler\" düğmesini tıklayarak geri getirebilirsiniz.",
+    "close-board-pop": "Silinen panoyu geri getirmek için menüden \"Geri Dönüşüm Kutusu\"'na tıklayabilirsiniz.",
     "color-black": "siyah",
     "color-blue": "mavi",
     "color-green": "yeşil",
@@ -263,8 +264,8 @@
     "leave-board-pop": "__boardTitle__ panosundan ayrılmak istediğinize emin misiniz? Panodaki tüm kartlardan kaldırılacaksınız.",
     "leaveBoardPopup-title": "Panodan ayrılmak istediğinize emin misiniz?",
     "link-card": "Bu kartın bağlantısı",
-    "list-archive-cards": "Bu liste içindeki tüm kartları arşivle",
-    "list-archive-cards-pop": "Bu işlem bu listedeki tüm kartları kaldıracak ve arşivleyecek. Arşivlenmiş kartları görmek ve panoya geri yüklemek için \"Menü\" altından \"Arşivlenmiş Öğeler\"e gidebilirsiniz.",
+    "list-archive-cards": "Listedeki tüm kartları Geri Dönüşüm Kutusu'na gönder",
+    "list-archive-cards-pop": "Bu işlem listedeki tüm kartları kaldıracak. Silinmiş kartları görüntülemek ve geri yüklemek için menüden Geri Dönüşüm Kutusu'na tıklayabilirsiniz.",
     "list-move-cards": "Listedeki tüm kartları taşı",
     "list-select-cards": "Listedeki tüm kartları seç",
     "listActionPopup-title": "Liste İşlemleri",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "Daha",
     "link-list": "Listeye doğrudan bağlantı",
     "list-delete-pop": "Etkinlik akışınızdaki tüm eylemler geri kurtarılamaz şekilde kaldırılacak. Bu işlem geri alınamaz.",
-    "list-delete-suggest-archive": "Bir listeyi etkinliklerini koruyarak panodan kaldırmak için arşivleyebilirsiniz.",
+    "list-delete-suggest-archive": "Bir listeyi Dönüşüm Kutusuna atarak panodan kaldırabilir, ancak eylemleri koruyarak saklayabilirsiniz. ",
     "lists": "Listeler",
     "swimlanes": "Kulvarlar",
     "log-out": "Oturum Kapat",
@@ -293,9 +294,9 @@
     "muted-info": "Bu panodaki hiçbir değişiklik hakkında bildirim almayacaksınız",
     "my-boards": "Panolarım",
     "name": "Adı",
-    "no-archived-cards": "Arşivlenmiş kart bulunamadı.",
-    "no-archived-lists": "Arşivlenmiş liste bulunamadı.",
-    "no-archived-swimlanes": "Arşivlenmiş kulvar bulunamadı.",
+    "no-archived-cards": "Dönüşüm Kutusunda hiç kart yok.",
+    "no-archived-lists": "Dönüşüm Kutusunda hiç liste yok.",
+    "no-archived-swimlanes": "Dönüşüm Kutusunda hiç kulvar yok.",
     "no-results": "Sonuç yok",
     "normal": "Normal",
     "normal-desc": "Kartları görüntüleyebilir ve düzenleyebilir. Ayarları değiştiremez.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Avatar yüklendi",
     "username": "Kullanıcı adı",
     "view-it": "Görüntüle",
-    "warn-list-archived": "dikkat: bu kart arşivlenmiş bir liste içinde",
+    "warn-list-archived": "uyarı: bu kart Dönüşüm Kutusundaki bir listede var",
     "watch": "Takip Et",
     "watching": "Takip Ediliyor",
     "watching-info": "Bu pano hakkındaki tüm değişiklikler hakkında bildirim alacaksınız",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "E-posta Değiştirmeye İzin Ver",
     "createdAt": "Oluşturulma tarihi",
     "verified": "Doğrulanmış",
-    "active": "Aktif"
+    "active": "Aktif",
+    "card-received": "Giriş",
+    "card-received-on": "Giriş zamanı",
+    "card-end": "Bitiş",
+    "card-end-on": "Bitiş zamanı",
+    "editCardReceivedDatePopup-title": "Giriş tarihini değiştir",
+    "editCardEndDatePopup-title": "Bitiş tarihini değiştir"
 }

i18n/uk.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "__card__ карта додана до __list__ листа",
     "act-createList": "added __list__ to __board__",
     "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "archived __board__",
-    "act-archivedCard": "__card__ заархівована",
-    "act-archivedList": "archived __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "imported __board__",
     "act-importCard": "__card__ заімпортована",
     "act-importList": "imported __list__",
@@ -27,7 +27,7 @@
     "activities": "Діяльність",
     "activity": "Активність",
     "activity-added": "added %s to %s",
-    "activity-archived": "archived %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
     "activity-excluded": "excluded %s from %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "та __count__ інших карток",
     "apply": "Прийняти",
     "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Архів",
-    "archive-all": "Архівувати всі",
-    "archive-board": "Архівувати Дошку",
-    "archive-card": "Архівувати Картку",
-    "archive-list": "Archive List",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Архівувати виділення",
-    "archiveBoardPopup-title": "Архівувати Дошку?",
-    "archived-items": "Архівовані елементи",
-    "archived-boards": "Archived Boards",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Archived Boards.",
-    "archives": "Archives",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Assign member",
     "attached": "доданно",
     "attachment": "Додаток",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Відміна",
-    "card-archived": "This card is archived.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Користувачі",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/vi.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "đã thêm __card__ vào __list__",
     "act-createList": "đã thêm __list__ vào __board__",
     "act-addBoardMember": "đã thêm __member__ vào __board__",
-    "act-archivedBoard": "đã lưu bảng __board__",
-    "act-archivedCard": "đã lưu thẻ __card__",
-    "act-archivedList": "đã lưu danh sách __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "đã nạp bảng __board__",
     "act-importCard": "đã nạp thẻ __card__",
     "act-importList": "đã nạp danh sách __list__",
@@ -27,7 +27,7 @@
     "activities": "Hoạt Động",
     "activity": "Hoạt Động",
     "activity-added": "đã thêm %s vào %s",
-    "activity-archived": "đã lưu %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "đã đính kèm %s vào %s",
     "activity-created": "đã tạo %s",
     "activity-excluded": "đã loại bỏ %s khỏi %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "Và __count__ thẻ khác",
     "apply": "Ứng Dụng",
     "app-is-offline": "Wekan đang tải, vui lòng đợi. Tải lại trang có thể làm mất dữ liệu. Nếu Wekan không thể tải được, Vui lòng kiểm tra lại Wekan server.",
-    "archive": "Lưu Trữ",
-    "archive-all": "Lưu Trữ Tất Cả",
-    "archive-board": "Lưu Trữ Bảng",
-    "archive-card": "Lưu Trữ Thẻ",
-    "archive-list": "Lưu Trữ Danh Sách",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "Lưu trữ lựa chọn",
-    "archiveBoardPopup-title": "Lưu Trữ Bảng Không?",
-    "archived-items": "Các Mục Đã Lưu Trữ",
-    "archived-boards": "Các Bảng Đã Lưu Trữ",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "Khôi Phục Bảng",
-    "no-archived-boards": "Không Có Bảng Lưu Trữ.",
-    "archives": "Lưu Trữ",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "Chỉ định thành viên",
     "attached": "đã đính kèm",
     "attachment": "Phần đính kèm",
@@ -102,11 +102,11 @@
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Hủy",
-    "card-archived": "Thẻ này đã được lưu.",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "Thẻ này có %s bình luận.",
     "card-delete-notice": "Hành động xóa là không thể khôi phục. Bạn sẽ mất hết các hoạt động liên quan đến thẻ này.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "Thành Viên",
     "cardMorePopup-title": "More",
     "cards": "Cards",
+    "cards-count": "Cards",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -140,7 +141,7 @@
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
     "color-green": "green",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Archive all cards in this list",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,9 +294,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No archived cards.",
-    "no-archived-lists": "No archived lists.",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an archived list",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "Allow Email Change",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

i18n/zh-CN.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "添加卡片 __card__  至列表 __list__",
     "act-createList": "添加列表 __list__  至看板 __board__",
     "act-addBoardMember": "添加成员 __member__  至看板 __board__",
-    "act-archivedBoard": "归档看板 __board__",
-    "act-archivedCard": "归档卡片 __card__",
-    "act-archivedList": "归档列表 __list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ 已被移入回收站 ",
+    "act-archivedCard": "__card__ 已被移入回收站",
+    "act-archivedList": "__list__ 已被移入回收站",
+    "act-archivedSwimlane": "__swimlane__ 已被移入回收站",
     "act-importBoard": "导入看板 __board__",
     "act-importCard": "导入卡片 __card__",
     "act-importList": "导入列表 __list__",
@@ -27,7 +27,7 @@
     "activities": "活动",
     "activity": "活动",
     "activity-added": "添加 %s 至 %s",
-    "activity-archived": "归档 %s",
+    "activity-archived": "%s 已被移入回收站",
     "activity-attached": "添加附件 %s 至 %s",
     "activity-created": "创建 %s",
     "activity-excluded": "排除 %s 从 %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "和其他 __count__ 个卡片",
     "apply": "应用",
     "app-is-offline": "Wekan 正在加载，请稍等。刷新页面将导致数据丢失。如果 Wekan 无法加载，请检查 Wekan 服务器是否已经停止。",
-    "archive": "归档",
-    "archive-all": "全部归档",
-    "archive-board": "归档看板",
-    "archive-card": "归档卡片",
-    "archive-list": "归档列表",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "归档所选内容",
-    "archiveBoardPopup-title": "确定要归档看板吗？",
-    "archived-items": "已归档项目",
-    "archived-boards": "已归档看板",
+    "archive": "移入回收站",
+    "archive-all": "全部移入回收站",
+    "archive-board": "移动看板到回收站",
+    "archive-card": "移动卡片到回收站",
+    "archive-list": "移动列表到回收站",
+    "archive-swimlane": "移动泳道到回收站",
+    "archive-selection": "移动选择内容到回收站",
+    "archiveBoardPopup-title": "移动看板到回收站?",
+    "archived-items": "回收站",
+    "archived-boards": "回收站中的看板",
     "restore-board": "还原看板",
-    "no-archived-boards": "没有已归档的看板",
-    "archives": "回收箱",
+    "no-archived-boards": "回收站中无看板",
+    "archives": "回收站",
     "assign-member": "分配成员",
     "attached": "附加",
     "attachment": "附件",
@@ -102,11 +102,11 @@
     "board-view-lists": "列表",
     "bucket-example": "例如 “目标清单”",
     "cancel": "取消",
-    "card-archived": "该卡片已被归档",
+    "card-archived": "此卡片已经被移入回收站。",
     "card-comments-title": "该卡片有 %s 条评论",
     "card-delete-notice": "彻底删除的操作不可恢复，你将会丢失该卡片相关的所有操作记录。",
     "card-delete-pop": "所有的活动将从活动摘要中被移除且您将无法重新打开该卡片。此操作无法撤销。",
-    "card-delete-suggest-archive": "你可以将卡片从看板中归档至回收箱，但保留相关活动。",
+    "card-delete-suggest-archive": "将卡片移入回收站可以从看板中删除卡片，相关活动记录将被保留。",
     "card-due": "到期",
     "card-due-on": "期限",
     "card-spent": "耗时",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "成员",
     "cardMorePopup-title": "更多",
     "cards": "卡片",
+    "cards-count": "卡片",
     "change": "变更",
     "change-avatar": "更改头像",
     "change-password": "更改密码",
@@ -140,7 +141,7 @@
     "clipboard": "剪贴板或者拖放文件",
     "close": "关闭",
     "close-board": "关闭看板",
-    "close-board-pop": "您可以通过点击主界面顶部的”回收箱“按钮来还原看板。",
+    "close-board-pop": "在主页中点击顶部的“回收站”按钮可以恢复看板。",
     "color-black": "黑色",
     "color-blue": "蓝色",
     "color-green": "绿色",
@@ -159,9 +160,9 @@
     "confirm-checklist-delete-dialog": "确认要删除清单吗",
     "copy-card-link-to-clipboard": "复制卡片链接到剪贴板",
     "copyCardPopup-title": "复制卡片",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "复制清单模板至多个卡片",
+    "copyChecklistToManyCardsPopup-instructions": "以JSON格式表示目标卡片的标题和描述",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"第一个卡片的标题\", \"description\":\"第一个卡片的描述\"}, {\"title\":\"第二个卡片的标题\",\"description\":\"第二个卡片的描述\"},{\"title\":\"最后一个卡片的标题\",\"description\":\"最后一个卡片的描述\"} ]",
     "create": "创建",
     "createBoardPopup-title": "创建看板",
     "chooseBoardSourcePopup-title": "导入看板",
@@ -263,17 +264,17 @@
     "leave-board-pop": "确认要离开 __boardTitle__ 吗？此看板的所有卡片都会将您移除。",
     "leaveBoardPopup-title": "离开看板?",
     "link-card": "关联至该卡片",
-    "list-archive-cards": "归档列表中的所有卡片",
-    "list-archive-cards-pop": "这将会从本看板中移除该列表中的所有卡片。如果需要浏览已归档的卡片并且将其恢复至看板，请点击 \"菜单\" > \"回收箱\"",
+    "list-archive-cards": "移动此列表中的所有卡片到回收站",
+    "list-archive-cards-pop": "此操作会从看板中删除所有此列表包含的卡片。要查看回收站中的卡片并恢复到看板，请点击“菜单” > “回收站”。",
     "list-move-cards": "移动列表中的所有卡片",
     "list-select-cards": "选择列表中的所有卡片",
     "listActionPopup-title": "列表操作",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "泳道图操作",
     "listImportCardPopup-title": "导入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "关联到这个列表",
     "list-delete-pop": "所有活动将被从活动动态中删除并且你无法恢复他们，此操作无法撤销。 ",
-    "list-delete-suggest-archive": "您可以存档列表将其从板中删除并保留活动。",
+    "list-delete-suggest-archive": "可以将列表移入回收站，看板中将删除列表，但是相关活动记录会被保留。",
     "lists": "列表",
     "swimlanes": "泳道图",
     "log-out": "登出",
@@ -293,9 +294,9 @@
     "muted-info": "你将不会收到此看板的任何变更通知",
     "my-boards": "我的看板",
     "name": "名称",
-    "no-archived-cards": "没有已归档的卡片",
-    "no-archived-lists": "没有已归档的列表。",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "回收站中无卡片。",
+    "no-archived-lists": "回收站中无列表。",
+    "no-archived-swimlanes": "回收站中无泳道。",
     "no-results": "无结果",
     "normal": "普通",
     "normal-desc": "可以创建以及编辑卡片，无法更改设置。",
@@ -331,8 +332,8 @@
     "restore": "还原",
     "save": "保存",
     "search": "搜索",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "search-cards": "搜索当前看板上的卡片标题和描述",
+    "search-example": "搜索",
     "select-color": "选择颜色",
     "set-wip-limit-value": "设置此列表中的最大任务数",
     "setWipLimitPopup-title": "设置最大任务数",
@@ -373,12 +374,12 @@
     "uploaded-avatar": "头像已经上传",
     "username": "用户名",
     "view-it": "查看",
-    "warn-list-archived": "警告: 该卡片位于已归档的列表中",
+    "warn-list-archived": "警告：此卡片属于回收站中的一个列表",
     "watch": "关注",
     "watching": "关注",
     "watching-info": "当此看板发生变更时会通知你",
     "welcome-board": "“欢迎”看板",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "里程碑 1",
     "welcome-list1": "基本",
     "welcome-list2": "高阶",
     "what-to-do": "要做什么？",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "允许邮箱变更",
     "createdAt": "创建于",
     "verified": "已验证",
-    "active": "活跃"
+    "active": "活跃",
+    "card-received": "已接收",
+    "card-received-on": "接收于",
+    "card-end": "终止",
+    "card-end-on": "终止于",
+    "editCardReceivedDatePopup-title": "修改接收日期",
+    "editCardEndDatePopup-title": "修改终止日期"
 }

i18n/zh-TW.i18n.json

@@ -9,10 +9,10 @@
     "act-createCard": "將__card__加入__list__",
     "act-createList": "新增__list__至__board__",
     "act-addBoardMember": "在__board__中新增成員__member__",
-    "act-archivedBoard": "封存__board__",
-    "act-archivedCard": "封存__card__",
-    "act-archivedList": "封存__list__",
-    "act-archivedSwimlane": "archived __swimlane__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
     "act-importBoard": "匯入__board__",
     "act-importCard": "匯入__card__",
     "act-importList": "匯入__list__",
@@ -27,7 +27,7 @@
     "activities": "活動",
     "activity": "活動",
     "activity-added": "新增 %s 至 %s",
-    "activity-archived": "封存 %s",
+    "activity-archived": "%s moved to Recycle Bin",
     "activity-attached": "新增附件 %s 至 %s",
     "activity-created": "建立 %s",
     "activity-excluded": "排除 %s 從 %s",
@@ -64,19 +64,19 @@
     "and-n-other-card_plural": "和其他 __count__ 個卡片",
     "apply": "送出",
     "app-is-offline": "請稍候，資料讀取中，重整頁面可能會導致資料遺失。如果一直讀取，請檢查 Wekan 的伺服器是否正確運行。",
-    "archive": "刪除",
-    "archive-all": "全部刪除",
-    "archive-board": "刪除看板",
-    "archive-card": "刪除卡片",
-    "archive-list": "封存此清單",
-    "archive-swimlane": "Archive Swimlane",
-    "archive-selection": "刪除所選內容",
-    "archiveBoardPopup-title": "確定要刪除看板嗎？",
-    "archived-items": "封存",
-    "archived-boards": "已封存看板",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
     "restore-board": "還原看板",
-    "no-archived-boards": "沒有已封存的看板",
-    "archives": "封存",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
     "assign-member": "分配成員",
     "attached": "附加",
     "attachment": "附件",
@@ -102,11 +102,11 @@
     "board-view-lists": "清單",
     "bucket-example": "例如 “目標清單”",
     "cancel": "取消",
-    "card-archived": "該卡片已被刪除",
+    "card-archived": "This card is moved to Recycle Bin.",
     "card-comments-title": "該卡片有 %s 則評論",
     "card-delete-notice": "徹底刪除的操作不可復原，你將會遺失該卡片相關的所有操作記錄。",
     "card-delete-pop": "所有的動作將從活動動態中被移除且您將無法重新打開該卡片。此操作無法復原。",
-    "card-delete-suggest-archive": "你可以將卡片從看板中刪除至回收筒，但保留相關活動。",
+    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
     "card-due": "到期",
     "card-due-on": "到期",
     "card-spent": "Spent Time",
@@ -124,6 +124,7 @@
     "cardMembersPopup-title": "成員",
     "cardMorePopup-title": "更多",
     "cards": "卡片",
+    "cards-count": "卡片",
     "change": "變更",
     "change-avatar": "更改大頭貼",
     "change-password": "更改密碼",
@@ -140,7 +141,7 @@
     "clipboard": "剪貼簿貼上或者拖曳檔案",
     "close": "關閉",
     "close-board": "關閉看板",
-    "close-board-pop": "您可以透過點選主介面上方的”回收筒“按鈕來還原看板。",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
     "color-black": "黑色",
     "color-blue": "藍色",
     "color-green": "綠色",
@@ -263,8 +264,8 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "關聯至該卡片",
-    "list-archive-cards": "刪除清單中的所有卡片",
-    "list-archive-cards-pop": "這將會從本看板中移除該清單中的所有卡片。如果需要瀏覽已刪除的卡片並且將其回復至看板，請點選\"選單\">\"回收筒\"",
+    "list-archive-cards": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
     "list-move-cards": "移動清單中的所有卡片",
     "list-select-cards": "選擇清單中的所有卡片",
     "listActionPopup-title": "清單操作",
@@ -273,7 +274,7 @@
     "listMorePopup-title": "更多",
     "link-list": "連結到這個清單",
     "list-delete-pop": "所有的動作將從活動動態中被移除且您將無法再開啟該清單\b。此操作無法復原。",
-    "list-delete-suggest-archive": "你可以將從清單中刪除至回收筒，但保留相關活動",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
     "lists": "清單",
     "swimlanes": "Swimlanes",
     "log-out": "登出",
@@ -293,9 +294,9 @@
     "muted-info": "您將不會收到有關這個看板的任何訊息",
     "my-boards": "我的看板",
     "name": "名稱",
-    "no-archived-cards": "沒有已刪除的卡片",
-    "no-archived-lists": "沒有已刪除的清單",
-    "no-archived-swimlanes": "No archived swimlanes.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
     "no-results": "無結果",
     "normal": "普通",
     "normal-desc": "可以建立以及編輯卡片，無法更改。",
@@ -373,7 +374,7 @@
     "uploaded-avatar": "大頭貼已經上傳",
     "username": "使用者名稱",
     "view-it": "檢視",
-    "warn-list-archived": "警告: 該卡片位於已刪除的清單中",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
     "watch": "觀察",
     "watching": "觀察中",
     "watching-info": "你將會收到關於這個看板所有的變更通知",
@@ -435,5 +436,11 @@
     "accounts-allowEmailChange": "准許變更電子信箱",
     "createdAt": "Created at",
     "verified": "Verified",
-    "active": "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"
 }

models/activities.js

@@ -42,7 +42,7 @@ Activities.helpers({
     return Checklists.findOne(this.checklistId);
   },
   checklistItem() {
-    return Checklists.findOne(this.checklistId).getItem(this.checklistItemId);
+    return ChecklistItems.findOne(this.checklistItemId);
   },
 });
 

models/boards.js

@@ -31,14 +31,6 @@ Boards.attachSchema(new SimpleSchema({
       }
     },
   },
-  view: {
-    type: String,
-    autoValue() { // eslint-disable-line consistent-return
-      if (this.isInsert) {
-        return 'board-view-lists';
-      }
-    },
-  },
   createdAt: {
     type: Date,
     autoValue() { // eslint-disable-line consistent-return

models/cards.js

@@ -59,6 +59,10 @@ Cards.attachSchema(new SimpleSchema({
     type: [String],
     optional: true,
   },
+  receivedAt: {
+    type: Date,
+    optional: true,
+  },
   startAt: {
     type: Date,
     optional: true,
@@ -67,6 +71,10 @@ Cards.attachSchema(new SimpleSchema({
     type: Date,
     optional: true,
   },
+  endAt: {
+    type: Date,
+    optional: true,
+  },
   spentTime: {
     type: Number,
     decimal: true,
@@ -155,7 +163,7 @@ Cards.helpers({
   },
 
   checklists() {
-    return Checklists.find({cardId: this._id}, {sort: {createdAt: 1}});
+    return Checklists.find({cardId: this._id}, {sort: { sort: 1 } });
   },
 
   checklistItemCount() {
@@ -271,6 +279,14 @@ Cards.mutations({
     return {$unset: {coverId: ''}};
   },
 
+  setReceived(receivedAt) {
+    return {$set: {receivedAt}};
+  },
+
+  unsetReceived() {
+    return {$unset: {receivedAt: ''}};
+  },
+
   setStart(startAt) {
     return {$set: {startAt}};
   },
@@ -287,6 +303,14 @@ Cards.mutations({
     return {$unset: {dueAt: ''}};
   },
 
+  setEnd(endAt) {
+    return {$set: {endAt}};
+  },
+
+  unsetEnd() {
+    return {$unset: {endAt: ''}};
+  },
+
   setOvertime(isOvertime) {
     return {$set: {isOvertime}};
   },

models/checklistItems.js

@@ -0,0 +1,145 @@
+ChecklistItems = new Mongo.Collection('checklistItems');
+
+ChecklistItems.attachSchema(new SimpleSchema({
+  title: {
+    type: String,
+  },
+  sort: {
+    type: Number,
+    decimal: true,
+  },
+  isFinished: {
+    type: Boolean,
+    defaultValue: false,
+  },
+  checklistId: {
+    type: String,
+  },
+  cardId: {
+    type: String,
+  },
+}));
+
+ChecklistItems.allow({
+  insert(userId, doc) {
+    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+  },
+  update(userId, doc) {
+    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+  },
+  remove(userId, doc) {
+    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+  },
+  fetch: ['userId', 'cardId'],
+});
+
+ChecklistItems.before.insert((userId, doc) => {
+  if (!doc.userId) {
+    doc.userId = userId;
+  }
+});
+
+// Mutations
+ChecklistItems.mutations({
+  setTitle(title) {
+    return { $set: { title } };
+  },
+  toggleItem() {
+    return { $set: { isFinished: !this.isFinished } };
+  },
+  move(checklistId, sortIndex) {
+    const cardId = Checklists.findOne(checklistId).cardId;
+    const mutatedFields = {
+      cardId,
+      checklistId,
+      sort: sortIndex,
+    };
+
+    return {$set: mutatedFields};
+  },
+});
+
+// Activities helper
+function itemCreation(userId, doc) {
+  const card = Cards.findOne(doc.cardId);
+  const boardId = card.boardId;
+  Activities.insert({
+    userId,
+    activityType: 'addChecklistItem',
+    cardId: doc.cardId,
+    boardId,
+    checklistId: doc.checklistId,
+    checklistItemId: doc._id,
+  });
+}
+
+function itemRemover(userId, doc) {
+  Activities.remove({
+    checklistItemId: doc._id,
+  });
+}
+
+// Activities
+if (Meteor.isServer) {
+  Meteor.startup(() => {
+    ChecklistItems._collection._ensureIndex({ checklistId: 1 });
+  });
+
+  ChecklistItems.after.insert((userId, doc) => {
+    itemCreation(userId, doc);
+  });
+
+  ChecklistItems.after.remove((userId, doc) => {
+    itemRemover(userId, doc);
+  });
+}
+
+if (Meteor.isServer) {
+  JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramItemId = req.params.itemId;
+    const checklistItem = ChecklistItems.findOne({ _id: paramItemId });
+    if (checklistItem) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: checklistItem,
+      });
+    } else {
+      JsonRoutes.sendResult(res, {
+        code: 500,
+      });
+    }
+  });
+
+  JsonRoutes.add('PUT', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
+    Authentication.checkUserId( req.userId);
+
+    const paramItemId = req.params.itemId;
+
+    if (req.body.hasOwnProperty('isFinished')) {
+      ChecklistItems.direct.update({_id: paramItemId}, {$set: {isFinished: req.body.isFinished}});
+    }
+    if (req.body.hasOwnProperty('title')) {
+      ChecklistItems.direct.update({_id: paramItemId}, {$set: {title: req.body.title}});
+    }
+
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: {
+        _id: paramItemId,
+      },
+    });
+  });
+
+  JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramItemId = req.params.itemId;
+    ChecklistItems.direct.remove({ _id: paramItemId });
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: {
+        _id: paramItemId,
+      },
+    });
+  });
+}

models/checklists.js

@@ -6,24 +6,7 @@ Checklists.attachSchema(new SimpleSchema({
   },
   title: {
     type: String,
-  },
-  items: {
-    type: [Object],
-    defaultValue: [],
-  },
-  'items.$._id': {
-    type: String,
-  },
-  'items.$.title': {
-    type: String,
-  },
-  'items.$.sort': {
-    type: Number,
-    decimal: true,
-  },
-  'items.$.isFinished': {
-    type: Boolean,
-    defaultValue: false,
+    defaultValue: 'Checklist',
   },
   finishedAt: {
     type: Date,
@@ -46,40 +29,28 @@ Checklists.attachSchema(new SimpleSchema({
   },
 }));
 
-const self = Checklists;
-
 Checklists.helpers({
   itemCount() {
-    return this.items.length;
+    return ChecklistItems.find({ checklistId: this._id }).count();
   },
-  getItemsSorted() {
-    return _.sortBy(this.items, 'sort');
+  items() {
+    return ChecklistItems.find({
+      checklistId: this._id,
+    }, { sort: ['sort'] });
   },
   finishedCount() {
-    return this.items.filter((item) => {
-      return item.isFinished;
-    }).length;
+    return ChecklistItems.find({
+      checklistId: this._id,
+      isFinished: true,
+    }).count();
   },
   isFinished() {
     return 0 !== this.itemCount() && this.itemCount() === this.finishedCount();
   },
-  getItem(_id) {
-    return _.findWhere(this.items, { _id });
-  },
   itemIndex(itemId) {
     const items = self.findOne({_id : this._id}).items;
     return _.pluck(items, '_id').indexOf(itemId);
   },
-  getNewItemId() {
-    const itemCount = this.itemCount();
-    let idx = 0;
-    if (itemCount > 0) {
-      const lastId = this.items[itemCount - 1]._id;
-      const lastIdSuffix = lastId.substr(this._id.length);
-      idx = parseInt(lastIdSuffix, 10) + 1;
-    }
-    return `${this._id}${idx}`;
-  },
 });
 
 Checklists.allow({
@@ -103,108 +74,9 @@ Checklists.before.insert((userId, doc) => {
 });
 
 Checklists.mutations({
-  //for checklist itself
   setTitle(title) {
     return { $set: { title } };
   },
-  //for items in checklist
-  addItem(title) {
-    const _id = this.getNewItemId();
-    return {
-      $addToSet: {
-        items: {
-          _id, title,
-          isFinished: false,
-          sort: this.itemCount(),
-        },
-      },
-    };
-  },
-  addFullItem(item) {
-    const itemsUpdate = {};
-    this.items.forEach(function(iterItem, index) {
-      if (iterItem.sort >= item.sort) {
-        itemsUpdate[`items.${index}.sort`] = iterItem.sort + 1;
-      }
-    });
-    if (!_.isEmpty(itemsUpdate)) {
-      self.direct.update({ _id: this._id }, { $set: itemsUpdate });
-    }
-    return { $addToSet: { items: item } };
-  },
-  removeItem(itemId) {
-    const item = this.getItem(itemId);
-    const itemsUpdate = {};
-    this.items.forEach(function(iterItem, index) {
-      if (iterItem.sort > item.sort) {
-        itemsUpdate[`items.${index}.sort`] = iterItem.sort - 1;
-      }
-    });
-    if (!_.isEmpty(itemsUpdate)) {
-      self.direct.update({ _id: this._id }, { $set: itemsUpdate });
-    }
-    return { $pull: { items: { _id: itemId } } };
-  },
-  editItem(itemId, title) {
-    if (this.getItem(itemId)) {
-      const itemIndex = this.itemIndex(itemId);
-      return {
-        $set: {
-          [`items.${itemIndex}.title`]: title,
-        },
-      };
-    }
-    return {};
-  },
-  finishItem(itemId) {
-    if (this.getItem(itemId)) {
-      const itemIndex = this.itemIndex(itemId);
-      return {
-        $set: {
-          [`items.${itemIndex}.isFinished`]: true,
-        },
-      };
-    }
-    return {};
-  },
-  resumeItem(itemId) {
-    if (this.getItem(itemId)) {
-      const itemIndex = this.itemIndex(itemId);
-      return {
-        $set: {
-          [`items.${itemIndex}.isFinished`]: false,
-        },
-      };
-    }
-    return {};
-  },
-  toggleItem(itemId) {
-    const item = this.getItem(itemId);
-    if (item) {
-      const itemIndex = this.itemIndex(itemId);
-      return {
-        $set: {
-          [`items.${itemIndex}.isFinished`]: !item.isFinished,
-        },
-      };
-    }
-    return {};
-  },
-  sortItems(itemIDs) {
-    const validItems = [];
-    itemIDs.forEach((itemID) => {
-      if (this.getItem(itemID)) {
-        validItems.push(this.itemIndex(itemID));
-      }
-    });
-    const modifiedValues = {};
-    for (let i = 0; i < validItems.length; i++) {
-      modifiedValues[`items.${validItems[i]}.sort`] = i;
-    }
-    return {
-      $set: modifiedValues,
-    };
-  },
 });
 
 if (Meteor.isServer) {
@@ -222,30 +94,6 @@ if (Meteor.isServer) {
     });
   });
 
-  //TODO: so there will be no activity for adding item into checklist, maybe will be implemented in the future.
-  // The future is now
-  Checklists.after.update((userId, doc, fieldNames, modifier) => {
-    if (fieldNames.includes('items')) {
-      if (modifier.$addToSet) {
-        Activities.insert({
-          userId,
-          activityType: 'addChecklistItem',
-          cardId: doc.cardId,
-          boardId: Cards.findOne(doc.cardId).boardId,
-          checklistId: doc._id,
-          checklistItemId: modifier.$addToSet.items._id,
-        });
-      } else if (modifier.$pull) {
-        const activity = Activities.findOne({
-          checklistItemId: modifier.$pull.items._id,
-        });
-        if (activity) {
-          Activities.remove(activity._id);
-        }
-      }
-    }
-  });
-
   Checklists.before.remove((userId, doc) => {
     const activities = Activities.find({ checklistId: doc._id });
     if (activities) {
@@ -256,97 +104,92 @@ if (Meteor.isServer) {
   });
 }
 
-//CARD COMMENT REST API
 if (Meteor.isServer) {
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists', function (req, res) {
-    try {
-      Authentication.checkUserId( req.userId);
-      const paramCardId = req.params.cardId;
+    Authentication.checkUserId( req.userId);
+    const paramCardId = req.params.cardId;
+    const checklists = Checklists.find({ cardId: paramCardId }).map(function (doc) {
+      return {
+        _id: doc._id,
+        title: doc.title,
+      };
+    });
+    if (checklists) {
       JsonRoutes.sendResult(res, {
         code: 200,
-        data: Checklists.find({ cardId: paramCardId }).map(function (doc) {
-          return {
-            _id: doc._id,
-            title: doc.title,
-          };
-        }),
+        data: checklists,
       });
-    }
-    catch (error) {
+    } else {
       JsonRoutes.sendResult(res, {
-        code: 200,
-        data: error,
+        code: 500,
       });
     }
   });
 
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId', function (req, res) {
-    try {
-      Authentication.checkUserId( req.userId);
-      const paramChecklistId = req.params.checklistId;
-      const paramCardId = req.params.cardId;
-      JsonRoutes.sendResult(res, {
-        code: 200,
-        data: Checklists.findOne({ _id: paramChecklistId, cardId: paramCardId }),
+    Authentication.checkUserId( req.userId);
+    const paramChecklistId = req.params.checklistId;
+    const paramCardId = req.params.cardId;
+    const checklist = Checklists.findOne({ _id: paramChecklistId, cardId: paramCardId });
+    if (checklist) {
+      checklist.items = ChecklistItems.find({checklistId: checklist._id}).map(function (doc) {
+        return {
+          _id: doc._id,
+          title: doc.title,
+          isFinished: doc.isFinished,
+        };
       });
-    }
-    catch (error) {
       JsonRoutes.sendResult(res, {
         code: 200,
-        data: error,
+        data: checklist,
+      });
+    } else {
+      JsonRoutes.sendResult(res, {
+        code: 500,
       });
     }
   });
 
   JsonRoutes.add('POST', '/api/boards/:boardId/cards/:cardId/checklists', function (req, res) {
-    try {
-      Authentication.checkUserId( req.userId);
-      const paramCardId = req.params.cardId;
-
-      const checklistToSend = {};
-      checklistToSend.cardId = paramCardId;
-      checklistToSend.title = req.body.title;
-      checklistToSend.items = [];
-      const id = Checklists.insert(checklistToSend);
-      const checklist = Checklists.findOne({_id: id});
-      req.body.items.forEach(function (item) {
-        checklist.addItem(item);
-      }, this);
-
+    Authentication.checkUserId( req.userId);
 
+    const paramCardId = req.params.cardId;
+    const id = Checklists.insert({
+      title: req.body.title,
+      cardId: paramCardId,
+      sort: 0,
+    });
+    if (id) {
+      req.body.items.forEach(function (item, idx) {
+        ChecklistItems.insert({
+          cardId: paramCardId,
+          checklistId: id,
+          title: item.title,
+          sort: idx,
+        });
+      });
       JsonRoutes.sendResult(res, {
         code: 200,
         data: {
           _id: id,
         },
       });
-    }
-    catch (error) {
+    } else {
       JsonRoutes.sendResult(res, {
-        code: 200,
-        data: error,
+        code: 400,
       });
     }
   });
 
   JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId', function (req, res) {
-    try {
-      Authentication.checkUserId( req.userId);
-      const paramCommentId = req.params.commentId;
-      const paramCardId = req.params.cardId;
-      Checklists.remove({ _id: paramCommentId, cardId: paramCardId });
-      JsonRoutes.sendResult(res, {
-        code: 200,
-        data: {
-          _id: paramCardId,
-        },
-      });
-    }
-    catch (error) {
-      JsonRoutes.sendResult(res, {
-        code: 200,
-        data: error,
-      });
-    }
+    Authentication.checkUserId( req.userId);
+    const paramChecklistId = req.params.checklistId;
+    Checklists.remove({ _id: paramChecklistId });
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: {
+        _id: paramChecklistId,
+      },
+    });
   });
 }

models/export.js

@@ -57,9 +57,12 @@ class Exporter {
     result.comments = CardComments.find(byBoard, noBoardId).fetch();
     result.activities = Activities.find(byBoard, noBoardId).fetch();
     result.checklists = [];
+    result.checklistItems = [];
     result.cards.forEach((card) => {
       result.checklists.push(...Checklists.find({ cardId: card._id }).fetch());
+      result.checklistItems.push(...ChecklistItems.find({ cardId: card._id }).fetch());
     });
+
     // [Old] for attachments we only export IDs and absolute url to original doc
     // [New] Encode attachment to base64
     const getBase64Data = function(doc, callback) {

models/trelloCreator.js

@@ -429,17 +429,20 @@ export class TrelloCreator {
         const checklistId = Checklists.direct.insert(checklistToCreate);
         // keep track of Trello id => WeKan id
         this.checklists[checklist.id] = checklistId;
-        // Now add the items to the checklist
-        const itemsToCreate = [];
+        // Now add the items to the checklistItems
+        let counter = 0;
         checklist.checkItems.forEach((item) => {
-          itemsToCreate.push({
-            _id: checklistId + itemsToCreate.length,
+          counter++;
+          const checklistItemTocreate = {
+            _id: checklistId + counter,
             title: item.name,
-            isFinished: item.state === 'complete',
+            checklistId: this.checklists[checklist.id],
+            cardId: this.cards[checklist.idCard],
             sort: item.pos,
-          });
+            isFinished: item.state === 'complete',
+          };
+          ChecklistItems.direct.insert(checklistItemTocreate);
         });
-        Checklists.direct.update(checklistId, {$set: {items: itemsToCreate}});
       }
     });
   }

models/users.js

@@ -43,7 +43,9 @@ Users.attachSchema(new SimpleSchema({
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
-        return {};
+        return {
+          boardView: 'board-view-lists',
+        };
       }
     },
   },
@@ -95,6 +97,10 @@ Users.attachSchema(new SimpleSchema({
     type: String,
     optional: true,
   },
+  'profile.boardView': {
+    type: String,
+    optional: true,
+  },
   services: {
     type: Object,
     optional: true,
@@ -329,6 +335,14 @@ Users.mutations({
   setShowCardsCountAt(limit) {
     return {$set: {'profile.showCardsCountAt': limit}};
   },
+
+  setBoardView(view) {
+    return {
+      $set : {
+        'profile.boardView': view,
+      },
+    };
+  },
 });
 
 Meteor.methods({

models/wekanCreator.js

@@ -36,6 +36,8 @@ export class WekanCreator {
     this.attachmentIds = {};
     // Map of checklists Wekan ID => Wekan ID
     this.checklists = {};
+    // Map of checklistItems Wekan ID => Wekan ID
+    this.checklistItems = {};
     // The comments, indexed by Wekan card id (to map when importing cards)
     this.comments = {};
     // the members, indexed by Wekan member id => Wekan user ID
@@ -135,10 +137,13 @@ export class WekanCreator {
     check(wekanChecklists, [Match.ObjectIncluding({
       cardId: String,
       title: String,
-      items: [Match.ObjectIncluding({
-        isFinished: Boolean,
-        title: String,
-      })],
+    })]);
+  }
+
+  checkChecklistItems(wekanChecklistItems) {
+    check(wekanChecklistItems, [Match.ObjectIncluding({
+      cardId: String,
+      title: String,
     })]);
   }
 
@@ -435,6 +440,7 @@ export class WekanCreator {
   }
 
   createChecklists(wekanChecklists) {
+    const result = [];
     wekanChecklists.forEach((checklist, checklistIndex) => {
       // Create the checklist
       const checklistToCreate = {
@@ -444,19 +450,24 @@ export class WekanCreator {
         sort: checklist.sort ? checklist.sort : checklistIndex,
       };
       const checklistId = Checklists.direct.insert(checklistToCreate);
-      // keep track of Wekan id => WeKan id
       this.checklists[checklist._id] = checklistId;
-      // Now add the items to the checklist
-      const itemsToCreate = [];
-      checklist.items.forEach((item, itemIndex) => {
-        itemsToCreate.push({
-          _id: checklistId + itemsToCreate.length,
-          title: item.title,
-          isFinished: item.isFinished,
-          sort: item.sort ? item.sort : itemIndex,
-        });
-      });
-      Checklists.direct.update(checklistId, {$set: {items: itemsToCreate}});
+      result.push(checklistId);
+    });
+    return result;
+  }
+
+  createChecklistItems(wekanChecklistItems) {
+    wekanChecklistItems.forEach((checklistitem, checklistitemIndex) => {
+      // Create the checklistItem
+      const checklistItemTocreate = {
+        title: checklistitem.title,
+        checklistId: this.checklists[checklistitem.checklistId],
+        cardId: this.cards[checklistitem.cardId],
+        sort: checklistitem.sort ? checklistitem.sort : checklistitemIndex,
+        isFinished: checklistitem.isFinished,
+      };
+      const checklistItemId = ChecklistItems.direct.insert(checklistItemTocreate);
+      this.checklistItems[checklistitem._id] = checklistItemId;
     });
   }
 
@@ -470,14 +481,17 @@ export class WekanCreator {
         const wekanAttachment = wekanBoard.attachments.filter((attachment) => {
           return attachment._id === activity.attachmentId;
         })[0];
-        if(wekanAttachment.url || wekanAttachment.file) {
+
+        if ( typeof wekanAttachment !== 'undefined' && wekanAttachment ) {
+          if(wekanAttachment.url || wekanAttachment.file) {
           // we cannot actually create the Wekan attachment, because we don't yet
           // have the cards to attach it to, so we store it in the instance variable.
-          const wekanCardId = activity.cardId;
-          if(!this.attachments[wekanCardId]) {
-            this.attachments[wekanCardId] = [];
+            const wekanCardId = activity.cardId;
+            if(!this.attachments[wekanCardId]) {
+              this.attachments[wekanCardId] = [];
+            }
+            this.attachments[wekanCardId].push(wekanAttachment);
           }
-          this.attachments[wekanCardId].push(wekanAttachment);
         }
         break;
       }
@@ -635,6 +649,7 @@ export class WekanCreator {
       this.checkSwimlanes(board.swimlanes);
       this.checkCards(board.cards);
       this.checkChecklists(board.checklists);
+      this.checkChecklistItems(board.checklistItems);
     } catch (e) {
       throw new Meteor.Error('error-json-schema');
     }
@@ -654,6 +669,7 @@ export class WekanCreator {
     this.createSwimlanes(board.swimlanes, boardId);
     this.createCards(board.cards, boardId);
     this.createChecklists(board.checklists);
+    this.createChecklistItems(board.checklistItems);
     this.importActivities(board.activities, boardId);
     // XXX add members
     return boardId;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "0.78.0",
+  "version": "0.89.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 63,
+    appVersion = 74,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.78.0~2018-03-17"),
+    appMarketingVersion = (defaultText = "0.89.0~2018-04-29"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

server/authentication.js

@@ -1,5 +1,13 @@
+import Fiber from 'fibers';
+
 Meteor.startup(() => {
 
+  // Node Fibers 100% CPU usage issue
+  // https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+  // https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+  // https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+  Fiber.poolSize = 1e9;
+
   Accounts.validateLoginAttempt(function (options) {
     const user = options.user || {};
     return !user.loginDisabled;

server/migrations.js

@@ -140,7 +140,7 @@ Migrations.add('add-sort-checklists', () => {
         noValidate
       );
     }
-    checklist.items.forEach(function(item, index) {
+    checklist.items.find().forEach((item, index) => {
       if (!item.hasOwnProperty('sort')) {
         Checklists.direct.update(
           { _id: checklist._id, 'items._id': item._id },
@@ -187,3 +187,35 @@ Migrations.add('add-views', () => {
     }
   });
 });
+
+Migrations.add('add-checklist-items', () => {
+  Checklists.find().forEach((checklist) => {
+    // Create new items
+    _.sortBy(checklist.items, 'sort').forEach((item, index) => {
+      ChecklistItems.direct.insert({
+        title: item.title,
+        sort: index,
+        isFinished: item.isFinished,
+        checklistId: checklist._id,
+        cardId: checklist.cardId,
+      });
+    });
+
+    // Delete old ones
+    Checklists.direct.update({ _id: checklist._id },
+      { $unset: { items : 1 } },
+      noValidate
+    );
+  });
+});
+
+Migrations.add('add-profile-view', () => {
+  Users.find().forEach((user) => {
+    // Set default view
+    Users.direct.update(
+      { _id: user._id },
+      { $set: { 'profile.boardView': 'board-view-lists' } },
+      noValidate
+    );
+  });
+});

server/publications/boards.js

@@ -101,6 +101,7 @@ Meteor.publishRelations('board', function(boardId) {
       this.cursor(CardComments.find({ cardId }));
       this.cursor(Attachments.find({ cardId }));
       this.cursor(Checklists.find({ cardId }));
+      this.cursor(ChecklistItems.find({ cardId }));
     });
 
     if (board.members) {

snap-src/bin/config

@@ -40,7 +40,7 @@ DESCRIPTION_DISABLE_MONGODB="Disable mongodb service: use only if binding to dat
 DEFAULT_DISABLE_MONGODB="false"
 KEY_DISABLE_MONGODB="disable-mongodb"
 
-DESCRIPTION_CADDY_ENABLED="Enable caddy service (caddy - Every Site on HTTPS). Set to 'true' to enable caddy\n\t\tcaddy settings are handled through $SNAP_COMMON/Caddyfile"
+DESCRIPTION_CADDY_ENABLED="Enable caddy service (caddy - Every Site on HTTPS) personal license for non-commercial use only, see https://caddyserver.com/products/licenses . Set to 'true' to enable caddy\n\t\tcaddy settings are handled through $SNAP_COMMON/Caddyfile"
 DEFAULT_CADDY_ENABLED="false"
 KEY_CADDY_ENABLED="caddy-enabled"
 

snapcraft.yaml

@@ -65,7 +65,7 @@ apps:
 
 parts:
     mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.18.tgz
+        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.19.tgz
         plugin: dump
         stage-packages: [libssl1.0.0]
         filesets:
@@ -81,7 +81,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 8.9.3
+        node-engine: 8.11.1
         node-packages:
             - npm@5.5.1
             - node-gyp
@@ -95,13 +95,32 @@ parts:
             - capnproto
             - npm
             - curl
-            - paxctl
             - execstack
-        prepare: |
+        override-build: |
             echo "Cleaning environment first"
             rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
-            echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
-            paxctl -mC `which node`
+            # Node Fibers 100% CPU usage issue:
+            # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+            # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+            # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+            # Also see beginning of wekan/server/authentication.js
+            #   import Fiber from "fibers";
+            #   Fiber.poolSize = 1e9;
+            # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+            # Description at https://releases.wekan.team/node.txt
+            # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
+            echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d  node" >> node-SHASUMS256.txt.asc
+            curl https://releases.wekan.team/node -o node
+            # Verify Fibers patched node authenticity
+            echo "Fibers 100% CPU issue patched node authenticity:"
+            grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
+            rm -f node-SHASUMS256.txt.asc
+            chmod +x node
+            mv node `which node`
+            # DOES NOT WORK: paxctl fix.
+            # Removed from build-packages: - paxctl
+            #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
+            #paxctl -mC `which node`
             echo "Installing meteor"
             curl https://install.meteor.com/ -o install_meteor.sh
             sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh
@@ -114,7 +133,6 @@ parts:
             git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
             sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
             cd ..
-        build: |
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
@@ -123,10 +141,12 @@ parts:
             cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
             rm -rf node_modules/bcrypt
             meteor npm install --save bcrypt
+            # Change to directory .build/bundle/programs/server
             cd ../../../../
             npm install
             meteor npm install --save bcrypt
-        install: |
+            # Change back to Wekan source directory
+            cd ../../../..
             cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
             cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
             rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
@@ -140,7 +160,7 @@ parts:
 
     caddy:
         plugin: dump
-        source: https://caddyserver.com/download/linux/amd64?plugins=
+        source: https://caddyserver.com/download/linux/amd64?license=personal
         source-type: tar
         organize:
           caddy: bin/caddy