v5.38

Thanks to developers of dependencies !

.babelrc

@@ -1,5 +1,12 @@
 { 
   "presets": [ 
     "@babel/preset-stage-3" 
-  ]
+  ],
+  "env": {
+    "COVERAGE": {
+      "plugins": [
+        "istanbul"
+      ]
+    }
+  }
 }

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=v12.22.1 \
+    NODE_VERSION=v12.22.3 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

.future-snap/broken-snapcraft.yaml

@@ -81,7 +81,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.22.1
+        node-engine: 12.22.3
         node-packages:
             - node-gyp
             - node-pre-gyp

.future-snap/snapcraft.yaml

@@ -83,7 +83,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.22.1
+        node-engine: 12.22.3
         node-packages:
             - node-gyp
             - node-pre-gyp

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,8 @@
 ## Issue
 
+Note: With Docker, please don't use latest tag. Only use release tags.
+See https://github.com/wekan/wekan/issues/3874
+
 If you can not login for any reason:
 - https://github.com/wekan/wekan/wiki/Forgot-Password
 

.github/workflows/test_suite.yml

@@ -0,0 +1,160 @@
+name: Test suite
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+# the following are optional jobs and need to be configured according
+# to this project's settings:
+#
+#  lintcode:
+#    name: Javascript lint
+#    runs-on: ubuntu-latest
+#    steps:
+#    - name: checkout
+#      uses: actions/checkout@v2
+#
+#    - name: setup node
+#      uses: actions/setup-node@v1
+#      with:
+#        node-version: '12.x'
+#
+#    - name: cache dependencies
+#      uses: actions/cache@v1
+#      with:
+#        path: ~/.npm
+#        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#        restore-keys: |
+#          ${{ runner.os }}-node-
+#
+#    - run: npm install
+#    - run: npm run lint:code
+#
+#  lintstyle:
+#    name: SCSS lint
+#    runs-on: ubuntu-latest
+#    needs: [lintcode]
+#    steps:
+#    - name: checkout
+#      uses: actions/checkout@v2
+#
+#    - name: setup node
+#      uses: actions/setup-node@v1
+#      with:
+#        node-version: '12.x'
+#
+#    - name: cache dependencies
+#      uses: actions/cache@v1
+#      with:
+#        path: ~/.npm
+#        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#        restore-keys: |
+#          ${{ runner.os }}-node-
+#    - run: npm install
+#    - run: npm run lint:style
+#
+#  lintdocs:
+#    name: documentation lint
+#    runs-on: ubuntu-latest
+#    needs: [lintcode,lintstyle]
+#    steps:
+#    - name: checkout
+#      uses: actions/checkout@v2
+#
+#    - name: setup node
+#      uses: actions/setup-node@v1
+#      with:
+#        node-version: '12.x'
+#
+#    - name: cache dependencies
+#      uses: actions/cache@v1
+#      with:
+#        path: ~/.npm
+#        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#        restore-keys: |
+#          ${{ runner.os }}-node-
+#
+#    - run: npm install
+#    - run: npm run lint:markdown
+
+  tests:
+    name: Meteor ${{ matrix.meteor }} tests
+    runs-on: ubuntu-latest
+    steps:
+
+      # CHECKOUTS
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # CACHING
+      - name: Install Meteor
+        id: cache-meteor-install
+        uses: actions/cache@v2
+        with:
+          path: ~/.meteor
+          key: v1-meteor-${{ hashFiles('.meteor/versions') }}
+          restore-keys: |
+                v1-meteor-
+
+      - name: Cache NPM dependencies
+        id: cache-meteor-npm
+        uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: v1-npm-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+                v1-npm-
+
+      - name: Cache Meteor build
+        id: cache-meteor-build
+        uses: actions/cache@v2
+        with:
+          path: |
+            .meteor/local/resolver-result-cache.json
+            .meteor/local/plugin-cache
+            .meteor/local/isopacks
+            .meteor/local/bundler-cache/scanner
+          key: v1-meteor_build_cache-${{ github.ref }}-${{ github.sha }}
+          restore-key: |
+            v1-meteor_build_cache-
+
+      - name: Setup meteor
+        uses: meteorengineer/setup-meteor@v1
+        with:
+          meteor-release: '2.2'
+
+      - name: Install NPM Dependencies
+        run: meteor npm ci
+
+      - name: Run Tests
+        run: sh ./test-wekan.sh -cv
+
+      - name: Upload coverage
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage-folder
+          path: .coverage/
+
+  coverage:
+    name: Coverage report
+    runs-on: ubuntu-latest
+    needs: [tests]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Download coverage
+        uses: actions/download-artifact@v2
+        with:
+          name: coverage-folder
+          path: .coverage/
+
+
+      - name: Coverage Report
+        uses: VeryGoodOpenSource/very_good_coverage@v1.1.1
+        with:
+          path: ".coverage/lcov.info"
+          min_coverage: 1 # TODO add tests and increase to 95!

.gitignore

@@ -33,3 +33,4 @@ ehthumbs.db
 .meteor/local
 .devcontainer/docker-compose.extend.yml
 .devcontainer/volumes*/
+.coverage

.meteor/packages

@@ -145,3 +145,5 @@ spacebars
 easylogic:summernote
 pascoual:pdfkit
 wekan-accounts-lockout
+lmieulet:meteor-coverage
+meteortesting:mocha

.meteor/versions

@@ -69,6 +69,7 @@ lamhieu:meteorx@2.1.1
 lamhieu:unblock@1.0.0
 launch-screen@1.2.1
 livedata@1.0.18
+lmieulet:meteor-coverage@3.2.0
 localstorage@1.2.0
 logging@1.2.0
 matb33:collection-hooks@0.9.1
@@ -82,6 +83,9 @@ meteorhacks:collection-utils@1.2.0
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
 meteorspark:util@0.2.0
+meteortesting:browser-tests@1.3.4
+meteortesting:mocha@2.0.1
+meteortesting:mocha-core@8.0.1
 minifier-css@1.5.4
 minifier-js@2.6.0
 minifiers@1.1.8-faster-rebuild.0

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 
 env:
   TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.22.1
+  TRAVIS_NODE_VERSION: 12.22.3
   TRAVIS_NPM_VERSION: latest
 
 before_install:

CHANGELOG.md

@@ -1,5 +1,105 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
 
+Note: With Docker, please don't use latest tag. Only use release tags.
+See https://github.com/wekan/wekan/issues/3874
+
+# v5.38 2021-07-18 Wekan release
+
+This release adds the following new features:
+
+- [Added Code View `</>` button when `RICHER_CARD_COMMENT_EDITOR=true` and in desktop view
+  where is enough screen space for buttons (not added to mobile
+  view)](https://github.com/wekan/wekan/commit/ec01e5182d6b8c848d752540887a8113472b0226).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- Updated dependencies
+  [Part 1](https://github.com/wekan/wekan/commit/7024929881c05cad472de74c86517cf80c8e240c),
+  [Part 2](https://github.com/wekan/wekan/commit/609adcdf100db226c5f310577195afa4b1a4aead).
+  Thanks to developers of dependencies.
+- [Updated to Node.js v12.22.3](https://github.com/wekan/wekan/commit/d538a01d1962464cf4cb001462669150eeafaa99).
+  Thanks to Node.js developers.
+
+and fixes the following bugs:
+
+- [Fixed Line break which is wrongly added in Cards description and Cards
+  comments](https://github.com/wekan/wekan/commit/ec01e5182d6b8c848d752540887a8113472b0226).
+  Thanks to Emile840 and xet7.
+- [Fixed rebuild-wekan.sh](https://github.com/wekan/wekan/commit/1d5dd5e60fec151de6c7dce7ef4e758b562923b9).
+  Thanks to xet7.
+- [Small fixes for ModernDark theme](https://github.com/wekan/wekan/pull/3902).
+  Thanks to jghaanstra.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.37 2021-07-04 Wekan release
+
+This release adds the following CRITICAL SECURITY UPDATES:
+
+- [Updated to Node.js v12.22.2](https://github.com/wekan/wekan/commit/4feffd90e3f466609e09524e0ddccdafa2faef32).
+  Thanks to Node.js developers.
+
+and fixes the following bugs:
+
+- [Building OpenAPI docs is broken in Wekan v3.56](https://github.com/wekan/wekan/pull/3889).
+  Thanks to bentiss.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.36 2021-06-29 Wekan release
+
+This release adds the following new features:
+
+- [Added some controls and warning messages when user try to delete an organization or team that has
+  at least one user belongs to it](https://github.com/wekan/wekan/pull/3865).
+  Thanks to Emile840.
+- Shared Templates. In Progress.
+  [Part 1](https://github.com/wekan/wekan/commit/0a0cec6ef0eb55391608aade897004db430ba10a).
+  Template Containers visible at All Boards page, with white border around board icon.
+  [Part 2](https://github.com/wekan/wekan/commit/d1d4453120005de61eaf2cbadc6a7b9d80e75fc1).
+  Ablity to Add Template Container, checkbox in Create Board popup.
+  Do not create Template Container by default, when creating user.
+  [Part 3](https://github.com/wekan/wekan/commit/7f17bc9fb03d6f4b43a2cd71ecc372e0f1b0f491).
+  Template container titles "Card/List/Board Templates" automatically translated.
+  Thanks to xet7.
+  [Part 4](https://github.com/wekan/wekan/commit/3b4a44abb1c1c4339c3d1b00dfac1c69ec3684cd).
+  Hide this Shared Templates feature while it's not finished yet.
+  Added back creating Template Container by default, when creating user.
+  Thanks to xet7.
+- [Added testsuite](https://github.com/wekan/wekan/pull/3872).
+  Thanks to jankapunkt.
+- [Delete user at REST API and `Admin Panel/People/People`](https://github.com/wekan/wekan/commit/9e16a405d8ca32a4e1be9cf89f8f978a2985593c).
+  There is still bug of leaving empty user avatars to boards: boards members, card members and assignees have
+  empty users. So it would be better to delete user from all boards before deleting user.
+  Thanks to darren-teo and xet7.
+
+and adds the following improvements:
+
+- [Removed unused exceljs from client bundle](https://github.com/wekan/wekan/pull/3871).
+  This decreased Wekan browserside frontend amount of Javascript from 5.4 MB to 4.3 MB.
+  Thanks to jankapunkt.
+- Added note: With Docker, please don't use latest tag. Only use release tags.
+  See https://github.com/wekan/wekan/issues/3874 .
+  [Part 1](https://github.com/wekan/wekan/commit/f18a57b059994b8a6a3588a69cf095fe599b3a90),
+  [Part 2](https://github.com/wekan/wekan/commit/c4cea9e71b467731fd8290538dd039b7691097af).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fixed tests, that need to be in tests directory to not get build
+  errors](https://github.com/wekan/wekan/commit/56197274b6c4782fa20c7d9b5b9d58255d1f830a).
+  Thanks to xet7.
+- Try to fix tests.
+  [Part 1](https://github.com/wekan/wekan/commit/78555f57a7c2ba0fb3e3986608bcf11509af9a21),
+  [Part 2](https://github.com/wekan/wekan/commit/7f648720afa42a2b53bfdee7e709fd891eb33373),
+  [Part 3](https://github.com/wekan/wekan/commit/0f34d407a43c8a63d882e69ea64ea17fc4b22c7b).
+  Thanks to xet7.
+- [Fixed "Search All Boards" instructions are gone](https://github.com/wekan/wekan/commit/30ffcc924663f39406b250d93b14384a2f38ab6a).
+  Thanks to ClaudiaK21 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v5.35 2021-06-14 Wekan release
 
 This release adds the following new features:

Dockerfile

@@ -12,7 +12,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
     DEBUG=false \
-    NODE_VERSION=v12.22.1 \
+    NODE_VERSION=v12.22.3 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

Dockerfile.arm64v8

@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
     QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.22.1 \
+    NODE_VERSION=v12.22.3 \
     WEKAN_VERSION=latest  \
     WEKAN_ARCHITECTURE=arm64
 
@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.22.1 \
+    NODE_VERSION=v12.22.3 \
     NODE_ENV=production \
     NPM_VERSION=latest \
     WITH_API=true \

README.md

@@ -30,6 +30,11 @@ It's better than at chat where details get lost when chat scrolls up.
 
 [Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
 
+## Docker: Please only use Docker release tags
+
+Note: With Docker, please don't use latest tag. Only use release tags.
+See https://github.com/wekan/wekan/issues/3874
+
 ## FAQ
 
 **NOTE**:

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v5.35.0"
+appVersion: "v5.38.0"
 files:
   userUploads:
     - README.md

client/components/boards/boardColors.styl

@@ -766,7 +766,15 @@ setBoardClear(color1,color2)
   .toggle-label:after, .board-color-modern .toggle-switch:checked~.toggle-label:after
     background-color: #819C5D !important
 
+  button, input:not([type=file]), select, textarea
+    border-radius: 2px
+
   /* Headers */
+  &#header
+    background-color: #262626
+    border-bottom: 1px solid #555555;
+    border-top: 1px solid #555555;
+
   &#header-quick-access, .background-box, #header
     background-color: #333333
 
@@ -774,14 +782,16 @@ setBoardClear(color1,color2)
     padding: 4px
     font-size: 14px
 
+  &#header-quick-access .allBoards
+    padding: 5px 10px 0 10px;
+
+  &#header-quick-access ul.header-quick-access-list
+    margin: -5px 0 -5px 0
+
   &#header #header-main-bar
-    height: 30px
     padding-top: 3px
     padding-bottom: 3px
 
-  &#header
-    box-shadow: 0 6px 6px -6px rgba(0,0,0,0.8)
-
   &#header-quick-access ul
     overflow: visible
 
@@ -812,18 +822,23 @@ setBoardClear(color1,color2)
   /* Content */
   .board-canvas
     background: #2a2a2a
-    padding: 10px 10px 0
 
   /* Swimlanes */
   .swimlane .swimlane-header-wrap
-    background-color: #666666
+    background-color: #494949
     color: #cccccc
     padding: 4px 0
-    margin-bottom: 10px
 
   .swimlane .swimlane-header-wrap .swimlane-header
     font-family: Poppins
 
+  .swimlane .swimlane-header-wrap .swimlane-header-menu
+    padding: 6px
+    font-size: 16px
+
+  .swimlane .swimlane-header-wrap .swimlane-header-plus-icon
+    font-size: 16px
+
   .swimlane
     background: #2a2a2a
     line-height: 15px
@@ -836,13 +851,19 @@ setBoardClear(color1,color2)
     border: 0px solid #666666
     flex: 0 0 265px;
 
+  .swimlane .list:first-child
+    margin-left: 0
+
   .swimlane .list:nth-child(even)
     background: #5f5f5f
 
+  .swimlane .list:nth-child(odd) .list-header
+    background: #3b3b3b
+
   .list-header
     background: #333333
-    padding-top: 10px
-    border-bottom: 6px solid #333333
+    padding: 10px
+    border-bottom: 0
 
   .list-header .viewer
     padding-left: 10px
@@ -852,7 +873,11 @@ setBoardClear(color1,color2)
     color: #eeeeee
 
   .list-header .list-header-menu
-    padding-top: 17px
+    padding: 10px
+    top: 0
+
+  .list-header .list-header-plus-icon
+    color: #a6a6a6
 
   .list-body
     scrollbar-width: thin
@@ -883,35 +908,43 @@ setBoardClear(color1,color2)
     color: #ffffff
 
   /* Mini Card */
+  .minicard-wrapper
+    margin-bottom: 12px
+
   .minicard
     background-color: #444444
     color: #cccccc
     border-radius: 2px
-    font-size: 0.9em
+    font-size: 0.95em
     padding: 10px
     box-shadow: 0 4px 3px -3px rgba(0,0,0,0.8)
     border-bottom: 1px solid #666666
 
   .minicard:hover
-    background-color: #555555 !important
+    background-color: #494949 !important
+
+  .minicard .minicard-labels
+    margin-bottom: 4px
 
   .minicard .card-label
     font-size: 11px
     font-weight: 400
-    padding: 2px 6px 0
+    padding: 1px 6px 0
+    border-radius: 2px
 
   .minicard .badges
     color: #bbbbbb
 
   .minicard .date
-    margin-top: 7px
+    margin-top: 10px
     font-size: 11px
 
   .card-date
-    color: #555555
+    color: #444444
+    border-radius: 2px
 
   .card-date.almost-due
-    color: #666666
+    color: #444444
 
   .minicard.minicard-composer textarea.minicard-composer-textarea:focus
     background-color: #eeeeee
@@ -970,11 +1003,17 @@ setBoardClear(color1,color2)
 
   .card-details .checklist-item
     background-color: rgba(255,255,255,0.1)
-    padding: 2px 8px
-    border-radius: 3px
+    padding: 4px 8px
+    border-radius: 2px
     font-size: 13px
     margin-top: 5px
 
+  .card-details .checklist-item:hover
+    background-color: rgba(255,255,255,0.2)
+
+  .card-details .checklist-item .item-title .viewer p
+    max-width: auto
+
   .card-details .check-box.materialCheckBox
     border-color: #ffffff
 

client/components/boards/boardHeader.jade

@@ -1,8 +1,11 @@
 template(name="boardHeaderBar")
   h1.header-board-menu
     with currentBoard
-      +viewer
-        = title
+      if $eq title 'Templates'
+        | {{_ 'templates'}}
+      else
+        +viewer
+          = title
 
   .board-header-btns.left
     unless isMiniScreen
@@ -225,6 +228,9 @@ template(name="createBoard")
           = " "
           | {{{_ 'board-private-info'}}}
         a.js-change-visibility {{_ 'change'}}.
+    //a.flex.js-toggle-add-template-container
+    //  .materialCheckBox#add-template-container
+    //  span {{_ 'add-template-container'}}
     input.primary.wide(type="submit" value="{{_ 'create'}}")
     span.quiet
       | {{_ 'or'}}

client/components/boards/boardHeader.js

@@ -209,24 +209,79 @@ const CreateBoard = BlazeComponent.extendComponent({
     this.visibilityMenuIsOpen.set(!this.visibilityMenuIsOpen.get());
   },
 
+  toggleAddTemplateContainer() {
+    $('#add-template-container').toggleClass('is-checked');
+  },
+
   onSubmit(event) {
     event.preventDefault();
     const title = this.find('.js-new-board-title').value;
-    const visibility = this.visibility.get();
 
-    this.boardId.set(
-      Boards.insert({
-        title,
-        permission: visibility,
-      }),
-    );
+    const addTemplateContainer = $('#add-template-container.is-checked').length > 0;
+    if (addTemplateContainer) {
+      //const templateContainerId = Meteor.call('setCreateTemplateContainer');
+      //Utils.goBoardId(templateContainerId);
+      //alert('niinku template ' + Meteor.call('setCreateTemplateContainer'));
 
-    Swimlanes.insert({
-      title: 'Default',
-      boardId: this.boardId.get(),
-    });
+      this.boardId.set(
+        Boards.insert({
+            // title: TAPi18n.__('templates'),
+            title: title,
+            permission: 'private',
+            type: 'template-container',
+          }),
+       );
 
-    Utils.goBoardId(this.boardId.get());
+      // Insert the card templates swimlane
+      Swimlanes.insert({
+          // title: TAPi18n.__('card-templates-swimlane'),
+          title: 'Card Templates',
+          boardId: this.boardId.get(),
+          sort: 1,
+          type: 'template-container',
+        }),
+
+      // Insert the list templates swimlane
+      Swimlanes.insert(
+        {
+          // title: TAPi18n.__('list-templates-swimlane'),
+          title: 'List Templates',
+          boardId: this.boardId.get(),
+          sort: 2,
+          type: 'template-container',
+        },
+      );
+
+      // Insert the board templates swimlane
+      Swimlanes.insert(
+        {
+          //title: TAPi18n.__('board-templates-swimlane'),
+          title: 'Board Templates',
+          boardId: this.boardId.get(),
+          sort: 3,
+          type: 'template-container',
+        },
+      );
+
+      Utils.goBoardId(this.boardId.get());
+
+    } else {
+      const visibility = this.visibility.get();
+
+      this.boardId.set(
+        Boards.insert({
+          title,
+          permission: visibility,
+        }),
+      );
+
+      Swimlanes.insert({
+        title: 'Default',
+        boardId: this.boardId.get(),
+      });
+
+      Utils.goBoardId(this.boardId.get());
+    }
   },
 
   events() {
@@ -240,6 +295,7 @@ const CreateBoard = BlazeComponent.extendComponent({
         submit: this.onSubmit,
         'click .js-import-board': Popup.open('chooseBoardSource'),
         'click .js-board-template': Popup.open('searchElement'),
+        'click .js-toggle-add-template-container': this.toggleAddTemplateContainer,
       },
     ];
   },

client/components/boards/boardsList.jade

@@ -17,47 +17,90 @@ template(name="boardList")
                 button.js-accept-invite.primary {{_ 'accept'}}
                 button.js-decline-invite {{_ 'decline'}}
           else
-            a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
-              span.details
-                span.board-list-item-name(title="{{_ 'board-drag-drop-reorder-or-click-open'}}")
-                  +viewer
-                    = title
-                i.fa.js-star-board(
-                  class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
-                  title="{{_ 'star-board-title'}}")
-                p.board-list-item-desc
-                  +viewer
-                    = description
-                if hasSpentTimeCards
-                  i.fa.js-has-spenttime-cards(
-                    class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
-                    title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-                if isMiniScreen
-                  i.fa.board-handle(
-                      class="fa-arrows"
-                      title="{{_ 'Drag board'}}")
-                unless isMiniScreen
-                  if isSandstorm
-                    i.fa.js-clone-board(
-                        class="fa-clone"
-                        title="{{_ 'duplicate-board'}}")
-                    i.fa.js-archive-board(
-                        class="fa-archive"
-                        title="{{_ 'archive-board'}}")
-                  else if isAdministrable
-                    i.fa.js-clone-board(
-                        class="fa-clone"
-                        title="{{_ 'duplicate-board'}}")
-                    i.fa.js-archive-board(
-                        class="fa-archive"
-                        title="{{_ 'archive-board'}}")
-                  else if currentUser.isAdmin
-                    i.fa.js-clone-board(
-                        class="fa-clone"
-                        title="{{_ 'duplicate-board'}}")
-                    i.fa.js-archive-board(
-                        class="fa-archive"
-                        title="{{_ 'archive-board'}}")
+            if $eq type "template-container"
+              a.js-open-board.template-container.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
+                span.details
+                  span.board-list-item-name(title="{{_ 'template-container'}}")
+                    +viewer
+                      = title
+                  i.fa.js-star-board(
+                    class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
+                    title="{{_ 'star-board-title'}}")
+                  p.board-list-item-desc
+                    +viewer
+                      = description
+                  if hasSpentTimeCards
+                    i.fa.js-has-spenttime-cards(
+                      class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
+                      title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
+                  if isMiniScreen
+                    i.fa.board-handle(
+                        class="fa-arrows"
+                        title="{{_ 'Drag board'}}")
+                  unless isMiniScreen
+                    if isSandstorm
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
+                    else if isAdministrable
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
+                    else if currentUser.isAdmin
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
+            else
+              a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
+                span.details
+                  span.board-list-item-name(title="{{_ 'board-drag-drop-reorder-or-click-open'}}")
+                    +viewer
+                      = title
+                  i.fa.js-star-board(
+                    class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
+                    title="{{_ 'star-board-title'}}")
+                  p.board-list-item-desc
+                    +viewer
+                      = description
+                  if hasSpentTimeCards
+                    i.fa.js-has-spenttime-cards(
+                      class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
+                      title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
+                  if isMiniScreen
+                    i.fa.board-handle(
+                        class="fa-arrows"
+                        title="{{_ 'Drag board'}}")
+                  unless isMiniScreen
+                    if isSandstorm
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
+                    else if isAdministrable
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
+                    else if currentUser.isAdmin
+                      i.fa.js-clone-board(
+                          class="fa-clone"
+                          title="{{_ 'duplicate-board'}}")
+                      i.fa.js-archive-board(
+                          class="fa-archive"
+                          title="{{_ 'archive-board'}}")
 
 template(name="boardListHeaderBar")
   h1 {{_ title }}

client/components/boards/boardsList.js

@@ -88,6 +88,7 @@ BlazeComponent.extendComponent({
   boards() {
     const query = {
       archived: false,
+      //type: { $in: ['board','template-container'] },
       type: 'board',
     };
     if (FlowRouter.getRouteName() === 'home')

client/components/boards/boardsList.styl

@@ -45,6 +45,9 @@ $spaceBetweenTiles = 16px
     text-decoration: none
     word-wrap: break-word
 
+    &.template-container
+      border: 4px solid #fff
+
     &.tile
       background-size: auto
       background-repeat: repeat

client/components/lists/listBody.js

@@ -552,7 +552,7 @@ BlazeComponent.extendComponent({
       board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
     } else {
       // Prefetch first non-current board id
-      board = Boards.findOne({
+      board = Boards.find({
         archived: false,
         'members.userId': Meteor.userId(),
         _id: {

client/components/main/editor.js

@@ -50,7 +50,7 @@ Template.editor.onRendered(() => {
           ['table', ['table']],
           //['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
           ['insert', ['link']], //, 'picture']], // modal popup has issue somehow :(
-          ['view', ['fullscreen', 'help']],
+          ['view', ['fullscreen', 'codeview', 'help']],
         ];
     const cleanPastedHTML = function(input) {
       const badTags = [
@@ -229,7 +229,7 @@ Template.editor.onRendered(() => {
                 // (and multiplies by pasting more) by changing paste "p" to "br".
                 // Fixes https://github.com/wekan/wekan/2890 .
                 // == Fix Start ==
-                //someNote.execCommand('defaultParagraphSeparator', false, 'br');
+                someNote.execCommand('defaultParagraphSeparator', false, 'br');
                 // == Fix End ==
                 const original = someNote.summernote('code');
                 const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.

client/components/main/globalSearch.js

@@ -158,40 +158,42 @@ class GlobalSearchComponent extends CardSearchPagedComponent {
       ['# ', 'globalSearch-instructions-heading'],
       ['\n', 'globalSearch-instructions-description'],
       ['\n\n', 'globalSearch-instructions-operators'],
-      ['\n* ', 'globalSearch-instructions-operator-board'],
-      ['\n* ', 'globalSearch-instructions-operator-list'],
-      ['\n* ', 'globalSearch-instructions-operator-swimlane'],
-      ['\n* ', 'globalSearch-instructions-operator-comment'],
-      ['\n* ', 'globalSearch-instructions-operator-label'],
-      ['\n* ', 'globalSearch-instructions-operator-hash'],
-      ['\n* ', 'globalSearch-instructions-operator-user'],
-      ['\n* ', 'globalSearch-instructions-operator-at'],
-      ['\n* ', 'globalSearch-instructions-operator-member'],
-      ['\n* ', 'globalSearch-instructions-operator-assignee'],
-      ['\n* ', 'globalSearch-instructions-operator-creator'],
-      ['\n* ', 'globalSearch-instructions-operator-due'],
-      ['\n* ', 'globalSearch-instructions-operator-created'],
-      ['\n* ', 'globalSearch-instructions-operator-modified'],
-      ['\n* ', 'globalSearch-instructions-operator-status'],
-      ['\n    * ', 'globalSearch-instructions-status-archived'],
-      ['\n    * ', 'globalSearch-instructions-status-public'],
-      ['\n    * ', 'globalSearch-instructions-status-private'],
-      ['\n    * ', 'globalSearch-instructions-status-all'],
-      ['\n    * ', 'globalSearch-instructions-status-ended'],
-      ['\n* ', 'globalSearch-instructions-operator-has'],
-      ['\n* ', 'globalSearch-instructions-operator-sort'],
-      ['\n* ', 'globalSearch-instructions-operator-limit'],
+      ['\n- ', 'globalSearch-instructions-operator-board'],
+      ['\n- ', 'globalSearch-instructions-operator-list'],
+      ['\n- ', 'globalSearch-instructions-operator-swimlane'],
+      ['\n- ', 'globalSearch-instructions-operator-comment'],
+      ['\n- ', 'globalSearch-instructions-operator-label'],
+      ['\n- ', 'globalSearch-instructions-operator-hash'],
+      ['\n- ', 'globalSearch-instructions-operator-user'],
+      ['\n- ', 'globalSearch-instructions-operator-at'],
+      ['\n- ', 'globalSearch-instructions-operator-member'],
+      ['\n- ', 'globalSearch-instructions-operator-assignee'],
+      ['\n- ', 'globalSearch-instructions-operator-creator'],
+      ['\n- ', 'globalSearch-instructions-operator-due'],
+      ['\n- ', 'globalSearch-instructions-operator-created'],
+      ['\n- ', 'globalSearch-instructions-operator-modified'],
+      ['\n- ', 'globalSearch-instructions-operator-status'],
+      ['\n    - ', 'globalSearch-instructions-status-archived'],
+      ['\n    - ', 'globalSearch-instructions-status-public'],
+      ['\n    - ', 'globalSearch-instructions-status-private'],
+      ['\n    - ', 'globalSearch-instructions-status-all'],
+      ['\n    - ', 'globalSearch-instructions-status-ended'],
+      ['\n- ', 'globalSearch-instructions-operator-has'],
+      ['\n- ', 'globalSearch-instructions-operator-sort'],
+      ['\n- ', 'globalSearch-instructions-operator-limit'],
       ['\n## ', 'heading-notes'],
-      ['\n* ', 'globalSearch-instructions-notes-1'],
-      ['\n* ', 'globalSearch-instructions-notes-2'],
-      ['\n* ', 'globalSearch-instructions-notes-3'],
-      ['\n* ', 'globalSearch-instructions-notes-3-2'],
-      ['\n* ', 'globalSearch-instructions-notes-4'],
-      ['\n* ', 'globalSearch-instructions-notes-5'],
+      ['\n- ', 'globalSearch-instructions-notes-1'],
+      ['\n- ', 'globalSearch-instructions-notes-2'],
+      ['\n- ', 'globalSearch-instructions-notes-3'],
+      ['\n- ', 'globalSearch-instructions-notes-3-2'],
+      ['\n- ', 'globalSearch-instructions-notes-4'],
+      ['\n- ', 'globalSearch-instructions-notes-5'],
     ].forEach(([prefix, instruction]) => {
-      text += `${prefix}${TAPi18n.__(instruction, tags)}`;
+      text += `${prefix}${TAPi18n.__(instruction, tags)}`
+      // Replace *<text>* with `<text>` so markdown shows correctly
+      .replace(/\*\</, '`<')
+      .replace(/\>\*/, '\>\`')
     });
-
     return text;
   }
 

client/components/settings/peopleBody.jade

@@ -531,6 +531,9 @@ template(name="settingsOrgPopup")
   ul.pop-over-list
     li
       form
+        label#deleteOrgWarningMessage.hide
+          | {{_ 'delete-org-warning-message'}}
+        br
         label
           | {{_ 'delete-org-confirm-popup'}}
         br
@@ -552,6 +555,9 @@ template(name="settingsTeamPopup")
   ul.pop-over-list
     li
       form
+        label#deleteTeamWarningMessage.hide
+          | {{_ 'delete-team-warning-message'}}
+        br
         label
           | {{_ 'delete-team-confirm-popup'}}
         br
@@ -565,15 +571,16 @@ template(name="settingsUserPopup")
       a.impersonate-user
         i.fa.fa-user
         | {{_ 'impersonate-user'}}
-    //hr
-    //li
-    //  form
-    //    label.hide.userId(type="text" value=user._id)
-    //    div.buttonsContainer
-    //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
-  // Delete is not enabled yet, because it does leave empty user avatars
+    hr
+    li
+      form
+        label.hide.userId(type="text" value=user._id)
+        div.buttonsContainer
+          input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
+  // Delete is enabled, but there is still bug of leaving empty user avatars
   // to boards: boards members, card members and assignees have
-  // empty users. See:
+  // empty users. So it is better to remove user from all boards before removing user.
+  // See:
   // - wekan/client/components/settings/peopleBody.jade deleteButton
   // - wekan/client/components/settings/peopleBody.js deleteButton
   // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember'

client/components/settings/peopleBody.js

@@ -551,12 +551,15 @@ Template.editUserPopup.events({
     let userTeamsList = userTeams.split(",");
     let userTeamsIdsList = userTeamsIds.split(",");
     let userTms = [];
-    for(let i = 0; i < userTeamsList.length; i++){
-      userTms.push({
-        "teamId": userTeamsIdsList[i],
-        "teamDisplayName": userTeamsList[i],
-      })
+    if(userTeams != ''){
+      for(let i = 0; i < userTeamsList.length; i++){
+        userTms.push({
+          "teamId": userTeamsIdsList[i],
+          "teamDisplayName": userTeamsList[i],
+        })
+      }
     }
+
     Users.update(this.userId, {
       $set:{
         teams: userTms
@@ -566,12 +569,15 @@ Template.editUserPopup.events({
     let userOrgsList = userOrgs.split(",");
     let userOrgsIdsList = userOrgsIds.split(",");
     let userOrganizations = [];
-    for(let i = 0; i < userOrgsList.length; i++){
-      userOrganizations.push({
-        "orgId": userOrgsIdsList[i],
-        "orgDisplayName": userOrgsList[i],
-      })
+    if(userOrgs != ''){
+      for(let i = 0; i < userOrgsList.length; i++){
+        userOrganizations.push({
+          "orgId": userOrgsIdsList[i],
+          "orgDisplayName": userOrgsList[i],
+        })
+      }
     }
+
     Users.update(this.userId, {
       $set:{
         orgs: userOrganizations
@@ -724,7 +730,7 @@ UpdateUserOrgsOrTeamsElement = function(isNewUser = false){
     lstInputValuesIds = [];
   }
   index = lstInputValues.indexOf(selectedEltValue);
-  indexId = lstInputValuesIds.indexOf(selectedEltValue);
+  indexId = lstInputValuesIds.indexOf(selectedEltValueId);
   if(userOrgsTeamsAction == "addOrg" || userOrgsTeamsAction == "addTeam"){
     if(index <= -1 && selectedEltValueId != "-1"){
       lstInputValues.push(selectedEltValue);
@@ -923,6 +929,16 @@ Template.newUserPopup.events({
 Template.settingsOrgPopup.events({
   'click #deleteButton'(event) {
     event.preventDefault();
+    if(Users.find({"orgs.orgId": this.orgId}).count() > 0)
+    {
+      let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
+      if(orgClassList.contains('hide'))
+      {
+        orgClassList.remove('hide');
+        document.getElementById("deleteOrgWarningMessage").style.color = "red";
+      }
+      return;
+    }
     Org.remove(this.orgId);
     Popup.close();
   }
@@ -931,6 +947,16 @@ Template.settingsOrgPopup.events({
 Template.settingsTeamPopup.events({
   'click #deleteButton'(event) {
     event.preventDefault();
+    if(Users.find({"teams.teamId": this.teamId}).count() > 0)
+    {
+      let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;
+      if(teamClassList.contains('hide'))
+      {
+        teamClassList.remove('hide');
+        document.getElementById("deleteTeamWarningMessage").style.color = "red";
+      }
+      return;
+    }
     Team.remove(this.teamId);
     Popup.close();
   }

client/components/sidebar/sidebar.jade

@@ -31,6 +31,26 @@ template(name='homeSidebar')
     +activities(mode="board")
 
 template(name="membersWidget")
+  .board-widget.board-widget-members
+    h3
+      i.fa.fa-users
+      | {{_ 'organizations'}}
+
+    .board-widget-content
+      +boardOrgGeneral
+      .clearfix
+  br
+  hr
+  .board-widget.board-widget-members
+    h3
+      i.fa.fa-users
+      | {{_ 'teams'}}
+
+    .board-widget-content
+      +boardTeamGeneral
+      .clearfix
+  br
+  hr
   .board-widget.board-widget-members
     h3
       i.fa.fa-users
@@ -65,6 +85,30 @@ template(name="membersWidget")
     button.js-member-invite-accept.primary {{_ 'accept'}}
     button.js-member-invite-decline {{_ 'decline'}}
 
+template(name="boardOrgGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th
+          if currentUser.isBoardAdmin
+            a.member.orgOrTeamMember.add-member.js-manage-board-addOrg(title="{{_ 'add-members'}}")
+              i.fa.fa-plus
+      each org in currentBoard.activeOrgs
+        +boardOrgRow(orgId=org.orgId)
+
+template(name="boardTeamGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th
+          if currentUser.isBoardAdmin
+            a.member.orgOrTeamMember.add-member.js-manage-board-addTeam(title="{{_ 'add-members'}}")
+              i.fa.fa-plus
+      each currentBoard.activeTeams
+        +boardTeamRow(teamId=this.teamId)
+
 template(name="boardChangeColorPopup")
   .board-backgrounds-list.clearfix
     each backgroundColors
@@ -409,6 +453,40 @@ template(name="leaveBoardPopup")
   p {{_ 'leave-board-pop' boardTitle=board.title}}
   button.js-confirm.negate.full(type="submit") {{_ 'leave-board'}}
 
+template(name="addBoardOrgPopup")
+  select.js-boardOrgs#jsBoardOrgs
+    option(value="-1") {{_ 'organizations'}} :
+    each value in orgsDatas
+      option(value="{{value._id}}") {{_ value.orgDisplayName}}
+
+template(name="removeBoardOrgPopup")
+  form
+    input.hide#hideOrgId(type="text" value=org._id)
+    label
+      | {{_ 'leave-board'}} ?
+  br
+  hr
+  div.buttonsContainer
+    input.primary.wide.leaveBoardBtn#leaveBoardBtn(type="submit" value="{{_ 'leave-board'}}")
+    input.primary.wide.cancelLeaveBoardBtn#cancelLeaveBoardBtn(type="submit" value="{{_ 'Cancel'}}")
+
+template(name="addBoardTeamPopup")
+  select.js-boardTeams#jsBoardTeams
+    option(value="-1") {{_ 'teams'}} :
+    each value in teamsDatas
+      option(value="{{value._id}}") {{_ value.teamDisplayName}}
+
+template(name="removeBoardTeamPopup")
+  form
+    input.hide#hideTeamId(type="text" value=team._id)
+    label
+      | {{_ 'leave-board'}} ?
+  br
+  hr
+  div.buttonsContainer
+    input.primary.wide.leaveBoardBtn#leaveBoardTeamBtn(type="submit" value="{{_ 'leave-board'}}")
+    input.primary.wide.cancelLeaveBoardBtn#cancelLeaveBoardTeamBtn(type="submit" value="{{_ 'Cancel'}}")
+
 template(name="addMemberPopup")
   .js-search-member
     +esInput(index="users")

client/components/sidebar/sidebar.js

@@ -313,6 +313,8 @@ Template.membersWidget.events({
   'click .js-member': Popup.open('member'),
   'click .js-open-board-menu': Popup.open('boardMenu'),
   'click .js-manage-board-members': Popup.open('addMember'),
+  'click .js-manage-board-addOrg': Popup.open('addBoardOrg'),
+  'click .js-manage-board-addTeam': Popup.open('addBoardTeam'),
   'click .js-import': Popup.open('boardImportBoard'),
   submit: this.onSubmit,
   'click .js-import-board': Popup.open('chooseBoardSource'),
@@ -1168,6 +1170,283 @@ BlazeComponent.extendComponent({
   },
 }).register('addMemberPopup');
 
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitOrgs = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'change #jsBoardOrgs'() {
+          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let selectElt = document.getElementById("jsBoardOrgs");
+          let selectedOrgId = selectElt.options[selectElt.selectedIndex].value;
+          let selectedOrgDisplayName = selectElt.options[selectElt.selectedIndex].text;
+          let boardOrganizations = [];
+          if(currentBoard.orgs !== undefined){
+            for(let i = 0; i < currentBoard.orgs.length; i++){
+              boardOrganizations.push(currentBoard.orgs[i]);
+            }
+          }
+
+          if(!boardOrganizations.some((org) => org.orgDisplayName == selectedOrgDisplayName)){
+            boardOrganizations.push({
+              "orgId": selectedOrgId,
+              "orgDisplayName": selectedOrgDisplayName,
+              "isActive" : true,
+            })
+
+            if (selectedOrgId != "-1") {
+              Meteor.call('setBoardOrgs', boardOrganizations, currentBoard._id);
+            }
+          }
+
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('addBoardOrgPopup');
+
+Template.addBoardOrgPopup.helpers({
+  orgsDatas() {
+    // return Org.find({}, {sort: { createdAt: -1 }});
+    let orgs = Org.find({}, {sort: { createdAt: -1 }});
+    return orgs;
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitOrgs = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'click #leaveBoardBtn'(){
+          let stringOrgId = document.getElementById('hideOrgId').value;
+          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let boardOrganizations = [];
+          if(currentBoard.orgs !== undefined){
+            for(let i = 0; i < currentBoard.orgs.length; i++){
+              if(currentBoard.orgs[i].orgId != stringOrgId){
+                boardOrganizations.push(currentBoard.orgs[i]);
+              }
+            }
+          }
+
+          Meteor.call('setBoardOrgs', boardOrganizations, currentBoard._id);
+
+          Popup.close();
+        },
+        'click #cancelLeaveBoardBtn'(){
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('removeBoardOrgPopup');
+
+Template.removeBoardOrgPopup.helpers({
+  org() {
+    return Org.findOne(this.orgId);
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitTeams = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('team', this.findOrgsOptions.get(), limitTeams, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'change #jsBoardTeams'() {
+          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let selectElt = document.getElementById("jsBoardTeams");
+          let selectedTeamId = selectElt.options[selectElt.selectedIndex].value;
+          let selectedTeamDisplayName = selectElt.options[selectElt.selectedIndex].text;
+          let boardTeams = [];
+          if(currentBoard.teams !== undefined){
+            for(let i = 0; i < currentBoard.teams.length; i++){
+              boardTeams.push(currentBoard.teams[i]);
+            }
+          }
+
+          if(!boardTeams.some((team) => team.teamDisplayName == selectedTeamDisplayName)){
+            boardTeams.push({
+              "teamId": selectedTeamId,
+              "teamDisplayName": selectedTeamDisplayName,
+              "isActive" : true,
+            })
+
+            if (selectedTeamId != "-1") {
+              Meteor.call('setBoardTeams', boardTeams, currentBoard._id);
+            }
+          }
+
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('addBoardTeamPopup');
+
+Template.addBoardTeamPopup.helpers({
+  teamsDatas() {
+    let teams = Team.find({}, {sort: { createdAt: -1 }});
+    return teams;
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitTeams = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('team', this.findOrgsOptions.get(), limitTeams, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'click #leaveBoardTeamBtn'(){
+          let stringTeamId = document.getElementById('hideTeamId').value;
+          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let boardTeams = [];
+          if(currentBoard.teams !== undefined){
+            for(let i = 0; i < currentBoard.teams.length; i++){
+              if(currentBoard.teams[i].teamId != stringTeamId){
+                boardTeams.push(currentBoard.teams[i]);
+              }
+            }
+          }
+
+          Meteor.call('setBoardTeams', boardTeams, currentBoard._id);
+
+          Popup.close();
+        },
+        'click #cancelLeaveBoardTeamBtn'(){
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('removeBoardTeamPopup');
+
+Template.removeBoardTeamPopup.helpers({
+  team() {
+    return Team.findOne(this.teamId);
+  },
+});
+
 Template.changePermissionsPopup.events({
   'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only, click .js-set-worker'(
     event,

client/components/sidebar/sidebar.styl

@@ -214,3 +214,13 @@
     i.fa
       padding: 8px 0px 8px 16px
       font-weight: bold
+
+#jsBoardOrgs, #jsBoardTeams
+  width: 90%
+
+.leaveBoardBtn
+  background-color: green !important
+
+.cancelLeaveBoardBtn
+  margin-left: 5% !important
+  background-color: red !important

client/components/swimlanes/swimlaneHeader.jade

@@ -11,8 +11,15 @@ template(name="swimlaneHeader")
 template(name="swimlaneFixedHeader")
   .swimlane-header(
     class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-      +viewer
-        = title
+      if $eq title 'Card Templates'
+        | {{_ 'card-templates-swimlane'}}
+      else if $eq title 'List Templates'
+        | {{_ 'list-templates-swimlane'}}
+      else if $eq title 'Board Templates'
+        | {{_ 'board-templates-swimlane'}}
+      else
+        +viewer
+          = title
   .swimlane-header-menu
     unless currentUser.isCommentOnly
       if currentUser.isBoardAdmin

client/components/users/userAvatar.jade

@@ -19,6 +19,44 @@ template(name="userAvatarInitials")
   svg.avatar.avatar-initials(viewBox="0 0 {{viewPortWidth}} 15")
     text(x="50%" y="13" text-anchor="middle")= initials
 
+template(name="orgAvatar")
+  a.member.orgOrTeamMember(class="js-member" title="{{orgData.orgDisplayName}}")
+    +boardOrgName(orgId=orgData._id)
+
+template(name="boardOrgRow")
+  tr
+    if orgData.orgIsActive
+      td <s>{{ orgData.orgDisplayName }}</s>
+    else
+      td {{ orgData.orgDisplayName }}
+    td
+      if currentUser.isBoardAdmin
+        a.member.orgOrTeamMember.add-member.js-manage-board-removeOrg(title="{{_ 'remove-from-board'}}")
+          i.fa.fa-minus
+
+template(name="boardTeamRow")
+  tr
+    if teamData.teamIsActive
+      td <s>{{ teamData.teamDisplayName }}</s>
+    else
+      td {{ teamData.teamDisplayName }}
+    td
+      if currentUser.isBoardAdmin
+        a.member.orgOrTeamMember.add-member.js-manage-board-removeTeam(title="{{_ 'remove-from-board'}}")
+          i.fa.fa-minus
+
+template(name="boardOrgName")
+  svg.avatar.avatar-initials(viewBox="0 0 {{orgViewPortWidth}} 15")
+    text(x="50%" y="13" text-anchor="middle")= orgName
+
+template(name="teamAvatar")
+  a.member.orgOrTeamMember(class="js-member" title="{{teamData.teamDisplayName}}")
+    +boardTeamName(orgId=orgData._id)
+
+template(name="boardTeamName")
+  svg.avatar.avatar-initials(viewBox="0 0 {{teamViewPortWidth}} 15")
+    text(x="50%" y="13" text-anchor="middle")= teamName
+
 template(name="userPopup")
   .board-member-menu
     .mini-profile-info

client/components/users/userAvatar.js

@@ -1,6 +1,8 @@
 import Cards from '/models/cards';
 import Avatars from '/models/avatars';
 import Users from '/models/users';
+import Org from '/models/org';
+import Team from '/models/team';
 
 Template.userAvatar.helpers({
   userData() {
@@ -46,6 +48,132 @@ Template.userAvatarInitials.helpers({
   },
 });
 
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitOrgs = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'click .js-manage-board-removeOrg': Popup.open('removeBoardOrg'),
+      },
+    ];
+  },
+}).register('boardOrgRow');
+
+Template.boardOrgRow.helpers({
+  orgData() {
+    const orgCollection = this.esSearch ? ESSearchResults : Org;
+    return orgCollection.findOne(this.orgId);
+  },
+  currentUser(){
+    return Meteor.user();
+  },
+});
+
+Template.boardOrgName.helpers({
+  orgName() {
+    const org = Org.findOne(this.orgId);
+    return org && org.orgDisplayName;
+  },
+
+  orgViewPortWidth() {
+    const org = Org.findOne(this.orgId);
+    return ((org && org.orgDisplayName.length) || 1) * 12;
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+    this.findOrgsOptions = new ReactiveVar({});
+
+    this.page = new ReactiveVar(1);
+    this.autorun(() => {
+      const limitTeams = this.page.get() * Number.MAX_SAFE_INTEGER;
+      this.subscribe('team', this.findOrgsOptions.get(), limitTeams, () => {});
+    });
+  },
+
+  onRendered() {
+    this.setLoading(false);
+  },
+
+  setError(error) {
+    this.error.set(error);
+  },
+
+  setLoading(w) {
+    this.loading.set(w);
+  },
+
+  isLoading() {
+    return this.loading.get();
+  },
+
+  events() {
+    return [
+      {
+        'keyup input'() {
+          this.setError('');
+        },
+        'click .js-manage-board-removeTeam': Popup.open('removeBoardTeam'),
+      },
+    ];
+  },
+}).register('boardTeamRow');
+
+Template.boardTeamRow.helpers({
+  teamData() {
+    const teamCollection = this.esSearch ? ESSearchResults : Team;
+    return teamCollection.findOne(this.teamId);
+  },
+  currentUser(){
+    return Meteor.user();
+  },
+});
+
+Template.boardTeamName.helpers({
+  teamName() {
+    const team = Team.findOne(this.teamId);
+    return team && team.teamDisplayName;
+  },
+
+  teamViewPortWidth() {
+    const team = Team.findOne(this.teamId);
+    return ((team && team.teamDisplayName.length) || 1) * 12;
+  },
+});
+
 BlazeComponent.extendComponent({
   onCreated() {
     this.error = new ReactiveVar('');

client/lib/tests/Utils.tests.js

@@ -0,0 +1,197 @@
+/* eslint-env mocha */
+import sinon from 'sinon';
+import { expect } from 'chai';
+import { Random } from 'meteor/random';
+import '../utils';
+
+
+describe('Utils', function() {
+  beforeEach(function() {
+    sinon.stub(Utils, 'reload').callsFake(() => {});
+  });
+
+  afterEach(function() {
+    window.localStorage.removeItem(boardView);
+    sinon.restore();
+  });
+
+  const boardView = 'boardView';
+
+  describe(Utils.setBoardView.name, function() {
+    it('sets the board view if the user exists', function(done) {
+      const viewId = Random.id();
+      const user = {
+        setBoardView: (view) => {
+          expect(view).to.equal(viewId);
+          done();
+        },
+      };
+      sinon.stub(Meteor, 'user').callsFake(() => user);
+      Utils.setBoardView(viewId);
+
+      expect(window.localStorage.getItem(boardView)).to.equal(viewId);
+    });
+
+    it('sets a specific view if no user exists but a view is defined', function() {
+      const views = [
+        'board-view-swimlanes',
+        'board-view-lists',
+        'board-view-cal'
+      ];
+
+      sinon.stub(Meteor, 'user').callsFake(() => {});
+
+      views.forEach(viewName => {
+        Utils.setBoardView(viewName);
+        expect(window.localStorage.getItem(boardView)).to.equal(viewName);
+      });
+    });
+
+    it('sets a default view if no user and no view are given', function() {
+      sinon.stub(Meteor, 'user').callsFake(() => {});
+      Utils.setBoardView();
+      expect(window.localStorage.getItem(boardView)).to.equal('board-view-swimlanes');
+    });
+  });
+
+  describe(Utils.unsetBoardView.name, function() {
+    it('removes the boardview from localStoage', function() {
+      window.localStorage.setItem(boardView, Random.id());
+      window.localStorage.setItem('collapseSwimlane', Random.id());
+
+      Utils.unsetBoardView();
+
+      expect(window.localStorage.getItem(boardView)).to.equal(null);
+      expect(window.localStorage.getItem('collapseSwimlane')).to.equal(null);
+    });
+  });
+
+  describe(Utils.boardView.name, function() {
+    it('returns the user\'s board view if a user exists', function() {
+      const viewId = Random.id();
+      const user = {};
+      sinon.stub(Meteor, 'user').callsFake(() => user);
+      expect(Utils.boardView()).to.equal(undefined);
+
+      const boardView = Random.id();
+      user.profile = { boardView };
+
+      expect(Utils.boardView()).to.equal(boardView);
+    });
+    it('returns the current defined view', function() {
+      const views = [
+        'board-view-swimlanes',
+        'board-view-lists',
+        'board-view-cal'
+      ];
+
+      sinon.stub(Meteor, 'user').callsFake(() => {});
+
+      views.forEach(viewName => {
+        window.localStorage.setItem(boardView, viewName);
+        expect(Utils.boardView()).to.equal(viewName);
+      });
+    });
+    it('returns a default if nothing is set', function() {
+      sinon.stub(Meteor, 'user').callsFake(() => {});
+      expect(Utils.boardView()).to.equal('board-view-swimlanes');
+      expect(window.localStorage.getItem(boardView)).to.equal('board-view-swimlanes');
+    });
+  });
+
+  describe(Utils.myCardsSort.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.myCardsSortToggle.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.setMyCardsSort.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.archivedBoardIds.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.dueCardsView.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.setDueCardsView.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.goBoardId.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.goCardId.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.processUploadedAttachment.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.shrinkImage.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.capitalize.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.isMiniScreen.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.isShowDesktopDragHandles.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.isMiniScreenOrShowDesktopDragHandles.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.calculateIndexData.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.calculateIndex.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.isTouchDevice.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.calculateTouchDistance.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.enableClickOnTouch.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.manageCustomUI.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.setCustomUI.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.setMatomo.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.manageMatomo.name, function() {
+    it('has no tests yet');
+  });
+
+  describe(Utils.getTriggerActionDesc.name, function() {
+    it('has no tests yet');
+  });
+});

client/lib/tests/index.js

@@ -0,0 +1 @@
+import './Utils.tests';

client/lib/utils.js

@@ -1,20 +1,27 @@
 Utils = {
+  reload () {
+    // we move all window.location.reload calls into this function
+    // so we can disable it when running tests.
+    // This is because we are not allowed to override location.reload but
+    // we can override Utils.reload to prevent reload during tests.
+    window.location.reload();
+  },
   setBoardView(view) {
     currentUser = Meteor.user();
     if (currentUser) {
       Meteor.user().setBoardView(view);
     } else if (view === 'board-view-swimlanes') {
       window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
-      location.reload();
+      Utils.reload();
     } else if (view === 'board-view-lists') {
       window.localStorage.setItem('boardView', 'board-view-lists'); //true
-      location.reload();
+      Utils.reload();
     } else if (view === 'board-view-cal') {
       window.localStorage.setItem('boardView', 'board-view-cal'); //true
-      location.reload();
+      Utils.reload();
     } else {
       window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
-      location.reload();
+      Utils.reload();
     }
   },
 
@@ -39,7 +46,7 @@ Utils = {
       return 'board-view-cal';
     } else {
       window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
-      location.reload();
+      Utils.reload();
       return 'board-view-swimlanes';
     }
   },
@@ -64,7 +71,7 @@ Utils = {
 
   setMyCardsSort(sort) {
     window.localStorage.setItem('myCardsSort', sort);
-    location.reload();
+    Utils.reload();
   },
 
   archivedBoardIds() {
@@ -87,7 +94,7 @@ Utils = {
 
   setDueCardsView(view) {
     window.localStorage.setItem('dueCardsView', view);
-    location.reload();
+    Utils.reload();
   },
 
   // XXX We should remove these two methods

i18n/ar-EG.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ar.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "إضافة مرفق",
     "add-board": "إضافة لوحة",
+    "add-template": "Add Template",
     "add-card": "إضافة بطاقة",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "أرشيف",
     "template": "نموذج",
     "templates": "نماذج",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "تعيين عضو",
     "attached": "أُرفق)",
     "attachment": "مرفق",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/bg.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Добави прикачен файл",
     "add-board": "Добави Табло",
+    "add-template": "Add Template",
     "add-card": "Добави карта",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Архив",
     "template": "Шаблон",
     "templates": "Шаблони",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Възложи на член от екипа",
     "attached": "прикачен",
     "attachment": "Прикаченн файл",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/br.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ca.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Afegeix adjunt",
     "add-board": "Afegeix Tauler",
+    "add-template": "Add Template",
     "add-card": "Afegeix Fitxa",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Desa",
     "template": "Plantilla",
     "templates": "Plantilles",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assignar membre",
     "attached": "adjuntat",
     "attachment": "Adjunt",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/cs.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "editoval(a) datum ukončení na %s z %s",
     "add-attachment": "Přidat přílohu",
     "add-board": "Přidat tablo",
+    "add-template": "Přidat šablonu",
     "add-card": "Přidat kartu",
     "add-card-to-top-of-list": "Přidat kartu na začátek seznamu",
     "add-card-to-bottom-of-list": "Přidat kartu na konec seznamu",
@@ -119,6 +120,8 @@
     "archives": "Archiv",
     "template": "Šablona",
     "templates": "Šablony",
+    "template-container": "Kontejner šablony",
+    "add-template-container": "Přidat kontejner šablony",
     "assign-member": "Přiřadit člena",
     "attached": "přiloženo",
     "attachment": "Příloha",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximalizovat kartu",
-    "minimize-card": "Minimalizovat kartu"
+    "minimize-card": "Minimalizovat kartu",
+    "delete-org-warning-message": "Tuto organizaci není možné smazat, protože do ní patří uživatel(é)",
+    "delete-team-warning-message": "Tento tým není možné smazat, protože do nej patří uživatel(é)"
 }

i18n/da.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Tilføj vedhæftning",
     "add-board": "Tilføj tavle",
+    "add-template": "Add Template",
     "add-card": "Tilføj kort",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arkiv",
     "template": "Skabelon",
     "templates": "Skabeloner",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Tilknyt medlem",
     "attached": "vedhæftet",
     "attachment": "Vedhæftning",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/de-CH.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "hat Enddatum zu %s geändert auf %s",
     "add-attachment": "Datei anhängen",
     "add-board": "Board hinzufügen",
+    "add-template": "Vorlage hinzufügen",
     "add-card": "Karte hinzufügen",
     "add-card-to-top-of-list": "Karte am Anfang der Liste hinzufügen",
     "add-card-to-bottom-of-list": "Karte am Ende der Liste hinzufügen",
@@ -119,6 +120,8 @@
     "archives": "Archiv",
     "template": "Vorlage",
     "templates": "Vorlagen",
+    "template-container": "Vorlagen-Container",
+    "add-template-container": "Vorlagen-Container hinzufügen",
     "assign-member": "Mitglied zuweisen",
     "attached": "angehängt",
     "attachment": "Anhang",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Karte maximieren",
-    "minimize-card": "Karte minimieren"
+    "minimize-card": "Karte minimieren",
+    "delete-org-warning-message": "Diese Organisation kann nicht gelöscht werden. Zumindest ein Benutzer ist ihr noch zugehörig.",
+    "delete-team-warning-message": "Dieses Team kann nicht gelöscht werden. Zumindest ein Benutzer ist ihm noch zugehörig."
 }

i18n/de.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "hat Enddatum zu %s geändert auf %s",
     "add-attachment": "Datei anhängen",
     "add-board": "neues Board",
+    "add-template": "Vorlage hinzufügen",
     "add-card": "Karte hinzufügen",
     "add-card-to-top-of-list": "Karte am Anfang der Liste hinzufügen",
     "add-card-to-bottom-of-list": "Karte am Ende der Liste hinzufügen",
@@ -119,6 +120,8 @@
     "archives": "Archiv",
     "template": "Vorlage",
     "templates": "Vorlagen",
+    "template-container": "Vorlagen-Container",
+    "add-template-container": "Vorlagen-Container hinzufügen",
     "assign-member": "Mitglied zuweisen",
     "attached": "angehängt",
     "attachment": "Anhang",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout-Warte-Symbol",
     "Wave": "Wellen-Warte-Symbol",
     "maximize-card": "Karte maximieren",
-    "minimize-card": "Karte minimieren"
+    "minimize-card": "Karte minimieren",
+    "delete-org-warning-message": "Diese Organisation kann nicht gelöscht werden, da wenigstens ein Nutzer dazu gehört.",
+    "delete-team-warning-message": "Dieses Team kann nicht gelöscht werden, da wenigstens ein Nutzer dazu gehört."
 }

i18n/el.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "η ημερομηνία λήξης άλλαξε σε %s από %s",
     "add-attachment": "Προσθήκη Συνημμένου",
     "add-board": "Προσθήκη Πίνακα",
+    "add-template": "Add Template",
     "add-card": "Προσθήκη Κάρτας",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Αρχείο",
     "template": "Πρότυπο",
     "templates": "Πρότυπα",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Ανάθεση μέλους",
     "attached": "επισυνάφθηκε",
     "attachment": "Συνημμένο",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/en-GB.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/en.i18n.json

@@ -81,6 +81,7 @@
   "activity-endDate": "edited end date to %s of %s",
   "add-attachment": "Add Attachment",
   "add-board": "Add Board",
+  "add-template": "Add Template",
   "add-card": "Add Card",
   "add-card-to-top-of-list": "Add Card to Top of List",
   "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
   "archives": "Archive",
   "template": "Template",
   "templates": "Templates",
+  "template-container": "Template Container",
+  "add-template-container": "Add Template Container",
   "assign-member": "Assign member",
   "attached": "attached",
   "attachment": "Attachment",
@@ -1054,5 +1057,7 @@
   "Scaleout": "Scaleout Wait Spinner",
   "Wave": "Wave Wait Spinner",
   "maximize-card": "Maximize Card",
-  "minimize-card": "Minimize Card"
+  "minimize-card": "Minimize Card",
+  "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+  "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/eo.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arkivi",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-AR.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Agregar Adjunto",
     "add-board": "Agregar Tablero",
+    "add-template": "Add Template",
     "add-card": "Agregar Tarjeta",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archivar",
     "template": "Plantilla",
     "templates": "Plantillas",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Asignar miembro",
     "attached": "adjunto(s)",
     "attachment": "Adjunto",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-CL.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Añadir adjunto",
     "add-board": "Añadir tablero",
+    "add-template": "Add Template",
     "add-card": "Añadir una tarjeta",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archivo",
     "template": "Plantilla",
     "templates": "Plantillas",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Asignar miembros",
     "attached": "adjuntado",
     "attachment": "Adjunto",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-LA.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-MX.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-PE.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "editada la fecha de finalización a %s de %s",
     "add-attachment": "Agregar adjunto",
     "add-board": "Agregar tablero",
+    "add-template": "Add Template",
     "add-card": "Agregar una tarjeta",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archivo",
     "template": "Plantilla",
     "templates": "Plantillas",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Asignar miembros",
     "attached": "adjuntado",
     "attachment": "Adjunto",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es-PY.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/es.i18n.json

@@ -81,9 +81,10 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Añadir adjunto",
     "add-board": "Añadir tablero",
+    "add-template": "Añadir plantilla",
     "add-card": "Añadir una tarjeta",
-    "add-card-to-top-of-list": "Add Card to Top of List",
-    "add-card-to-bottom-of-list": "Add Card to Bottom of List",
+    "add-card-to-top-of-list": "Subir la tarjeta al principio de la lista",
+    "add-card-to-bottom-of-list": "Bajar la tarjeta al final de la lista",
     "add-swimlane": "Añadir un carril de flujo",
     "add-subtask": "Añadir subtarea",
     "add-checklist": "Añadir una lista de verificación",
@@ -119,6 +120,8 @@
     "archives": "Archivo",
     "template": "Plantilla",
     "templates": "Plantillas",
+    "template-container": "Plantilla de contenedor",
+    "add-template-container": "añadir plantilla de contenedor",
     "assign-member": "Asignar miembros",
     "attached": "adjuntado",
     "attachment": "Adjunto",
@@ -133,7 +136,7 @@
     "board-not-found": "Tablero no encontrado",
     "board-private-info": "Este tablero será <strong>privado</strong>.",
     "board-public-info": "Este tablero será <strong>público</strong>.",
-    "board-drag-drop-reorder-or-click-open": "Drag and drop to reorder board icons. Click board icon to open board.",
+    "board-drag-drop-reorder-or-click-open": "Mueve y posiciona para reordenar los iconos de los tableros. Click en el icono del tablero para abrirlo",
     "boardChangeColorPopup-title": "Cambiar el fondo del tablero",
     "boardChangeTitlePopup-title": "Renombrar el tablero",
     "boardChangeVisibilityPopup-title": "Cambiar visibilidad",
@@ -1015,9 +1018,9 @@
     "link-to-search": "Enlazar a esta búsqueda",
     "excel-font": "Arial",
     "number": "Número",
-    "label-colors": "Label Colors",
-    "label-names": "Label Names",
-    "archived-at": "archived at",
+    "label-colors": "Colores de las etiquetas",
+    "label-names": "Nombres de las etiquetas",
+    "archived-at": "archivado el",
     "sort-cards": "Sort Cards",
     "cardsSortPopup-title": "Sort Cards",
     "due-date": "Due Date",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/eu.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Gehitu eranskina",
     "add-board": "Gehitu arbela",
+    "add-template": "Add Template",
     "add-card": "Gehitu txartela",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Artxibatu",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Esleitu kidea",
     "attached": "erantsita",
     "attachment": "Eranskina",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/fa-IR.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/fa.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "افزودن ضمیمه",
     "add-board": "افزودن برد",
+    "add-template": "Add Template",
     "add-card": "افزودن کارت",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "آرشیو",
     "template": "قالب",
     "templates": "قالب‌ها",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "انتصاب عضو",
     "attached": "ضمیمه شده",
     "attachment": "ضمیمه",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/fi.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "muokkasi loppumispäiväksi %s / %s",
     "add-attachment": "Lisää liite",
     "add-board": "Lisää taulu",
+    "add-template": "Lisää malli",
     "add-card": "Lisää kortti",
     "add-card-to-top-of-list": "Lisää kortti listan alkuun",
     "add-card-to-bottom-of-list": "Lisää kortti listan loppuun",
@@ -119,6 +120,8 @@
     "archives": "Arkisto",
     "template": "Malli",
     "templates": "Mallit",
+    "template-container": "Mallikontti",
+    "add-template-container": "Lisää mallikontti",
     "assign-member": "Valitse jäsen",
     "attached": "liitetty",
     "attachment": "Liitetiedosto",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Skaalaus ulos odotus pyörijä",
     "Wave": "Aalto odotus pyörijä",
     "maximize-card": "Suurenna kortti",
-    "minimize-card": "Pienennä kortti"
+    "minimize-card": "Pienennä kortti",
+    "delete-org-warning-message": "Ei voi poistaa tätä organisaatiota, ainakin yksi käyttäjä kuuluu siihen",
+    "delete-team-warning-message": "Ei voi poistaa tätä tiimiä, ainakin yksi käyttäjä kuuluu siihen"
 }

i18n/fr.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "date de fin éditée de %s à %s",
     "add-attachment": "Ajouter une pièce jointe",
     "add-board": "Ajouter un tableau",
+    "add-template": "Ajouter un modèle",
     "add-card": "Ajouter une carte",
     "add-card-to-top-of-list": "Ajouter la carte en haut de la liste",
     "add-card-to-bottom-of-list": "Ajouter la carte en bas de la liste",
@@ -119,6 +120,8 @@
     "archives": "Archives",
     "template": "Modèle",
     "templates": "Modèles",
+    "template-container": "Conteneur de modèles",
+    "add-template-container": "Ajouter un conteneur de modèles",
     "assign-member": "Affecter un participant",
     "attached": "joint",
     "attachment": "Pièce jointe",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Icône d'attente mise à l'échelle",
     "Wave": "Icône d'attente onde",
     "maximize-card": "Maximiser la carte",
-    "minimize-card": "Minimiser la carte"
+    "minimize-card": "Minimiser la carte",
+    "delete-org-warning-message": "Impossible de supprimer cette organisation, au moins un utilisateur lui appartient",
+    "delete-team-warning-message": "Impossible de supprimer cette équipe, au moins un utilisateur lui appartient"
 }

i18n/gl.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Engadir anexo",
     "add-board": "Engadir taboleiro",
+    "add-template": "Add Template",
     "add-card": "Engadir tarxeta",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arquivar",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Anexo",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/he.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "תאריך הסיום השתנה מ־%s ל־%s",
     "add-attachment": "הוספת קובץ מצורף",
     "add-board": "הוספת לוח",
+    "add-template": "הוספת תבנית",
     "add-card": "הוספת כרטיס",
     "add-card-to-top-of-list": "הוספת כרטיס לראש הרשימה",
     "add-card-to-bottom-of-list": "הוספת כרטיס לתחתית הרשימה",
@@ -119,6 +120,8 @@
     "archives": "להעביר לארכיון",
     "template": "תבנית",
     "templates": "תבניות",
+    "template-container": "מכולה לתבנית",
+    "add-template-container": "הוספת מכולה לתבנית",
     "assign-member": "הקצאת חבר",
     "attached": "מצורף",
     "attachment": "קובץ מצורף",
@@ -1053,5 +1056,7 @@
     "Scaleout": "שבשבת המתנה התרחקות",
     "Wave": "שבשבת המתנה גל",
     "maximize-card": "הגדלת כרטיס",
-    "minimize-card": "מזעור כרטיס"
+    "minimize-card": "מזעור כרטיס",
+    "delete-org-warning-message": "לא ניתן למחוק את הארגון הזה, יש לפחות משתמש אחד ששייך אליו",
+    "delete-team-warning-message": "לא ניתן למחוק את הצוות הזה, יש לפחות משתמש אחד ששייך אליו"
 }

i18n/hi.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "संलग्न करें",
     "add-board": "बोर्ड जोड़ें",
+    "add-template": "Add Template",
     "add-card": "कार्ड जोड़ें",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "पुरालेख",
     "template": "खाका",
     "templates": "खाका",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "आवंटित सदस्य",
     "attached": "संलग्न",
     "attachment": "संलग्नक",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/hr.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Dodaj privitak",
     "add-board": "Dodaj ploču",
+    "add-template": "Add Template",
     "add-card": "Dodaj karticu",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arhiva",
     "template": "Predložak",
     "templates": "Predlošci",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Dodijeli člana",
     "attached": "u prilogu",
     "attachment": "Privitak",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/hu.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "átírta a \"befejezés\" dátumát erről: %s erre: %s",
     "add-attachment": "Melléklet hozzáadása",
     "add-board": "Tábla hozzáadása",
+    "add-template": "Add Template",
     "add-card": "Kártya hozzáadása",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archiválás",
     "template": "Sablon",
     "templates": "Sablonok",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Tag hozzárendelése",
     "attached": "csatolva",
     "attachment": "Melléklet",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/hy.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/id.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arsip",
     "template": "Klise",
     "templates": "Klise",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Tugaskan anggota",
     "attached": "terlampir",
     "attachment": "Lampiran",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ig.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/it.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "ha modificato la data di fine a %s di %s ",
     "add-attachment": "Aggiungi allegato",
     "add-board": "Aggiungi bacheca",
+    "add-template": "Add Template",
     "add-card": "Aggiungi scheda",
     "add-card-to-top-of-list": "Aggiungi Scheda in cima alla Lista",
     "add-card-to-bottom-of-list": "Aggiungi Scheda in fondo alla Lista",
@@ -119,6 +120,8 @@
     "archives": "Archivio",
     "template": "Template",
     "templates": "Template",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assegna a un membro",
     "attached": "allegato",
     "attachment": "Allegato",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ja.i18n.json

@@ -81,8 +81,9 @@
     "activity-endDate": "終了日を %s に変更しました / %s",
     "add-attachment": "添付ファイルを追加",
     "add-board": "ボードを追加",
+    "add-template": "Add Template",
     "add-card": "カードを追加",
-    "add-card-to-top-of-list": "Add Card to Top of List",
+    "add-card-to-top-of-list": "カードをリストの先頭に追加",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
     "add-swimlane": "スイムレーンを追加",
     "add-subtask": "サブタスクを追加",
@@ -119,6 +120,8 @@
     "archives": "アーカイブ",
     "template": "テンプレート",
     "templates": "テンプレート",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "メンバーの割当",
     "attached": "添付されました",
     "attachment": "添付ファイル",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ka.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "მიბმული ფაილის დამატება",
     "add-board": "დაფის დამატება",
+    "add-template": "Add Template",
     "add-card": "ბარათის დამატება",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "უფლებამოსილი წევრი",
     "attached": "მიბმული",
     "attachment": "მიბმული ფიალი",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/km.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ko.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "첨부파일 추가",
     "add-board": "보드 추가",
+    "add-template": "Add Template",
     "add-card": "카드 추가",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "보관",
     "template": "템플릿",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "멤버 지정",
     "attached": "첨부됨",
     "attachment": "첨부 파일",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/lt.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/lv.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Pievienot failu",
     "add-board": "Pievienot dēli",
+    "add-template": "Add Template",
     "add-card": "Pievienot kartiņu",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arhīvs",
     "template": "Sagatave",
     "templates": "Sagataves",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Iecelt dalībnieku",
     "attached": "pievienots fails",
     "attachment": "Fails",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/mk.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Додај прилог",
     "add-board": "Додади Табла",
+    "add-template": "Add Template",
     "add-card": "Додади Картичка",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Архива",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Възложи на член от екипа",
     "attached": "прикачен",
     "attachment": "Прикаченн датотека",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/mn.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Хавсралт нэмэх",
     "add-board": "Самбар нэмэх",
+    "add-template": "Add Template",
     "add-card": "Карт нэмэх",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/nb.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "redigert sluttdato %s av %s",
     "add-attachment": "Legg til Vedlegg",
     "add-board": "Legg til Tavle",
+    "add-template": "Add Template",
     "add-card": "Legg til Kort",
     "add-card-to-top-of-list": "Legg til Kort på Toppen av Listen",
     "add-card-to-bottom-of-list": "Legg til Kort på Bunnen av Listen",
@@ -119,6 +120,8 @@
     "archives": "Arkiv",
     "template": "Mal",
     "templates": "Maler",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Tildel Medlem",
     "attached": "la ved",
     "attachment": "Vedlegg",
@@ -156,7 +159,7 @@
     "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 flytte kortet til Arkivet for å fjerne det fra tavlen og bevare aktivteten.",
     "card-due": "Frist",
-    "card-due-on": "Frist til",
+    "card-due-on": "Utløpsfrist",
     "card-spent": "Forbrukt tid",
     "card-edit-attachments": "Rediger vedlegg",
     "card-edit-custom-fields": "Rediger tilpassede felt",
@@ -165,7 +168,7 @@
     "card-labels-title": "Endre etiketter for kortet.",
     "card-members-title": "Legg til eller fjern medlemmer på tavlen fra dette kortet.",
     "card-start": "Start",
-    "card-start-on": "Starter på",
+    "card-start-on": "Starter",
     "cardAttachmentsPopup-title": "Legg ved fra",
     "cardCustomField-datePopup-title": "Endre dato",
     "cardCustomFieldsPopup-title": "Rediger tilpassede felt",
@@ -181,10 +184,10 @@
     "vote-against": "mot",
     "deleteVotePopup-title": "Slett stemme?",
     "vote-delete-pop": "Sletting er permanent. Du vil miste alle aksjoner som har en sammenheng med denne stemmen.",
-    "cardStartPlanningPokerPopup-title": "Start en Planpeker",
-    "card-edit-planning-poker": "Endre en Planpeker",
-    "editPokerEndDatePopup-title": "Endre Stemming og Dato for Planpeker ",
-    "poker-question": "Planpeker",
+    "cardStartPlanningPokerPopup-title": "Start rangering oppgave",
+    "card-edit-planning-poker": "Endre rangering oppgave",
+    "editPokerEndDatePopup-title": "Endre sluttdato rangering ",
+    "poker-question": "Rangering",
     "poker-one": "1",
     "poker-two": "2",
     "poker-three": "3",
@@ -198,12 +201,12 @@
     "poker-finish": "Ferdig",
     "poker-result-votes": "Stemmer",
     "poker-result-who": "Hvem",
-    "poker-replay": "Spill på nytt",
-    "set-estimation": "Angi Estimat",
-    "deletePokerPopup-title": "Slett Planpeker",
-    "poker-delete-pop": "Sletting er permanent. Du vil miste alle aksjoner som er assosiert med denne planpekeren.",
+    "poker-replay": "Ranger på nytt",
+    "set-estimation": "Estimat",
+    "deletePokerPopup-title": "Slett rangering",
+    "poker-delete-pop": "Sletting er permanent. Du vil miste alle aksjoner assosiert med rangeringen.",
     "cardDeletePopup-title": "Slett kort?",
-    "cardDetailsActionsPopup-title": "Kort-handlinger",
+    "cardDetailsActionsPopup-title": "Behandling kort",
     "cardLabelsPopup-title": "Etiketter",
     "cardMembersPopup-title": "Medlemmer",
     "cardMorePopup-title": "Mer",
@@ -271,7 +274,7 @@
     "computer": "Datamaskin",
     "confirm-subtask-delete-dialog": "Er du sikker på at du vil slette underoppgaven?",
     "confirm-checklist-delete-dialog": "Er du sikker på at du vil slette sjekklisten?",
-    "copy-card-link-to-clipboard": "Kopier kortlink til utklippstavle",
+    "copy-card-link-to-clipboard": "Kopier lenke",
     "linkCardPopup-title": "Link Kort",
     "searchElementPopup-title": "Søk",
     "copyCardPopup-title": "Kopier Kort",
@@ -358,11 +361,11 @@
     "export-board-excel": "Eksporter Tavle til Excel",
     "user-can-not-export-excel": "Bruker kan ikke eksportere til Excel",
     "export-board-html": "Eksporter tavle til HTML",
-    "export-card": "Export card",
-    "export-card-pdf": "Export card to PDF",
-    "user-can-not-export-card-to-pdf": "User can not export card to PDF",
+    "export-card": "Eksportér kort",
+    "export-card-pdf": "Eksportér kort til PDF",
+    "user-can-not-export-card-to-pdf": "Brukeren kan ikke eksportere kort til PDF",
     "exportBoardPopup-title": "Eksporter tavle",
-    "exportCardPopup-title": "Export card",
+    "exportCardPopup-title": "Eksportér kort",
     "sort": "Sorter",
     "sort-desc": "Klikk for sortering liste",
     "list-sort-by": "Sorter liten etter:",
@@ -405,7 +408,7 @@
     "home": "Hjem",
     "import": "Importer",
     "impersonate-user": "Anonymiser Bruker",
-    "link": "Link",
+    "link": "Lenke",
     "import-board": "Importer Tavle",
     "import-board-c": "Importer Tavle",
     "import-board-title-trello": "Importer Tavle fra Trello",
@@ -443,7 +446,7 @@
     "leave-board": "Forlat Tavle",
     "leave-board-pop": "Er du sikker på at du vil forlate __boardTitle__? Du vil bli fjernet fra alle kortene på denne tavlen.",
     "leaveBoardPopup-title": "Forlat Tavle?",
-    "link-card": "Link til dette kortet",
+    "link-card": "Lenke til kortet",
     "list-archive-cards": "Flytt alle kortene i denne listen til Arkivet",
     "list-archive-cards-pop": "Dette vil fjerne alle kortene i denne listen fra denne Tavlen. For å se kortene i Arkivet og flytte dem tilbake til Tavlen, klikk \"Meny\" -> \"Arkiv\".",
     "list-move-cards": "Flytt alle kortene i denne listen",
@@ -453,12 +456,12 @@
     "settingsUserPopup-title": "Brukerinnstillinger",
     "settingsTeamPopup-title": "Innstillinger Team",
     "settingsOrgPopup-title": "Innstillinger Organisasjon",
-    "swimlaneActionPopup-title": "Svømmebane-aksjoner",
+    "swimlaneActionPopup-title": "Aksjoner Svømmebane",
     "swimlaneAddPopup-title": "Legg til en Svømmebane under",
     "listImportCardPopup-title": "Importer et Trello-kort",
     "listImportCardsTsvPopup-title": "Importer Excel CSV/TSV",
     "listMorePopup-title": "Mer",
-    "link-list": "Link til denne listen",
+    "link-list": "Lenke til liste",
     "list-delete-pop": "Alle aksjoner vil fjernes fra aktivitetsstrømmen og du vil ikke kunne gjenopprette listen. Det finnes ingen angremulighet.",
     "list-delete-suggest-archive": "Du kan flytte en liste til Arkiv for å fjerne den fra Tavlen og bevare aktivitetene.",
     "lists": "Lister",
@@ -573,7 +576,7 @@
     "automatic-linked-url-schemes": "Egendefinerte URL-tilordninger som automatisk skal kunne klikkes på. Kun én URL-tilordning per linje",
     "username": "Brukernavn",
     "import-usernames": "Importer Brukernavn",
-    "view-it": "Se det",
+    "view-it": "Se detaljer",
     "warn-list-archived": "advarsel: dette kortet er i en liste i arkivet",
     "watch": "Overvåk",
     "watching": "Overvåkning",
@@ -657,9 +660,9 @@
     "verified": "Verifisert",
     "active": "Aktiv",
     "card-received": "Mottatt",
-    "card-received-on": "Mpttatt på",
-    "card-end": "Slutt",
-    "card-end-on": "Slutt på",
+    "card-received-on": "Opprettet",
+    "card-end": "Avslutt",
+    "card-end-on": "Avsluttes",
     "editCardReceivedDatePopup-title": "Endre mottatt dato",
     "editCardEndDatePopup-title": "Endre sluttdato",
     "setCardColorPopup-title": "Sett farge",
@@ -1012,7 +1015,7 @@
     "globalSearch-instructions-notes-3-2": "Dager kan angis som et positivt eller negativt heltall, eller ved bruk av  `__predicate_week__`, `__predicate_month__`, `__predicate_quarter__` eller `__predicate_year__` for den aktuelle perioden.",
     "globalSearch-instructions-notes-4": "Tekstsøk er ikke \"case\"-sensitive.",
     "globalSearch-instructions-notes-5": "Som standard er arkiverte kort ikke søkbare, ",
-    "link-to-search": "Link til dette søket",
+    "link-to-search": "Lenke til dette søket",
     "excel-font": "Arial",
     "number": "Nummer",
     "label-colors": "Farge Merke",
@@ -1026,7 +1029,7 @@
     "title-alphabetically": "Tittel (alfabetisk)",
     "created-at-newest-first": "Opprettet på (Nyeste Først)",
     "created-at-oldest-first": "Opprettet på (Eldste Først)",
-    "links-heading": "Linker",
+    "links-heading": "Lenker",
     "hide-system-messages-of-all-users": "Skjul systemmeldinger for alle brukere",
     "now-system-messages-of-all-users-are-hidden": "Systemmeldinger er nå skjult for alle brukere",
     "move-swimlane": "Flytt Svømmebane",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Ventehjul - Utskaliering",
     "Wave": "Ventehjul - Bølge",
     "maximize-card": "Maksimer Kort",
-    "minimize-card": "Minimer Kort"
+    "minimize-card": "Minimer Kort",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/nl.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "einddatum gewijzigd naar %s van %s ",
     "add-attachment": "Bijlage Toevoegen",
     "add-board": "Bord Toevoegen",
+    "add-template": "Template Toevoegen",
     "add-card": "Kaart Toevoegen",
     "add-card-to-top-of-list": "Voeg Kaart Boven Aan de Lijst Toe",
     "add-card-to-bottom-of-list": "Voeg Kaart Onder Aan de Lijst Toe",
@@ -119,6 +120,8 @@
     "archives": "Archief",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Template Container Toevoegen",
     "assign-member": "Lid toevoegen",
     "attached": "bijgevoegd",
     "attachment": "Bijlage",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Vergrotende Wacht Spinner",
     "Wave": "Golvende Wacht Spinner",
     "maximize-card": "Maximaliseer Kaart",
-    "minimize-card": "Minimaliseer Kaart"
+    "minimize-card": "Minimaliseer Kaart",
+    "delete-org-warning-message": "Kan deze organisatie niet verwijderen want er is nog minimaal 1 gebruiker lid van.",
+    "delete-team-warning-message": "Kan dit team niet verwijderen want er is nog minimaal 1 gebruiker lid van."
 }

i18n/oc.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Apondre una pèça joncha",
     "add-board": "Apondre un tablèu",
+    "add-template": "Add Template",
     "add-card": "Apondre una carta",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archivar",
     "template": "Modèl",
     "templates": "Modèls",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Affectar un participant",
     "attached": "jónher",
     "attachment": "pèça joncha",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/pa.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/pl.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "zmienił datę zakończenia na %s z %s",
     "add-attachment": "Dodaj załącznik",
     "add-board": "Dodaj tablicę",
+    "add-template": "Add Template",
     "add-card": "Dodaj kartę",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archiwum",
     "template": "Szablon",
     "templates": "Szablony",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Dodaj użytkownika",
     "attached": "dodał załącznik",
     "attachment": "Załącznik",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/pt-BR.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "editou concluído para %s de %s",
     "add-attachment": "Adicionar Anexos",
     "add-board": "Adicionar Quadro",
+    "add-template": "Adicionar Modelo",
     "add-card": "Adicionar Cartão",
     "add-card-to-top-of-list": "Adicionar Cartão no Topo da Lista",
     "add-card-to-bottom-of-list": "Adicionar Cartão no Final da Lista",
@@ -119,6 +120,8 @@
     "archives": "Arquivos morto",
     "template": "Modelo",
     "templates": "Modelos",
+    "template-container": "Contêiner de Modelo",
+    "add-template-container": "Adicionar Contêiner de Modelo",
     "assign-member": "Atribuir Membro",
     "attached": "anexado",
     "attachment": "Anexo",
@@ -1043,15 +1046,17 @@
     "copy-swimlane": "Copiar Raia",
     "copySwimlanePopup-title": "Copiar Raia",
     "display-card-creator": "Exibir Criador do Cartão",
-    "wait-spinner": "Aguarde o carregamento",
-    "Bounce": "Bounce Wait Spinner",
-    "Cube": "Cube Wait Spinner",
-    "Cube-Grid": "Cube-Grid Wait Spinner",
-    "Dot": "Dot Wait Spinner",
-    "Double-Bounce": "Double Bounce Wait Spinner",
-    "Rotateplane": "Rotateplane Wait Spinner",
-    "Scaleout": "Scaleout Wait Spinner",
-    "Wave": "Wave Wait Spinner",
+    "wait-spinner": "Spinner de carregamento",
+    "Bounce": "Salto",
+    "Cube": "Cubo",
+    "Cube-Grid": "Grade de cubos",
+    "Dot": "Pontos",
+    "Double-Bounce": "Salto duplo",
+    "Rotateplane": "Rotação plana",
+    "Scaleout": "Dimensionamento",
+    "Wave": "Ondas",
     "maximize-card": "Maximizar Cartão",
-    "minimize-card": "Minimizar Cartão"
+    "minimize-card": "Minimizar Cartão",
+    "delete-org-warning-message": "Não é possível excluir esta organização. Existe pelo menos um usuário que pertence a ela.",
+    "delete-team-warning-message": "Não é possível excluir este time. Existe pelo menos um usuário que pertence a ele."
 }

i18n/pt.i18n.json

@@ -81,9 +81,10 @@
     "activity-endDate": "editou a data de fim para %s de %s",
     "add-attachment": "Adicionar Anexo",
     "add-board": "Adicionar Quadro",
+    "add-template": "Add Template",
     "add-card": "Adicionar Cartão",
-    "add-card-to-top-of-list": "Add Card to Top of List",
-    "add-card-to-bottom-of-list": "Add Card to Bottom of List",
+    "add-card-to-top-of-list": "Adicionar Cartão no Topo da Lista",
+    "add-card-to-bottom-of-list": "Adicionar Cartão no Fundo da Lista",
     "add-swimlane": "Adicionar Pista",
     "add-subtask": "Adicionar Sub-tarefa",
     "add-checklist": "Adicionar Lista de Verificação",
@@ -119,6 +120,8 @@
     "archives": "Arquivo",
     "template": "Modelo",
     "templates": "Modelos",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Atribuir Membro",
     "attached": "anexado",
     "attachment": "Anexo",
@@ -196,10 +199,10 @@
     "poker-oneHundred": "100",
     "poker-unsure": "?",
     "poker-finish": "Finish",
-    "poker-result-votes": "Votes",
+    "poker-result-votes": "Votos",
     "poker-result-who": "Who",
     "poker-replay": "Replay",
-    "set-estimation": "Set Estimation",
+    "set-estimation": "Definir Estimativa",
     "deletePokerPopup-title": "Delete planning poker?",
     "poker-delete-pop": "Deleting is permanent. You will lose all actions associated with this planning poker.",
     "cardDeletePopup-title": "Apagar Cartão?",
@@ -233,7 +236,7 @@
     "close": "Fechar",
     "close-board": "Fechar o Quadro",
     "close-board-pop": "Poderá restaurar o quadro clicando no botão “Arquivo” a partir do cabeçalho do Início.",
-    "close-card": "Close Card",
+    "close-card": "Fechar Cartão",
     "color-black": "preto",
     "color-blue": "azul",
     "color-crimson": "carmesim",
@@ -358,11 +361,11 @@
     "export-board-excel": "Exportar quadro para Excel",
     "user-can-not-export-excel": "Utilizador não pode exportar Excel",
     "export-board-html": "Exportar quadro para HTML",
-    "export-card": "Export card",
-    "export-card-pdf": "Export card to PDF",
-    "user-can-not-export-card-to-pdf": "User can not export card to PDF",
+    "export-card": "Exportar cartão",
+    "export-card-pdf": "Exportar cartão para PDF",
+    "user-can-not-export-card-to-pdf": "Utilizador não pode exportar cartão para PDF",
     "exportBoardPopup-title": "Exportar quadro",
-    "exportCardPopup-title": "Export card",
+    "exportCardPopup-title": "Exportar cartão",
     "sort": "Ordenar",
     "sort-desc": "Clique para ordenar a Lista",
     "list-sort-by": "Ordenar a Lista por:",
@@ -451,8 +454,8 @@
     "set-color-list": "Definir Cor",
     "listActionPopup-title": "Listar Ações",
     "settingsUserPopup-title": "Configurações do utilizador",
-    "settingsTeamPopup-title": "Team Settings",
-    "settingsOrgPopup-title": "Organization Settings",
+    "settingsTeamPopup-title": "Definições Equipa",
+    "settingsOrgPopup-title": "Definições Organização",
     "swimlaneActionPopup-title": "Acções de Pista",
     "swimlaneAddPopup-title": "Adicionar uma Pista abaixo",
     "listImportCardPopup-title": "Importe um cartão do Trello",
@@ -668,7 +671,7 @@
     "setListColorPopup-title": "Escolha uma cor",
     "assigned-by": "Atribuído Por",
     "requested-by": "Solicitado Por",
-    "card-sorting-by-number": "Card sorting by number",
+    "card-sorting-by-number": "Ordenar cartões por número",
     "board-delete-notice": "Apagar é permanente. Irá perder todas as listas, cartões e acções associadas a este quadro.",
     "delete-board-confirm-popup": "Todas as listas, cartões, etiquetas e atividades serão apagadas e não poderá recuperar o conteúdo do quadro. Não é reversível.",
     "boardDeletePopup-title": "Apagar Quadro?",
@@ -768,7 +771,7 @@
     "r-d-move-to-top-gen": "Mover cartão para o topo da sua lista",
     "r-d-move-to-top-spec": "Mover cartão para o topo da lista",
     "r-d-move-to-bottom-gen": "Mover cartão para o fundo da sua lista",
-    "r-d-move-to-bottom-spec": "Mover cartão para fundo da lista",
+    "r-d-move-to-bottom-spec": "Mover cartão para o fundo da lista",
     "r-d-send-email": "Enviar e-mail",
     "r-d-send-email-to": "para",
     "r-d-send-email-subject": "assunto",
@@ -850,8 +853,8 @@
     "act-duenow": "estava a lembrar que a data limite (__timeValue__) de __card__ é agora",
     "act-atUserComment": "Foi mencionado em [__board__] __list__/__card__",
     "delete-user-confirm-popup": "Tem a certeza que pretende apagar esta conta? Não é reversível.",
-    "delete-team-confirm-popup": "Are you sure you want to delete this team? There is no undo.",
-    "delete-org-confirm-popup": "Are you sure you want to delete this organization? There is no undo.",
+    "delete-team-confirm-popup": "Tem a certeza que pretende apagar esta equipa? Não é reversível.",
+    "delete-org-confirm-popup": "Tem a certeza que pretende apagar esta organização? Não é reversível.",
     "accounts-allowUserDelete": "Permitir aos utilizadores apagar as suas próprias contas",
     "hide-minicard-label-text": "Ocultar texto da etiqueta dos mini-cartões",
     "show-desktop-drag-handles": "Mostrar alças de arrasto do desktop",
@@ -1042,7 +1045,7 @@
     "rulesReportTitle": "Relatório de Regras",
     "copy-swimlane": "Copiar Pista",
     "copySwimlanePopup-title": "Copiar Pista",
-    "display-card-creator": "Display Card Creator",
+    "display-card-creator": "Mostrar Criador de Cartões",
     "wait-spinner": "Wait Spinner",
     "Bounce": "Bounce Wait Spinner",
     "Cube": "Cube Wait Spinner",
@@ -1052,6 +1055,8 @@
     "Rotateplane": "Rotateplane Wait Spinner",
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
-    "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "maximize-card": "Maximizar Cartão",
+    "minimize-card": "Minimizar Cartão",
+    "delete-org-warning-message": "Não pode apagar esta organização, tem no mínimo um utilizador associado",
+    "delete-team-warning-message": "Não pode apagar esta equipa, tem no mínimo um utilizador associado"
 }

i18n/ro.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Atribuie unui membru",
     "attached": "s-a atașat",
     "attachment": "Ataşament",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ru.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "отредактировал дату завершения на %s с %s",
     "add-attachment": "Добавить вложение",
     "add-board": "Добавить доску",
+    "add-template": "Добавить шаблон",
     "add-card": "Добавить карточку",
     "add-card-to-top-of-list": "Добавить карточку в начало списка",
     "add-card-to-bottom-of-list": "Добавить карточку в конец списка",
@@ -119,6 +120,8 @@
     "archives": "Архив",
     "template": "Шаблон",
     "templates": "Шаблоны",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Назначить участника",
     "attached": "прикреплено",
     "attachment": "Вложение",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Увеличивающийся-уменьшающийся спиннер",
     "Wave": "Волновой спиннер",
     "maximize-card": "Максимизировать карточку",
-    "minimize-card": "Минимизировать карточку"
+    "minimize-card": "Минимизировать карточку",
+    "delete-org-warning-message": "Невозможно удалить эту организацию, она включает в себя как минимум одного пользователя",
+    "delete-team-warning-message": "Невозможно удалить эту команду, она включает в себя как минимум одного пользователя"
 }

i18n/sk.i18n.json

@@ -1,7 +1,7 @@
 {
     "accept": "Prijať",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-activity-notify": "Oznámenie",
+    "act-addAttachment": "pridal prílohu __attachment__ karte __card__ v stĺpci __list__ vo swimlane __swimlane__ na doske __board__",
     "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -19,7 +19,7 @@
     "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-editComment": "edited comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-deleteComment": "deleted comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
+    "act-createBoard": "vytvorená doska __board__",
     "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
     "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
     "act-createCustomField": "created custom field __customField__ at board __board__",
@@ -27,7 +27,7 @@
     "act-setCustomField": "edited custom field __customField__: __customFieldValue__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-createList": "added list __list__ to board __board__",
     "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedBoard": "Doska __board__ presunutá do Archívu",
     "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
     "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
     "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
@@ -42,24 +42,24 @@
     "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
-    "actions": "Actions",
-    "activities": "Activities",
-    "activity": "Activity",
-    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
-    "activity-attached": "attached %s to %s",
-    "activity-created": "created %s",
-    "activity-customfield-created": "created custom field %s",
+    "actions": "Akcie",
+    "activities": "Aktivity",
+    "activity": "Aktivita",
+    "activity-added": "pridal %s do %s",
+    "activity-archived": "%s presunutá do archívu",
+    "activity-attached": "priložená %s do %s",
+    "activity-created": "vytvorená %s",
+    "activity-customfield-created": "vytvorené vlastné pole %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
-    "activity-joined": "joined %s",
-    "activity-moved": "moved %s from %s to %s",
-    "activity-on": "on %s",
-    "activity-removed": "removed %s from %s",
-    "activity-sent": "sent %s to %s",
-    "activity-unjoined": "unjoined %s",
-    "activity-subtask-added": "added subtask to %s",
+    "activity-joined": "pripojená %s",
+    "activity-moved": "presunuté %s z %s do %s",
+    "activity-on": "na %s",
+    "activity-removed": "odstránené %s z %s",
+    "activity-sent": "odoslané %s do %s",
+    "activity-unjoined": "odpojené %s",
+    "activity-subtask-added": "pridaná podúloha do %s",
     "activity-checked-item": "checked %s in checklist %s of %s",
     "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
@@ -81,28 +81,29 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Pridať prílohu",
     "add-board": "Pridať tabuľu",
-    "add-card": "Add Card",
-    "add-card-to-top-of-list": "Add Card to Top of List",
-    "add-card-to-bottom-of-list": "Add Card to Bottom of List",
-    "add-swimlane": "Add Swimlane",
-    "add-subtask": "Add Subtask",
-    "add-checklist": "Add Checklist",
-    "add-checklist-item": "Add an item to checklist",
-    "add-cover": "Add Cover",
-    "add-label": "Add Label",
-    "add-list": "Add List",
-    "add-members": "Add Members",
-    "added": "Added",
+    "add-template": "Add Template",
+    "add-card": "Pridať kartu",
+    "add-card-to-top-of-list": "Pridať Kartu na vrch listu",
+    "add-card-to-bottom-of-list": "Pridať Kartu na spodok listu",
+    "add-swimlane": "Pridať Swimlane",
+    "add-subtask": "Pridať Podúlohu",
+    "add-checklist": "Pridať Checklist",
+    "add-checklist-item": "Pridať novú položku do Checklistu",
+    "add-cover": "Pridať obal",
+    "add-label": "Pridať značku",
+    "add-list": "Pridať zoznam",
+    "add-members": "Pridať užívateľa",
+    "added": "Predaný",
     "addMemberPopup-title": "Členovia",
     "admin": "Administrátor",
     "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
-    "admin-announcement": "Announcement",
+    "admin-announcement": "Oznámenie",
     "admin-announcement-active": "Active System-Wide Announcement",
     "admin-announcement-title": "Announcement from Administrator",
     "all-boards": "Všetky tabule",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
-    "apply": "Apply",
+    "apply": "Použiť",
     "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
     "archive": "Move to Archive",
     "archive-all": "Move All to Archive",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Príloha",
@@ -155,20 +158,20 @@
     "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 move a card to Archive to remove it from the board and preserve the activity.",
-    "card-due": "Due",
-    "card-due-on": "Due on",
-    "card-spent": "Spent Time",
-    "card-edit-attachments": "Edit attachments",
-    "card-edit-custom-fields": "Edit custom fields",
-    "card-edit-labels": "Edit labels",
-    "card-edit-members": "Edit members",
-    "card-labels-title": "Change the labels for the card.",
-    "card-members-title": "Add or remove members of the board from the card.",
-    "card-start": "Start",
-    "card-start-on": "Starts on",
+    "card-due": "Do",
+    "card-due-on": "Do",
+    "card-spent": "Strávený čas",
+    "card-edit-attachments": "Upraviť prílohy",
+    "card-edit-custom-fields": "Upraviť vlastné polia",
+    "card-edit-labels": "Upraviť značky",
+    "card-edit-members": "Upraviť členov",
+    "card-labels-title": "Zmeniť značky kartám",
+    "card-members-title": "Pridať alebo odstrániť členov z dosky",
+    "card-start": "Štart",
+    "card-start-on": "Začína",
     "cardAttachmentsPopup-title": "Attach From",
     "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardCustomFieldsPopup-title": "Upraviť vlastné polia",
     "cardStartVotingPopup-title": "Start a vote",
     "positiveVoteMembersPopup-title": "Proponents",
     "negativeVoteMembersPopup-title": "Opponents",
@@ -1018,15 +1021,15 @@
     "label-colors": "Label Colors",
     "label-names": "Label Names",
     "archived-at": "archived at",
-    "sort-cards": "Sort Cards",
-    "cardsSortPopup-title": "Sort Cards",
-    "due-date": "Due Date",
-    "server-error": "Server Error",
+    "sort-cards": "Usporiadať karty",
+    "cardsSortPopup-title": "Usporiadať karty",
+    "due-date": "Do dátumu",
+    "server-error": "Chyba serveru",
     "server-error-troubleshooting": "Please submit the error generated by the server.\nFor a snap installation, run: `sudo snap logs wekan.wekan`\nFor a Docker installation, run: `sudo docker logs wekan-app`",
     "title-alphabetically": "Title (Alphabetically)",
     "created-at-newest-first": "Created At (Newest First)",
     "created-at-oldest-first": "Created At (Oldest First)",
-    "links-heading": "Links",
+    "links-heading": "Odkazy",
     "hide-system-messages-of-all-users": "Hide system messages of all users",
     "now-system-messages-of-all-users-are-hidden": "Now system messages of all users are hidden",
     "move-swimlane": "Move Swimlane",
@@ -1052,6 +1055,8 @@
     "Rotateplane": "Rotateplane Wait Spinner",
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
-    "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "maximize-card": "Maximalizovať kartu",
+    "minimize-card": "Minimalizovať kartu",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/sl.i18n.json

@@ -64,7 +64,7 @@
     "activity-unchecked-item": "odkljukal %s na kontrolnem seznamu %s od %s",
     "activity-checklist-added": "dodal kontrolni seznam na %s",
     "activity-checklist-removed": "odstranil kontrolni seznam iz %s",
-    "activity-checklist-completed": "completed checklist %s of %s",
+    "activity-checklist-completed": "dokončan kontrolni seznam %s od %s",
     "activity-checklist-uncompleted": "nedokončal kontrolni seznam %s od %s",
     "activity-checklist-item-added": "dodal postavko kontrolnega seznama na '%s' v %s",
     "activity-checklist-item-removed": "odstranil postavko kontrolnega seznama iz '%s' v %s",
@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Dodaj priponko",
     "add-board": "Dodaj tablo",
+    "add-template": "Add Template",
     "add-card": "Dodaj kartico",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arhiv",
     "template": "Predloga",
     "templates": "Predloge",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Dodeli člana",
     "attached": "pripeto",
     "attachment": "Priponka",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/sr.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Dodaj prilog",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Dodaj karticu",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arhiviraj",
     "template": "Obrazac",
     "templates": "Obrasci",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Dodeli člana",
     "attached": "Prikačeno",
     "attachment": "Prikačeni dokument",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/sv.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "redigerade slutdatum till %s av %s",
     "add-attachment": "Lägg till bilaga",
     "add-board": "Lägg till tavla",
+    "add-template": "Add Template",
     "add-card": "Lägg till kort",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arkiv",
     "template": "Mall",
     "templates": "Mallar",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Tilldela medlem",
     "attached": "bifogad",
     "attachment": "Bilaga",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/sw.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/ta.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "இணைப்பு ",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/th.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "เอกสารที่เก็บไว้",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "กำหนดสมาชิก",
     "attached": "แนบมาด้วย",
     "attachment": "สิ่งที่แนบมา",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/tr.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Ek Ekle",
     "add-board": "Pano Ekle",
+    "add-template": "Add Template",
     "add-card": "Kart Ekle",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Arşivle",
     "template": "Şablon",
     "templates": "Şablonlar",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Üye ata",
     "attached": "dosya(sı) eklendi",
     "attachment": "Ek Dosya",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/uk.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Додати вкладення",
     "add-board": "Додати дошку",
+    "add-template": "Add Template",
     "add-card": "Додати картку",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Архів",
     "template": "Шаблон",
     "templates": "Шаблони",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Призначити користувача",
     "attached": "доданно",
     "attachment": "Додаток",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/vi.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "đã sửa ngày kết thúc thành %s của %s",
     "add-attachment": "Thêm Bản Đính Kèm",
     "add-board": "Thêm Bảng",
+    "add-template": "Add Template",
     "add-card": "Thêm Thẻ",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Lưu Trữ",
     "template": "Mẫu",
     "templates": "Các mẫu",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Chỉ định thành viên",
     "attached": "đã đính kèm",
     "attachment": "Phần đính kèm",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/zh-CN.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "已将结束日期从 %s 修改为 %s",
     "add-attachment": "添加附件",
     "add-board": "添加看板",
+    "add-template": "Add Template",
     "add-card": "添加卡片",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "归档",
     "template": "模板",
     "templates": "模板",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "指派成员",
     "attached": "附加",
     "attachment": "附件",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/zh-HK.i18n.json

@@ -81,6 +81,7 @@
     "activity-endDate": "edited end date to %s of %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
+    "add-template": "Add Template",
     "add-card": "Add Card",
     "add-card-to-top-of-list": "Add Card to Top of List",
     "add-card-to-bottom-of-list": "Add Card to Bottom of List",
@@ -119,6 +120,8 @@
     "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
+    "template-container": "Template Container",
+    "add-template-container": "Add Template Container",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }

i18n/zh-TW.i18n.json

@@ -81,9 +81,10 @@
     "activity-endDate": "已編輯結束日期為 %s %s ",
     "add-attachment": "新增附件",
     "add-board": "新增看板",
+    "add-template": "新增範本",
     "add-card": "新增卡片",
-    "add-card-to-top-of-list": "Add Card to Top of List",
-    "add-card-to-bottom-of-list": "Add Card to Bottom of List",
+    "add-card-to-top-of-list": "新增卡片至清單頂部",
+    "add-card-to-bottom-of-list": "新增卡片至清單底部",
     "add-swimlane": "新增泳道",
     "add-subtask": "新增子任務",
     "add-checklist": "新增待辦清單",
@@ -119,6 +120,8 @@
     "archives": "封存",
     "template": "範本",
     "templates": "範本",
+    "template-container": "範本容器",
+    "add-template-container": "新增範本容器",
     "assign-member": "分配成員",
     "attached": "附加",
     "attachment": "附件",
@@ -133,7 +136,7 @@
     "board-not-found": "看板不存在",
     "board-private-info": "該看板將被設為 <strong>私有</strong>.",
     "board-public-info": "該看板將被設為 <strong>公開</strong>.",
-    "board-drag-drop-reorder-or-click-open": "Drag and drop to reorder board icons. Click board icon to open board.",
+    "board-drag-drop-reorder-or-click-open": "拖放以重新排序看板圖示。點擊看板圖示開啟看板。",
     "boardChangeColorPopup-title": "修改看板背景",
     "boardChangeTitlePopup-title": "重新命名看板",
     "boardChangeVisibilityPopup-title": "更改可見度",
@@ -181,10 +184,10 @@
     "vote-against": "反對",
     "deleteVotePopup-title": "刪除投票？",
     "vote-delete-pop": "永久刪除是無法復原的，你將會失去這張卡片的所有相關操作記錄。",
-    "cardStartPlanningPokerPopup-title": "Start a Planning Poker",
-    "card-edit-planning-poker": "Edit Planning Poker",
-    "editPokerEndDatePopup-title": "Change Planning Poker vote end date",
-    "poker-question": "Planning Poker",
+    "cardStartPlanningPokerPopup-title": "開始規劃撲克",
+    "card-edit-planning-poker": "編輯規劃撲克",
+    "editPokerEndDatePopup-title": "改變規劃撲克投票截止日",
+    "poker-question": "規劃撲克",
     "poker-one": "1",
     "poker-two": "2",
     "poker-three": "3",
@@ -195,13 +198,13 @@
     "poker-forty": "40",
     "poker-oneHundred": "100",
     "poker-unsure": "?",
-    "poker-finish": "Finish",
-    "poker-result-votes": "Votes",
-    "poker-result-who": "Who",
-    "poker-replay": "Replay",
-    "set-estimation": "Set Estimation",
-    "deletePokerPopup-title": "Delete planning poker?",
-    "poker-delete-pop": "Deleting is permanent. You will lose all actions associated with this planning poker.",
+    "poker-finish": "完成",
+    "poker-result-votes": "投票",
+    "poker-result-who": "誰",
+    "poker-replay": "重播",
+    "set-estimation": "設定預估時間",
+    "deletePokerPopup-title": "刪除規劃撲克?",
+    "poker-delete-pop": "刪除是永遠的，你會失去所有與此規劃撲克相關動作關聯",
     "cardDeletePopup-title": "徹底刪除卡片？",
     "cardDetailsActionsPopup-title": "卡片操作",
     "cardLabelsPopup-title": "標籤",
@@ -233,7 +236,7 @@
     "close": "關閉",
     "close-board": "關閉看板",
     "close-board-pop": "您可以透過點擊首頁中的「封存」按鈕來還原看板。",
-    "close-card": "Close Card",
+    "close-card": "關閉卡片",
     "color-black": "黑色",
     "color-blue": "藍色",
     "color-crimson": "深紅",
@@ -358,11 +361,11 @@
     "export-board-excel": "匯出看板至 Excel",
     "user-can-not-export-excel": "使用者無法匯出至 Excel",
     "export-board-html": "匯出看板為HTML格式\n ",
-    "export-card": "Export card",
-    "export-card-pdf": "Export card to PDF",
-    "user-can-not-export-card-to-pdf": "User can not export card to PDF",
+    "export-card": "匯出卡片",
+    "export-card-pdf": "匯出卡片至PDF",
+    "user-can-not-export-card-to-pdf": "使用者不能將卡片匯出至PDF",
     "exportBoardPopup-title": "匯出看板",
-    "exportCardPopup-title": "Export card",
+    "exportCardPopup-title": "匯出卡片",
     "sort": "排序",
     "sort-desc": "點選排序清單",
     "list-sort-by": "清單排序依照:",
@@ -451,8 +454,8 @@
     "set-color-list": "設定顏色",
     "listActionPopup-title": "清單操作",
     "settingsUserPopup-title": "使用者設定",
-    "settingsTeamPopup-title": "Team Settings",
-    "settingsOrgPopup-title": "Organization Settings",
+    "settingsTeamPopup-title": "團隊設定",
+    "settingsOrgPopup-title": "組織設定",
     "swimlaneActionPopup-title": "泳道動作",
     "swimlaneAddPopup-title": "在下面新增泳道",
     "listImportCardPopup-title": "匯入 Trello 卡片",
@@ -668,7 +671,7 @@
     "setListColorPopup-title": "選擇顏色",
     "assigned-by": "分配者",
     "requested-by": "請求者",
-    "card-sorting-by-number": "Card sorting by number",
+    "card-sorting-by-number": "卡片依編號排序",
     "board-delete-notice": "永久刪除是無法復原的，你將會失去這個看板上的所有清單、卡片和動作。",
     "delete-board-confirm-popup": "所有清單、卡片、標籤和活動都會被刪除，將無法恢覆看板內容。不支援撤銷。",
     "boardDeletePopup-title": "刪除看板？",
@@ -850,8 +853,8 @@
     "act-duenow": "__card__ 的當前到期提醒(__timeValue__) 現在到期",
     "act-atUserComment": "你在 [__board__] __list__/__card__ 被提到",
     "delete-user-confirm-popup": "確定要刪除此帳戶嗎？此操作無法還原。",
-    "delete-team-confirm-popup": "Are you sure you want to delete this team? There is no undo.",
-    "delete-org-confirm-popup": "Are you sure you want to delete this organization? There is no undo.",
+    "delete-team-confirm-popup": "確定要刪除此團隊? 此動作不能復原",
+    "delete-org-confirm-popup": "確定刪除此組織? 此動作不能復原",
     "accounts-allowUserDelete": "允許用戶自行刪除其帳戶",
     "hide-minicard-label-text": "隱藏迷你卡片標籤內文",
     "show-desktop-drag-handles": "顯示桌面拖曳工具",
@@ -1029,20 +1032,20 @@
     "links-heading": "Links",
     "hide-system-messages-of-all-users": "Hide system messages of all users",
     "now-system-messages-of-all-users-are-hidden": "Now system messages of all users are hidden",
-    "move-swimlane": "Move Swimlane",
-    "moveSwimlanePopup-title": "Move Swimlane",
-    "custom-field-stringtemplate": "String Template",
-    "custom-field-stringtemplate-format": "Format (use %{value} as placeholder)",
+    "move-swimlane": "移動泳道流程圖",
+    "moveSwimlanePopup-title": "移動泳道流程圖",
+    "custom-field-stringtemplate": "文字範本",
+    "custom-field-stringtemplate-format": "格式 (使用 %{value} 作為佔位符)",
     "custom-field-stringtemplate-separator": "Separator (use &#32; or &nbsp; for a space)",
     "custom-field-stringtemplate-item-placeholder": "Press enter to add more items",
-    "creator": "Creator",
+    "creator": "創建者",
     "filesReportTitle": "Files Report",
     "orphanedFilesReportTitle": "Orphaned Files Report",
-    "reports": "Reports",
+    "reports": "報告",
     "rulesReportTitle": "Rules Report",
-    "copy-swimlane": "Copy Swimlane",
-    "copySwimlanePopup-title": "Copy Swimlane",
-    "display-card-creator": "Display Card Creator",
+    "copy-swimlane": "複製泳道流程圖",
+    "copySwimlanePopup-title": "複製泳道流程圖",
+    "display-card-creator": "顯示卡片創建者",
     "wait-spinner": "Wait Spinner",
     "Bounce": "Bounce Wait Spinner",
     "Cube": "Cube Wait Spinner",
@@ -1053,5 +1056,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximize Card",
-    "minimize-card": "Minimize Card"
+    "minimize-card": "Minimize Card",
+    "delete-org-warning-message": "Can not delete this organization, there is at least one user that belongs to it",
+    "delete-team-warning-message": "Can not delete this team, there is at least one user that belongs to it"
 }