v2.26

- [Fix OAuth2 requestPermissions](https://github.com/wekan/wekan/commit/5e238bfbfea16940ae29647ae347bbdc0d78efb0 ).
This maybe makes [Auth0 login possible](https://github.com/wekan/wekan/issues/1722) with OIDC. Thanks to GitHub user xet7.
2019-02-25 20:03:36 +02:00 · 2019-02-25 19:51:17 +02:00 · 2019-02-25 19:45:41 +02:00 · 2019-02-25 18:13:43 +02:00 · 2019-02-25 18:10:36 +02:00 · 2019-02-23 19:54:37 +02:00
101 changed files with 3473 additions and 1086 deletions
@@ -6,7 +6,7 @@
    "browser": true
  },
  "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
    "sourceType": "module",
    "ecmaFeatures": {
      "experimentalObjectRestSpread": true
@@ -90,3 +90,4 @@ wekan:wekan-ldap
 wekan:accounts-cas
 wekan-scrollbar
 mquandalle:perfect-scrollbar
+mdg:meteor-apm-agent
@@ -84,6 +84,7 @@ localstorage@1.2.0
 logging@1.1.19
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
+mdg:meteor-apm-agent@3.1.2
 mdg:validation-error@0.5.1
 meteor@1.8.2
 meteor-base@1.2.0
@@ -143,8 +144,8 @@ reload@1.1.11
 retry@1.0.9
 routepolicy@1.0.12
 rzymek:fullcalendar@3.8.0
-salleman:accounts-oidc@1.0.9
-salleman:oidc@1.0.9
+salleman:accounts-oidc@1.0.10
+salleman:oidc@1.0.12
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
@@ -1,3 +1,324 @@
+# v2.26 2019-02-25 Wekan release
+
+This release adds the following new features:
+
+- Add setting [EMAIL_NOTIFICATION_TIMEOUT](https://github.com/wekan/wekan/issues/2203).
+  Defaut 30000 ms (30s). Thanks to GitHub users ngru and xet7.
+
+and fixes the following bugs:
+
+- [Fix OAuth2 requestPermissions](https://github.com/wekan/wekan/commit/5e238bfbfea16940ae29647ae347bbdc0d78efb0).
+  This makes [Auth0 login possible](https://github.com/wekan/wekan/issues/1722)
+  with [OIDC](https://github.com/wekan/wekan/wiki/OAuth2#auth0). Needs testing.
+  Thanks to GitHub user xet7.
+
+# v2.25 2019-02-23 Wekan release
+
+This release fixes the following bugs:
+
+- Revert file permission changes from v2.24 LDAP changes that
+  caused snap version to not build.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.24 2019-02-23 Wekan release
+
+This release adds the following new features:
+
+- [Add LDAP email] matching support](https://github.com/wekan/wekan-ldap/pull/39) and
+  [related env variables](https://github.com/wekan/wekan/pull/2198).
+  Thanks to GitHub user stevenpwaters.
+
+and fixes the following bugs:
+
+- [Add missing text .env to wekan/server/authentication.js](https://github.com/wekan/wekan/commit/4e6e78ccd216045e6ad41bcdab4e524f715a7eb5).
+  Thanks to Vanila Chat user .gitignore.
+
+Thanks to above contributors, and translators for their translation.
+
+# v2.23 2019-02-17 Wekan relase
+
+This release fixes the following bugs:
+
+- [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191).
+  Thanks to Akuket.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.22 2019-02-13 Wekan release
+
+This release adds the following new features:
+
+- [Kadira integration](https://github.com/wekan/wekan/issues/2152). Thanks to GavinLilly.
+- Add [configurable](https://github.com/wekan/wekan/issues/1874#issuecomment-462759627)
+  settings [OAUTH2_ID_TOKEN_WHITELIST_FIELDS and
+  OAUTH2_REQUEST_PERMISSIONS](https://github.com/wekan/wekan/commit/b66f471e530d41a3f12e4bfc29548313e9a73c35).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix: Remove overlap of side bar button with card/list menu button on
+   mobile browser](https://github.com/wekan/wekan/issues/2183). Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+    
+# v2.21 2019-02-12 Wekan release
+
+This release adds the following new features:
+
+- [Bump salleman-oidc to 1.0.12](https://github.com/wekan/wekan/commit/352e5c6cb07b1a09ef692af6f6c49c3b1f3e91c1). Thanks to danpatdav.
+- [Added parameters for OIDC claim mapping](https://github.com/wekan/wekan/commit/bdbbb12f967f7e4f605e6c3310290180f6c8c6d1).
+  These mapping parameters take advantage of new code in salleman-oidc 1.0.12 to override the default claim names provided by the userinfo endpoint.
+  Thanks to danpatdav.
+- [Add OIDC claim mapping parameters to docker-compose.yml/Snap/Source](https://github.com/wekan/wekan/commit/59314ab17d65e9579d2f29b32685b7777f2a06a1).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.20 2019-02-11 Wekan release
+
+This release adds the following new features:
+
+- [Add OIDC / OAuth2 optional setting DEBUG=true to salleman-oidc and Dockerfile](https://github.com/wekan/wekan/pull/2181).
+  Thanks to danpatdav.
+- [Add OIDC / OAuth2 optional setting DEBUG=true to docker-compose.yml/Snap/Source](https://github.com/wekan/wekan/commits/8e02170dd1d5a638ba47dcca910e6eecbfd03baf).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.19 2019-02-09 Wekan release
+
+This release removes the following new features:
+
+- [Remove oplog from snap](https://github.com/wekan/wekan/commit/f1bd36a3b87f97927dfe60572646a457e1f7ef66). Need to think how to do it properly.
+
+Thanks to GitHub user xet7 for conrtibutions.
+
+# v2.18 2019-02-08 Wekan release
+
+This release adds the folloging new features:
+
+- [Improve Authentication: Admin Panel / Layout / Set Default Authentication / Password/LDAP](https://github.com/wekan/wekan/pull/2172). Thanks to Akuket.
+- [Add oplog to snap mongodb](https://github.com/wekan/wekan/commit/79ffb7d50202471c7b7f297286f13e66ce30922e). Thanks to xet7.
+
+and fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix swimlanes sorting](https://github.com/wekan/wekan/pull/2174)
+  since "[Properly fix horizontal rendering on Chrome and Firefox](https://github.com/wekan/wekan/commit/7cc185ac)".
+  The rendering of the new design of the swimlanes was correct, but this
+  commit broke the reordering capability. Having the swimlane header at
+  the same level than the lists of cards makes the whole sortable
+  pattern fail.
+  - 2 solutions:
+    - revert to only have 1 div per swimlane. But this introduces [the firefox
+      bug mentioned](https://github.com/wekan/wekan/commit/7cc185ac), so not ideal
+    - force the sortable pattern to do what we want.
+  - To force the sortable pattern, we need:
+    - add in the helper a clone of the list of cards (to not just move the
+      header)
+    - make sure the placeholder never get placed between the header and the
+      list of cards in a swimlane
+    - fix the finding of the next and previous list of cards. 
+    For all of this to be successful, we need to resize the swimlanes to a
+    known value. This can lead to some visual jumps with scrolling when you
+    drag or drop the swimlanea. I tried to remedy that by computing the new
+    scroll value. Still not ideal however, as there are still some jumps when
+    dropping.    
+    Fixes [#2159](https://github.com/wekan/wekan/issues/2159).
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.17 2019-02-04 Wekan release
+
+This release fixes the following bugs:
+
+- [OIDC/OAuth2 BoardView Fix](https://github.com/wekan/wekan/issues/1874).
+
+Thanks to GitHub gil0109 for contributions, and translator for their translations.
+
+# v2.16 2019-02-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Part 2](https://github.com/ChronikEwok/wekan/commit/9a6ac544dd5618e58ce107352124fd9b495e5c30):
+  [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board
+  Link](https://github.com/wekan/wekan/issues/1623) with
+  [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
+
+Thanks to GitHub user ChronikEwok for contributions.
+
+# v2.15 2019-02-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board 
+  Link](https://github.com/wekan/wekan/issues/1623) with
+  [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
+
+Thanks to GitHub user ChronikEwok for contributions.
+
+# v2.14 2019-02-02 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Sandstorm export board from web](https://github.com/wekan/wekan/issues/2157).
+- [Fix Error when logging in to Wekan REST API when using Sandstorm Wekan](https://github.com/wekan/wekan/issues/1279).
+  Sandstorm API works this way: Make API key, and from that key copy API URL and API KEY to below. It saves Wekan board to file.
+  `curl http://Bearer:APIKEY@api-12345.local.sandstorm.io:6080/api/boards/sandstorm/export?authToken=#APIKEY > wekanboard.json`
+  If later API key does not work, you need to remove it and make a new one.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.13 2019-02-01 Wekan release
+
+This release adds the following new features with Apache I-CLA, thanks to bentiss:
+
+- [Use infinite-scrolling on lists](https://github.com/wekan/wekan/pull/2144).
+  This allows to reduce the loading time of a big board.
+  Note that there is an infinite scroll implementation in the mixins,
+  but this doesn't fit well as the cards in the list can have arbitrary
+  height.
+  The idea to rely on the visibility of a spinner is based on
+  http://www.meteorpedia.com/read/Infinite_Scrolling
+- [When writing to minicard, press Shift-Enter on minicard to go to next line
+  below](https://github.com/wekan/wekan/commit/7a35099fb9778d5f3656a57c74af426cfb20fba3),
+  to continue writing on same minicard 2nd line.
+    
+Thanks to GitHub user bentiss for contributions.
+
+# v2.12 2019-01-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Bumped the salleman oidc packages versions to include an upstream bug fix](https://github.com/wekan/wekan/commit/361faa6646556de68ad78dc90d9eb9f78956ce0f).
+
+Thanks to GitHub user danpatdav for contributions.
+
+# v2.11 2019-01-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Bug: Not logged in public board page has calendar](https://github.com/wekan/wekan/issues/2061). Thanks to xet7.
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.10 2019-01-30 Wekan release
+
+This release adds the following new features:
+
+- Translations: Add Macedonian. [Copied Bulgarian to Macedonian](https://github.com/wekan/wekan/commit/6e4a6515e00fe68b8615d850cfb3cb290418e176)
+  so that required changes will be faster to add. Thanks to translators and therampagerado;
+
+and fixes the following bugs:
+
+- Revert [Sandstorm API changes](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535)
+  that were done at [Wekan v2.05](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v205-2019-01-27-wekan-release)
+  to fix #2143. Thanks to pantraining and xet7.
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.09 2019-01-28 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix vertical automatic scrolling when opening a card](https://github.com/wekan/wekan/commit/820d3270935dc89f046144a7bbf2c8277e2484bc).
+
+Thanks to GitHub user bentiss for contributions.
+
+# v2.08 2019-01-28 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- Make the max height of the swimlane not too big](https://github.com/wekan/wekan/commit/ae82f43078546902e199d985a922ebf7041a4917).
+  We take a full screen minus the header height;
+- [Properly fix horizontal rendering on Chrome and Firefox](https://github.com/wekan/wekan/commit/7cc185ac57c77be85178f92b1d01d46e20218948).
+  This reverts [commit 74cf9e2573](https://github.com/wekan/wekan/commit/74cf9e2573) "- Fix Firefox left-rigth scrollbar."
+  This reverts [commit 9dd8216dfb](https://github.com/wekan/wekan/commit/9dd8216dfb)
+  "- Fix cards below swimlane title in Firefox" by making
+  [previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)"
+  And this partially reverts [commit dd88eb4cc](https://github.com/wekan/wekan/commit/dd88eb4cc).
+  The root of the issue was that I was adding a new div and nesting
+  the list of lists in this new list. This resulted in some
+  weird behavior that Firefox could not handled properly
+  Revert to a code colser to v2.02, by just having the
+  swimlane header in a separate line, and keep only one
+  flex element.
+  Fixes #2137
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# v2.07 2019-01-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Firefox left-rigth scrollbar](https://github.com/wekan/wekan/issues/2137).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.06 2019-01-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix cards below swimlane title in Firefox](https://github.com/wekan/wekan/commit/9dd8216dfb80855999998ed76d8a3c06a954a002)
+  by making [previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)
+  Firefox-only.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.05 2019-01-27 Wekan release
+
+This release fixes the following bugs partially:
+
+- Add back scrollbars that [were hidden when trying to fix another
+  bug](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb).
+  This makes scrollbars work in Chromium/Chrome, but adds back bug to Firefox
+  that cards are below of swimlane title - this Firefox bug is fixed in Wekan v2.06.
+- [Try to have some progress on Wekan Sandstorm API](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535).
+  I did not get it fully working yet.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.04 2019-01-26 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Bugfix for swimlanes, simplify setting color, fix rendering on Firefox](https://github.com/wekan/wekan/pull/2132).
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# v2.03 2019-01-25 Wekan NOT RELEASED because of [bug](https://github.com/wekan/wekan/pull/2126#issuecomment-457723923) that was fixed in v2.04 above
+
+This release adds the following new features with Apache I-CLA, thanks to bentiss:
+
+- Change [Swimlane](https://github.com/wekan/wekan/issues/1688)/[List](https://github.com/wekan/wekan/issues/328)/[Card](https://github.com/wekan/wekan/issues/428)
+  color with color picker at webbrowser and [REST API](https://github.com/wekan/wekan/commit/5769d438a05d01bd5f35cd5830b7ad3c03a21ed2);
+- Lists-Color: [Only colorize the bottom border](https://github.com/wekan/wekan/commit/33977b2282d8891bf507c4d9a1502c644afd6352),
+  and make the background clearer to visually separate the header from the list of cards;
+- [Change Swimlane to Horizontal](https://github.com/wekan/wekan/commit/dd88eb4cc191a06f7eb84213b026dfb93546f245);
+- [Change IFTTT wizard color names to color picker](https://github.com/wekan/wekan/commit/4a2576fbc200d397bcf7cede45316d9fb7e520dd);
+- REST API: [Add new card to the end of the list](https://github.com/wekan/wekan/commit/6c3dbc3c6f52a42ddbeeaec9bbfcc82c1c839f7d).
+  If we keep the `0` value, the card might be inserted in the middle of the list, making it hard to find it later on.
+  Always append the card at the end of the list by setting a sort value based on the number of cards in the list.
+
+and fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix set_board_member_permission](https://github.com/wekan/wekan/commit/082aabc7353d1fe75ccef1a7d942331be56f0838);
+- [Fix the sort field when inserting a swimlane or a list](https://github.com/wekan/wekan/commit/b5411841cf6aa33b2c0d29d85cbc795e3faa7f4f).
+  This has the side effect of always inserting the element at the end;
+- [Make sure Swimlanes and Lists have a populated sort field](https://github.com/wekan/wekan/commit/5c6a725712a443b4d03b4f86262033ddfb66bc3d).
+  When moving around the swimlanes or the lists, if one element has a sort
+  with a null value, the computation of the new sort value is aborted,
+  meaning that there are glitches in the UI.    
+  This happens on the first swimlane created with the new board, or when
+  a swimlane or a list gets added through the API;
+- UI: Lists: [Make sure all lists boxes are the same height](https://github.com/wekan/wekan/commit/97d95b4bcbcab86629e368ea41bb9f00450b21f6).
+  When `Show card count` is enabled, the lists with the card counts have
+  two lines of text while the lists without have only one.
+  This results in the box around the list headers are not of the same size
+  and this is visible when setting a color to the list.
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
 # v2.02 2019-01-22 Wekan release

 This release adds the following new features with Apache I-CLA, thanks to bentiss:
@@ -2,6 +2,7 @@ FROM debian:buster-slim
 LABEL maintainer="wekan"

 # Declare Arguments
+ARG DEBUG
 ARG NODE_VERSION
 ARG METEOR_RELEASE
 ARG METEOR_EDGE
@@ -11,6 +12,7 @@ ARG FIBERS_VERSION
 ARG ARCHITECTURE
 ARG SRC_PATH
 ARG WITH_API
+ARG EMAIL_NOTIFICATION_TIMEOUT
 ARG MATOMO_ADDRESS
 ARG MATOMO_SITE_ID
 ARG MATOMO_DO_NOT_TRACK
@@ -25,6 +27,12 @@ ARG OAUTH2_SERVER_URL
 ARG OAUTH2_AUTH_ENDPOINT
 ARG OAUTH2_USERINFO_ENDPOINT
 ARG OAUTH2_TOKEN_ENDPOINT
+ARG OAUTH2_ID_MAP
+ARG OAUTH2_USERNAME_MAP
+ARG OAUTH2_FULLNAME_MAP
+ARG OAUTH2_EMAIL_MAP
+ARG OAUTH2_ID_TOKEN_WHITELIST_FIELDS
+ARG OAUTH2_REQUEST_PERMISSIONS
 ARG LDAP_ENABLE
 ARG LDAP_PORT
 ARG LDAP_HOST
@@ -60,6 +68,10 @@ ARG LDAP_UNIQUE_IDENTIFIER_FIELD
 ARG LDAP_UTF8_NAMES_SLUGIFY
 ARG LDAP_USERNAME_FIELD
 ARG LDAP_FULLNAME_FIELD
+ARG LDAP_EMAIL_FIELD
+ARG LDAP_EMAIL_MATCH_ENABLE
+ARG LDAP_EMAIL_MATCH_REQUIRE
+ARG LDAP_EMAIL_MATCH_VERIFIED
 ARG LDAP_MERGE_EXISTING_USERS
 ARG LDAP_SYNC_USER_DATA
 ARG LDAP_SYNC_USER_DATA_FIELDMAP
@@ -76,6 +88,7 @@ ARG DEFAULT_AUTHENTICATION_METHOD
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
 # ENV BUILD_DEPS="paxctl"
 ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python python3 python3-distutils git ca-certificates gcc-7" \
+    DEBUG=false \
    NODE_VERSION=v8.15.0 \
    METEOR_RELEASE=1.6.0.1 \
    USE_EDGE=false \
@@ -85,6 +98,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    EMAIL_NOTIFICATION_TIMEOUT=30000 \
    MATOMO_ADDRESS="" \
    MATOMO_SITE_ID="" \
    MATOMO_DO_NOT_TRACK=true \
@@ -99,6 +113,12 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    OAUTH2_AUTH_ENDPOINT="" \
    OAUTH2_USERINFO_ENDPOINT="" \
    OAUTH2_TOKEN_ENDPOINT="" \
+    OAUTH2_ID_MAP="" \
+    OAUTH2_USERNAME_MAP="" \
+    OAUTH2_FULLNAME_MAP="" \
+    OAUTH2_EMAIL_MAP="" \
+    OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \
+    OAUTH2_REQUEST_PERMISSIONS=[openid] \
    LDAP_ENABLE=false \
    LDAP_PORT=389 \
    LDAP_HOST="" \
@@ -135,6 +155,10 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_USERNAME_FIELD="" \
    LDAP_FULLNAME_FIELD="" \
    LDAP_MERGE_EXISTING_USERS=false \
+    LDAP_EMAIL_FIELD="" \
+    LDAP_EMAIL_MATCH_ENABLE=false \
+    LDAP_EMAIL_MATCH_REQUIRE=false \
+    LDAP_EMAIL_MATCH_VERIFIED=false \
    LDAP_SYNC_USER_DATA=false \
    LDAP_SYNC_USER_DATA_FIELDMAP="" \
    LDAP_SYNC_GROUP_ROLES="" \
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.02.0"
+appVersion: "v2.26.0"
 files:
  userUploads:
    - README.md
@@ -29,7 +29,8 @@ template(name="boardBody")
        +calendarView

 template(name="calendarView")
-  .calendar-view.swimlane
-    if currentCard
-      +cardDetails(currentCard)
-    +fullcalendar(calendarOptions)
+  if isViewCalendar
+    .calendar-view.swimlane
+      if currentCard
+        +cardDetails(currentCard)
+      +fullcalendar(calendarOptions)
@@ -1,5 +1,6 @@
 const subManager = new SubsManager();
 const { calculateIndex, enableClickOnTouch } = Utils;
+const swimlaneWhileSortingHeight = 150;

 BlazeComponent.extendComponent({
  onCreated() {
@@ -35,6 +36,37 @@ BlazeComponent.extendComponent({
    this._isDragging = false;
    // Used to set the overlay
    this.mouseHasEnterCardDetails = false;
+
+    // fix swimlanes sort field if there are null values
+    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
+    if (nullSortSwimlanes.count() > 0) {
+      const swimlanes = currentBoardData.swimlanes();
+      let count = 0;
+      swimlanes.forEach((s) => {
+        Swimlanes.update(s._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
+
+    // fix lists sort field if there are null values
+    const nullSortLists = currentBoardData.nullSortLists();
+    if (nullSortLists.count() > 0) {
+      const lists = currentBoardData.lists();
+      let count = 0;
+      lists.forEach((l) => {
+        Lists.update(l._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
  },
  onRendered() {
    const boardComponent = this;
@@ -43,21 +75,64 @@ BlazeComponent.extendComponent({
    $swimlanesDom.sortable({
      tolerance: 'pointer',
      appendTo: '.board-canvas',
-      helper: 'clone',
+      helper(evt, item) {
+        const helper = $(`<div class="swimlane"
+                               style="flex-direction: column;
+                                      height: ${swimlaneWhileSortingHeight}px;
+                                      width: $(boardComponent.width)px;
+                                      overflow: hidden;"/>`);
+        helper.append(item.clone());
+        // Also grab the list of lists of cards
+        const list = item.next();
+        helper.append(list.clone());
+        return helper;
+      },
      handle: '.js-swimlane-header',
-      items: '.js-swimlane:not(.placeholder)',
+      items: '.swimlane:not(.placeholder)',
      placeholder: 'swimlane placeholder',
      distance: 7,
      start(evt, ui) {
+        const listDom = ui.placeholder.next('.js-swimlane');
+        const parentOffset = ui.item.parent().offset();
+
        ui.placeholder.height(ui.helper.height());
        EscapeActions.executeUpTo('popup-close');
+        listDom.addClass('moving-swimlane');
        boardComponent.setIsDragging(true);
+
+        ui.placeholder.insertAfter(ui.placeholder.next());
+        boardComponent.origPlaceholderIndex = ui.placeholder.index();
+
+        // resize all swimlanes + headers to be a total of 150 px per row
+        // this could be achieved by setIsDragging(true) but we want immediate
+        // result
+        ui.item.siblings('.js-swimlane').css('height', `${swimlaneWhileSortingHeight - 26}px`);
+
+        // set the new scroll height after the resize and insertion of
+        // the placeholder. We want the element under the cursor to stay
+        // at the same place on the screen
+        ui.item.parent().get(0).scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+      },
+      beforeStop(evt, ui) {
+        const parentOffset = ui.item.parent().offset();
+        const siblings = ui.item.siblings('.js-swimlane');
+        siblings.css('height', '');
+
+        // compute the new scroll height after the resize and removal of
+        // the placeholder
+        const scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+
+        // then reset the original view of the swimlane
+        siblings.removeClass('moving-swimlane');
+
+        // and apply the computed scrollheight
+        ui.item.parent().get(0).scrollTop = scrollTop;
      },
      stop(evt, ui) {
        // To attribute the new index number, we need to get the DOM element
        // of the previous and the following card -- if any.
-        const prevSwimlaneDom = ui.item.prev('.js-swimlane').get(0);
-        const nextSwimlaneDom = ui.item.next('.js-swimlane').get(0);
+        const prevSwimlaneDom = ui.item.prevAll('.js-swimlane').get(0);
+        const nextSwimlaneDom = ui.item.nextAll('.js-swimlane').get(0);
        const sortIndex = calculateIndex(prevSwimlaneDom, nextSwimlaneDom, 1);

        $swimlanesDom.sortable('cancel');
@@ -72,6 +147,30 @@ BlazeComponent.extendComponent({

        boardComponent.setIsDragging(false);
      },
+      sort(evt, ui) {
+        // get the mouse position in the sortable
+        const parentOffset = ui.item.parent().offset();
+        const cursorY = evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
+
+        // compute the intended index of the placeholder (we need to skip the
+        // slots between the headers and the list of cards)
+        const newplaceholderIndex = Math.floor(cursorY / swimlaneWhileSortingHeight);
+        let destPlaceholderIndex = (newplaceholderIndex + 1) * 2;
+
+        // if we are scrolling far away from the bottom of the list
+        if (destPlaceholderIndex >= ui.item.parent().get(0).childElementCount) {
+          destPlaceholderIndex = ui.item.parent().get(0).childElementCount - 1;
+        }
+
+        // update the placeholder position in the DOM tree
+        if (destPlaceholderIndex !== ui.placeholder.index()) {
+          if (destPlaceholderIndex < boardComponent.origPlaceholderIndex) {
+            ui.placeholder.insertBefore(ui.placeholder.siblings().slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1));
+          } else {
+            ui.placeholder.insertAfter(ui.placeholder.siblings().slice(destPlaceholderIndex - 1, destPlaceholderIndex));
+          }
+        }
+      },
    });

    // ugly touch event hotfix
@@ -103,7 +202,7 @@ BlazeComponent.extendComponent({

  isViewCalendar() {
    const currentUser = Meteor.user();
-    if (!currentUser) return true;
+    if (!currentUser) return false;
    return (currentUser.profile.boardView === 'board-view-cal');
  },

@@ -233,4 +332,9 @@ BlazeComponent.extendComponent({
      },
    };
  },
+  isViewCalendar() {
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return (currentUser.profile.boardView === 'board-view-cal');
+  },
 }).register('calendarView');
@@ -234,7 +234,7 @@ template(name="cardDetailsActionsPopup")
      li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
      li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
-      li: a.js-set-card-color {{_ 'setCardColor-title'}}
+      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
    hr
    ul.pop-over-list
      li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -337,14 +337,12 @@ template(name="cardMorePopup")
    a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}

 template(name="setCardColorPopup")
-  p.quiet
-    span.clearfix
-  label {{_ "select-color"}}
  form.edit-label
    .palette-colors: each colors
-      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
-        if(isSelected color)
-          i.fa.fa-check
+      unless $eq color 'white'
+        span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+          if(isSelected color)
+            i.fa.fa-check
    button.primary.confirm.js-submit {{_ 'save'}}
    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}

@@ -27,7 +27,6 @@ BlazeComponent.extendComponent({
  onCreated() {
    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
    this.isLoaded = new ReactiveVar(false);
-    this.currentColor = new ReactiveVar(this.data().color);
    const boardBody =  this.parentComponent().parentComponent();
    //in Miniview parent is Board, not BoardBody.
    if (boardBody !== null) {
@@ -79,14 +78,13 @@ BlazeComponent.extendComponent({
    //Scroll top
    const cardViewStartTop = $cardView.offset().top;
    const cardContainerScrollTop = $cardContainer.scrollTop();
+
    let topOffset = false;
-    if(cardViewStartTop < 0){
-      topOffset = 0;
-    } else if(cardViewStartTop - cardContainerScrollTop > 100) {
-      topOffset = cardViewStartTop - cardContainerScrollTop - 100;
+    if(cardViewStartTop !== 100){
+      topOffset = cardViewStartTop - 100;
    }
    if(topOffset !== false) {
-      bodyBoardComponent.scrollTop(topOffset);
+      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
    }

  },
@@ -601,6 +599,9 @@ BlazeComponent.extendComponent({
  },

  isSelected(color) {
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    }
    return this.currentColor.get() === color;
  },

@@ -144,16 +144,20 @@ input[type="submit"].attachment-add-link-submit
 card-details-color(background, color...)
  background: background !important
  if color
-    color: color //overwrite text for better visibility
+    color: color !important //overwrite text for better visibility
+
+.card-details-white
+  card-details-color(unset, #000) //Black text for better visibility
+  border: 1px solid #eee

 .card-details-green
  card-details-color(#3cb500, #ffffff) //White text for better visibility

 .card-details-yellow
-  card-details-color(#fad900)
+  card-details-color(#fad900, #000) //Black text for better visibility

 .card-details-orange
-  card-details-color(#ff9f19)
+  card-details-color(#ff9f19, #000) //Black text for better visibility

 .card-details-red
  card-details-color(#eb4646, #ffffff) //White text for better visibility
@@ -165,7 +169,7 @@ card-details-color(background, color...)
  card-details-color(#0079bf, #ffffff) //White text for better visibility

 .card-details-pink
-  card-details-color(#ff78cb)
+  card-details-color(#ff78cb, #000) //Black text for better visibility

 .card-details-sky
  card-details-color(#00c2e0, #ffffff) //White text for better visibility
@@ -174,19 +178,19 @@ card-details-color(background, color...)
  card-details-color(#4d4d4d, #ffffff) //White text for better visibility

 .card-details-lime
-  card-details-color(#51e898)
+  card-details-color(#51e898, #000) //Black text for better visibility

 .card-details-silver
-  card-details-color(#c0c0c0)
+  card-details-color(#c0c0c0, #000) //Black text for better visibility

 .card-details-peachpuff
-  card-details-color(#ffdab9)
+  card-details-color(#ffdab9, #000) //Black text for better visibility

 .card-details-crimson
  card-details-color(#dc143c, #ffffff) //White text for better visibility

 .card-details-plum
-  card-details-color(#dda0dd)
+  card-details-color(#dda0dd, #000) //Black text for better visibility

 .card-details-darkgreen
  card-details-color(#006400, #ffffff) //White text for better visibility
@@ -198,7 +202,7 @@ card-details-color(background, color...)
  card-details-color(#ff00ff, #ffffff) //White text for better visibility

 .card-details-gold
-  card-details-color(#ffd700)
+  card-details-color(#ffd700, #000) //Black text for better visibility

 .card-details-navy
  card-details-color(#000080, #ffffff) //White text for better visibility
@@ -210,10 +214,10 @@ card-details-color(background, color...)
  card-details-color(#8b4513, #ffffff) //White text for better visibility

 .card-details-paleturquoise
-  card-details-color(#afeeee)
+  card-details-color(#afeeee, #000) //Black text for better visibility

 .card-details-mistyrose
-  card-details-color(#ffe4e1)
+  card-details-color(#ffe4e1, #000) //Black text for better visibility

 .card-details-indigo
  card-details-color(#4b0082, #ffffff) //White text for better visibility
@@ -3,10 +3,6 @@
 // });

 BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentColor = new ReactiveVar(this.data().color);
-  },
-
  template() {
    return 'minicard';
  },
@@ -10,7 +10,6 @@
  // transparent, because that won't work during a list drag.
  background: darken(white, 13%)
  border-left: 1px solid darken(white, 20%)
-  border-bottom: 1px solid #CCC
  padding: 0
  float: left

@@ -44,12 +43,24 @@
      background: white
      margin: -3px 0 8px

-.list-header
+.list-header-card-count
+  height: 35px
+
+.list-header-add
  flex: 0 0 auto
-  margin: 20px 12px 4px
+  padding: 20px 12px 4px
  position: relative
  min-height: 20px

+.list-header
+  flex: 0 0 auto
+  padding: 20px 12px 4px
+  position: relative
+  min-height: 20px
+  background-color: #e4e4e4;
+  border-bottom: 6px solid #e4e4e4;
+
+
  &.ui-sortable-handle
    cursor: grab

@@ -68,16 +79,18 @@
    text-overflow: ellipsis
    word-wrap: break-word

+
  .list-header-watch-icon
    padding-left: 10px
    color: #a6a6a6

+
  .list-header-menu
    position: absolute
-    padding: 7px
+    padding: 27px 19px
    margin-top: 1px
-    top: -@padding
-    right: -@padding
+    top: -7px
+    right: -7px

  .list-header-plus-icon
    color: #a6a6a6
@@ -143,6 +156,9 @@
    float: left

@media screen and (max-width: 800px)
+  .list-header-menu
+    margin-right: 30px
+
  .mini-list
    flex: 0 0 60px
    height: 60px
@@ -198,3 +214,85 @@
 .search-card-results
  max-height: 250px
  overflow: hidden
+
+.sk-spinner-list
+  margin-top: unset !important
+
+list-header-color(background, color...)
+  border-bottom: 6px solid background
+
+.list-header-white
+  list-header-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.list-header-green
+  list-header-color(#3cb500, #ffffff) //White text for better visibility
+
+.list-header-yellow
+  list-header-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.list-header-orange
+  list-header-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.list-header-red
+  list-header-color(#eb4646, #ffffff) //White text for better visibility
+
+.list-header-purple
+  list-header-color(#a632db, #ffffff) //White text for better visibility
+
+.list-header-blue
+  list-header-color(#0079bf, #ffffff) //White text for better visibility
+
+.list-header-pink
+  list-header-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.list-header-sky
+  list-header-color(#00c2e0, #ffffff) //White text for better visibility
+
+.list-header-black
+  list-header-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.list-header-lime
+  list-header-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.list-header-silver
+  list-header-color(unset, #4d4d4d) //Black text for better visibility
+
+.list-header-peachpuff
+  list-header-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.list-header-crimson
+  list-header-color(#dc143c, #ffffff) //White text for better visibility
+
+.list-header-plum
+  list-header-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.list-header-darkgreen
+  list-header-color(#006400, #ffffff) //White text for better visibility
+
+.list-header-slateblue
+  list-header-color(#6a5acd, #ffffff) //White text for better visibility
+
+.list-header-magenta
+  list-header-color(#ff00ff, #ffffff) //White text for better visibility
+
+.list-header-gold
+  list-header-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.list-header-navy
+  list-header-color(#000080, #ffffff) //White text for better visibility
+
+.list-header-gray
+  list-header-color(#808080, #ffffff) //White text for better visibility
+
+.list-header-saddlebrown
+  list-header-color(#8b4513, #ffffff) //White text for better visibility
+
+.list-header-paleturquoise
+  list-header-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.list-header-mistyrose
+  list-header-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.list-header-indigo
+  list-header-color(#4b0082, #ffffff) //White text for better visibility
@@ -4,7 +4,7 @@ template(name="listBody")
      if cards.count
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
-      each (cards (idOrNull ../../_id))
+      each (cardsWithLimit (idOrNull ../../_id))
        a.minicard-wrapper.js-minicard(href=absoluteUrl
          class="{{#if cardIsSelected}}is-selected{{/if}}"
          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
@@ -12,6 +12,16 @@ template(name="listBody")
            .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
              class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
          +minicard(this)
+      if (showSpinner (idOrNull ../../_id))
+        .sk-spinner.sk-spinner-wave.sk-spinner-list(
+          class=currentBoard.colorClass
+          id="showMoreResults")
+          .sk-rect1
+          .sk-rect2
+          .sk-rect3
+          .sk-rect4
+          .sk-rect5
+
      if canSeeAddCard
        +inlinedForm(autoclose=false position="bottom")
          +addCardForm(listId=_id position="bottom")
@@ -1,6 +1,34 @@
 const subManager = new SubsManager();
+const InfiniteScrollIter = 10;

 BlazeComponent.extendComponent({
+  onCreated() {
+    // for infinite scrolling
+    this.cardlimit = new ReactiveVar(InfiniteScrollIter);
+  },
+
+  onRendered() {
+    const domElement = this.find('.js-perfect-scrollbar');
+
+    this.$(domElement).on('scroll', () => this.updateList(domElement));
+    $(window).on(`resize.${this.data().listId}`, () => this.updateList(domElement));
+
+    // we add a Mutation Observer to allow propagations of cardlimit
+    // when the spinner stays in the current view (infinite scrolling)
+    this.mutationObserver = new MutationObserver(() => this.updateList(domElement));
+
+    this.mutationObserver.observe(domElement, {
+      childList: true,
+    });
+
+    this.updateList(domElement);
+  },
+
+  onDestroyed() {
+    $(window).off(`resize.${this.data().listId}`);
+    this.mutationObserver.disconnect();
+  },
+
  mixins() {
    return [Mixins.PerfectScrollbar];
  },
@@ -60,6 +88,13 @@ BlazeComponent.extendComponent({
        type: 'cardType-card',
      });

+      // if the displayed card count is less than the total cards in the list,
+      // we need to increment the displayed card count to prevent the spinner
+      // to appear
+      const cardCount = this.data().cards(this.idOrNull(swimlaneId)).count();
+      if (this.cardlimit.get() < cardCount) {
+        this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      }

      // In case the filter is active we need to add the newly inserted card in
      // the list of exceptions -- cards that are not filtered. Otherwise the
@@ -119,6 +154,52 @@ BlazeComponent.extendComponent({
    return undefined;
  },

+  cardsWithLimit(swimlaneId) {
+    const limit = this.cardlimit.get();
+    const selector = {
+      listId: this.currentData()._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
+    return Cards.find(Filter.mongoSelector(selector), {
+      sort: ['sort'],
+      limit,
+    });
+  },
+
+  spinnerInView(container) {
+    const parentViewHeight = container.clientHeight;
+    const bottomViewPosition = container.scrollTop + parentViewHeight;
+
+    const spinner = this.find('.sk-spinner-list');
+
+    const threshold = spinner.offsetTop;
+
+    return bottomViewPosition > threshold;
+  },
+
+  showSpinner(swimlaneId) {
+    const list = Template.currentData();
+    return list.cards(swimlaneId).count() > this.cardlimit.get();
+  },
+
+  updateList(container) {
+    // first, if the spinner is not rendered, we have reached the end of
+    // the list of cards, so skip and disable firing the events
+    const target = this.find('.sk-spinner-list');
+    if (!target) {
+      this.$(container).off('scroll');
+      $(window).off(`resize.${this.data().listId}`);
+      return;
+    }
+
+    if (this.spinnerInView(container)) {
+      this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      Ps.update(container);
+    }
+  },
+
  canSeeAddCard() {
    return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
@@ -179,7 +260,7 @@ BlazeComponent.extendComponent({

  pressKey(evt) {
    // Pressing Enter should submit the card
-    if (evt.keyCode === 13) {
+    if (evt.keyCode === 13 && !evt.shiftKey) {
      evt.preventDefault();
      const $form = $(evt.currentTarget).closest('form');
      // XXX For some reason $form.submit() does not work (it's probably a bug
@@ -1,5 +1,7 @@
 template(name="listHeader")
-  .list-header.js-list-header
+  .list-header.js-list-header(
+    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
+    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
    +inlinedForm
      +editListTitleForm
    else
@@ -49,6 +51,9 @@ template(name="listActionPopup")
    li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
  unless currentUser.isCommentOnly
    hr
+    ul.pop-over-list
+      li: a.js-set-color-list {{_ 'set-color-list'}}
+    hr
    ul.pop-over-list
      if cards.count
        li: a.js-select-cards {{_ 'list-select-cards'}}
@@ -111,3 +116,13 @@ template(name="wipLimitErrorPopup")
    p {{_ 'wipLimitErrorPopup-dialog-pt1'}}
    p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
    button.full.js-back-view(type="submit") {{_ 'cancel'}}
+
+template(name="setListColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      // note: we use the swimlane palette to have more than just the border
+      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
@@ -1,3 +1,8 @@
+let listsColors;
+Meteor.startup(() => {
+  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  canSeeAddCard() {
    const list = Template.currentData();
@@ -72,6 +77,7 @@ Template.listActionPopup.helpers({

 Template.listActionPopup.events({
  'click .js-list-subscribe' () {},
+  'click .js-set-color-list': Popup.open('setListColor'),
  'click .js-select-cards' () {
    const cardIds = this.allCards().map((card) => card._id);
    MultiSelection.add(cardIds);
@@ -154,3 +160,34 @@ Template.listMorePopup.events({
    Utils.goBoardId(this.boardId);
  }),
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentList = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentList.color);
+  },
+
+  colors() {
+    return listsColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentList.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentList.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setListColorPopup');
@@ -23,10 +23,8 @@ template(name="userFormsLayout")
        br
    section.auth-dialog
      +Template.dynamic(template=content)
-      +connectionMethod
-      if isCas
-        .at-form
-          button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
+      if currentSetting.displayAuthenticationMethod
+        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
      div.at-form-lang
        select.select-lang.js-userform-set-language
          each languages
@@ -20,13 +20,19 @@ const validator = {
  },
 };

-Template.userFormsLayout.onCreated(() => {
-  Meteor.subscribe('setting');
+Template.userFormsLayout.onCreated(function() {
+  const instance = this;
+  instance.currentSetting = new ReactiveVar();

+  Meteor.subscribe('setting', {
+    onReady() {
+      instance.currentSetting.set(Settings.findOne());
+      return this.stop();
+    },
+  });
 });

 Template.userFormsLayout.onRendered(() => {
-
  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);

  const i18nTag = navigator.language;
@@ -37,12 +43,10 @@ Template.userFormsLayout.onRendered(() => {
 });

 Template.userFormsLayout.helpers({
-
  currentSetting() {
-    return Settings.findOne();
+    return Template.instance().currentSetting.get();
  },

-
  afterBodyStart() {
    return currentSetting.customHTMLafterBodyStart;
  },
@@ -75,17 +79,6 @@ Template.userFormsLayout.helpers({
    const curLang = T9n.getLanguage() || 'en';
    return t9nTag === curLang;
  },
-/*
-  isCas() {
-    return Meteor.settings.public &&
-      Meteor.settings.public.cas &&
-      Meteor.settings.public.cas.loginUrl;
-  },
-
-  casSignInLabel() {
-    return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
-  },
-*/
 });

 Template.userFormsLayout.events({
@@ -94,49 +87,9 @@ Template.userFormsLayout.events({
    T9n.setLanguage(i18nTagToT9n(i18nTag));
    evt.preventDefault();
  },
-  'click button#cas'() {
-    Meteor.loginWithCas(function() {
-      if (FlowRouter.getRouteName() === 'atSignIn') {
-        FlowRouter.go('/');
-      }
-    });
-  },
-  'click #at-btn'(event) {
-    /* All authentication method can be managed/called here.
-       !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !!
-    */
-    const authenticationMethodSelected = $('.select-authentication').val();
-    // Local account
-    if (authenticationMethodSelected === 'password') {
-      return;
-    }
-
-    // Stop submit #at-pwd-form
-    event.preventDefault();
-    event.stopImmediatePropagation();
-
-    const email = $('#at-field-username_and_email').val();
-    const password = $('#at-field-password').val();
-
-    // Ldap account
-    if (authenticationMethodSelected === 'ldap') {
-      // Check if the user can use the ldap connection
-      Meteor.subscribe('user-authenticationMethod', email, {
-        onReady() {
-          const user = Users.findOne();
-          if (user === undefined || user.authenticationMethod === 'ldap') {
-            // Use the ldap connection package
-            Meteor.loginWithLDAP(email, password, function(error) {
-              if (!error) {
-                // Connection
-                return FlowRouter.go('/');
-              }
-              return error;
-            });
-          }
-          return this.stop();
-        },
-      });
+  'click #at-btn'(event, instance) {
+    if (FlowRouter.getRouteName() === 'atSignIn') {
+      authentication(event, instance);
    }
  },
 });
@@ -146,3 +99,62 @@ Template.defaultLayout.events({
    Modal.close();
  },
 });
+
+async function authentication(event, instance) {
+  const match = $('#at-field-username_and_email').val();
+  const password = $('#at-field-password').val();
+
+  if (!match || !password) return;
+
+  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
+
+  if (result === 'password') return;
+
+  // Stop submit #at-pwd-form
+  event.preventDefault();
+  event.stopImmediatePropagation();
+
+  switch (result) {
+  case 'ldap':
+    Meteor.loginWithLDAP(match, password, function() {
+      FlowRouter.go('/');
+    });
+    break;
+
+  case 'cas':
+    Meteor.loginWithCas(function() {
+      FlowRouter.go('/');
+    });
+    break;
+
+  default:
+    break;
+  }
+}
+
+function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
+  if (displayAuthenticationMethod) {
+    return $('.select-authentication').val();
+  }
+  return getUserAuthenticationMethod(defaultAuthenticationMethod, match);
+}
+
+function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
+  return new Promise((resolve) => {
+    try {
+      Meteor.subscribe('user-authenticationMethod', match, {
+        onReady() {
+          const user = Users.findOne();
+
+          const authenticationMethod = user
+            ? user.authenticationMethod
+            : defaultAuthenticationMethod;
+
+          resolve(authenticationMethod);
+        },
+      });
+    } catch(error) {
+      resolve(defaultAuthenticationMethod);
+    }
+  });
+}
@@ -39,32 +39,17 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-text
        | {{{_'r-set-color'}}}
-      div.trigger-dropdown
-        select(id="color-action")
-          option(value="white")         {{{_'color-white'}}}
-          option(value="green")         {{{_'color-green'}}}
-          option(value="yellow")        {{{_'color-yellow'}}}
-          option(value="orange")        {{{_'color-orange'}}}
-          option(value="red")           {{{_'color-red'}}}
-          option(value="purple")        {{{_'color-purple'}}}
-          option(value="blue")          {{{_'color-blue'}}}
-          option(value="sky")           {{{_'color-sky'}}}
-          option(value="lime")          {{{_'color-lime'}}}
-          option(value="pink")          {{{_'color-pink'}}}
-          option(value="black")         {{{_'color-black'}}}
-          option(value="silver")        {{{_'color-silver'}}}
-          option(value="peachpuff")     {{{_'color-peachpuff'}}}
-          option(value="crimson")       {{{_'color-crimson'}}}
-          option(value="plum")          {{{_'color-plum'}}}
-          option(value="darkgreen")     {{{_'color-darkgreen'}}}
-          option(value="slateblue")     {{{_'color-slateblue'}}}
-          option(value="magenta")       {{{_'color-magenta'}}}
-          option(value="gold")          {{{_'color-gold'}}}
-          option(value="navy")          {{{_'color-navy'}}}
-          option(value="gray")          {{{_'color-gray'}}}
-          option(value="saddlebrown")   {{{_'color-saddlebrown'}}}
-          option(value="paleturquoise") {{{_'color-paleturquoise'}}}
-          option(value="mistyrose")     {{{_'color-mistyrose'}}}
-          option(value="indigo")        {{{_'color-indigo'}}}
+        button.trigger-button.trigger-button-color.js-show-color-palette(
+          id="color-action"
+          class="card-details-{{cardColorButton}}")
+          | {{{_ cardColorButtonText }}}
    div.trigger-button.js-set-color-action.js-goto-rules
      i.fa.fa-plus
+
+template(name="setCardActionsColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
@@ -1,6 +1,20 @@
+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
+    this.cardColorButtonValue = new ReactiveVar('green');
+  },
+
+  cardColorButton() {
+    return this.cardColorButtonValue.get();
+  },
+
+  cardColorButtonText() {
+    return `color-${ this.cardColorButtonValue.get() }`;
  },

  labels() {
@@ -112,10 +126,18 @@ BlazeComponent.extendComponent({
          boardId,
        });
      },
+      'click .js-show-color-palette'(event){
+        const funct = Popup.open('setCardActionsColor');
+        const colorButton = this.find('#color-action');
+        if (colorButton.value === '') {
+          colorButton.value = 'green';
+        }
+        funct.call(this, event);
+      },
      'click .js-set-color-action' (event) {
        const ruleName = this.data().ruleName.get();
        const trigger = this.data().triggerVar.get();
-        const selectedColor = this.find('#color-action').value;
+        const selectedColor = this.cardColorButtonValue.get();
        const boardId = Session.get('currentBoard');
        const desc = Utils.getTriggerActionDesc(event, this);
        const triggerId = Triggers.insert(trigger);
@@ -136,3 +158,31 @@ BlazeComponent.extendComponent({
  },

 }).register('cardActions');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentAction = this.currentData();
+    this.colorButtonValue = Popup.getOpenerComponent().cardColorButtonValue;
+    this.currentColor = new ReactiveVar(this.colorButtonValue.get());
+  },
+
+  colors() {
+    return cardColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.colorButtonValue.set(this.currentColor.get());
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardActionsColorPopup');
@@ -174,6 +174,15 @@
          top:30px
        .trigger-button.trigger-button-person
          right:-40px
+        .trigger-button.trigger-button-color
+          top: unset
+          position: unset
+          transform: unset
+          font-size: 16px
+          width:auto
+          padding-left: 10px
+          padding-right: 10px
+          height:40px
      .trigger-item.trigger-item-mail
        height:300px
  
@@ -2,5 +2,8 @@ template(name='connectionMethod')
  div.at-form-authentication
    label {{_ 'authentication-method'}}
    select.select-authentication
-        each authentications
-            option(value="{{value}}") {{_ value}}
+      each authentications
+        if isSelected value
+          option(value="{{value}}" selected) {{_ value}}
+        else
+          option(value="{{value}}") {{_ value}}
@@ -31,4 +31,7 @@ Template.connectionMethod.helpers({
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
 });
@@ -141,6 +141,16 @@ template(name='layoutSettings')
        span {{_ 'yes'}}
        input.form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'display-authentication-method'}}
+      .form-group.flex
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'default-authentication-method'}}
+      +selectAuthenticationMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
    li.layout-form
      .title {{_ 'custom-product-name'}}
      .form-group
@@ -153,3 +163,12 @@ template(name='layoutSettings')
      textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd
    li
      button.js-save-layout.primary {{_ 'save'}}
+
+
+template(name='selectAuthenticationMethod')
+  select#defaultAuthenticationMethod
+    each authentications
+      if isSelected value
+        option(value="{{value}}" selected) {{_ value}}
+      else
+        option(value="{{value}}") {{_ value}}
@@ -62,6 +62,9 @@ BlazeComponent.extendComponent({
  toggleHideLogo() {
    $('#hide-logo').toggleClass('is-checked');
  },
+  toggleDisplayAuthenticationMethod() {
+    $('#display-authentication-method').toggleClass('is-checked');
+  },
  switchMenu(event) {
    const target = $(event.target);
    if (!target.hasClass('active')) {
@@ -140,17 +143,20 @@ BlazeComponent.extendComponent({

    const productName = $('#product-name').val().trim();
    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
+    const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
+    const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();

    try {
-
      Settings.update(Settings.findOne()._id, {
        $set: {
          productName,
          hideLogo: hideLogoChange,
          customHTMLafterBodyStart,
          customHTMLbeforeBodyEnd,
+          displayAuthenticationMethod,
+          defaultAuthenticationMethod,
        },
      });
    } catch (e) {
@@ -165,17 +171,14 @@ BlazeComponent.extendComponent({

  sendSMTPTestEmail() {
    Meteor.call('sendSMTPTestEmail', (err, ret) => {
-      if (!err && ret) { /* eslint-disable no-console */
+      if (!err && ret) {
        const message = `${TAPi18n.__(ret.message)}: ${ret.email}`;
-        console.log(message);
        alert(message);
      } else {
        const reason = err.reason || '';
        const message = `${TAPi18n.__(err.error)}\n${reason}`;
-        console.log(message, err);
        alert(message);
      }
-      /* eslint-enable no-console */
    });
  },

@@ -190,6 +193,7 @@ BlazeComponent.extendComponent({
      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
      'click a.js-toggle-hide-logo': this.toggleHideLogo,
      'click button.js-save-layout': this.saveLayout,
+      'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
    }];
  },
 }).register('setting');
@@ -262,3 +266,29 @@ BlazeComponent.extendComponent({
    }];
  },
 }).register('announcementSettings');
+
+
+Template.selectAuthenticationMethod.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        {value: 'password'},
+        // Gets only the authentication methods availables
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+      ]);
+    }
+  });
+});
+
+Template.selectAuthenticationMethod.helpers({
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
+});
@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header
+  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
    +inlinedForm
      +editSwimlaneTitleForm
    else
@@ -8,6 +8,7 @@ template(name="swimlaneHeader")
        = title
      .swimlane-header-menu
        unless currentUser.isCommentOnly
+          a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
          a.fa.fa-navicon.js-open-swimlane-menu

 template(name="editSwimlaneTitleForm")
@@ -19,5 +20,25 @@ template(name="editSwimlaneTitleForm")

 template(name="swimlaneActionPopup")
  unless currentUser.isCommentOnly
+    ul.pop-over-list
+       li: a.js-set-swimlane-color {{_ 'select-color'}}
+    hr
    ul.pop-over-list
      li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+
+template(name="swimlaneAddPopup")
+  unless currentUser.isCommentOnly
+    form
+      input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
+        autocomplete="off" autofocus)
+      .edit-controls.clearfix
+        button.primary.confirm(type="submit") {{_ 'add'}}
+
+template(name="setSwimlaneColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
@@ -1,3 +1,10 @@
+const { calculateIndexData } = Utils;
+
+let swimlaneColors;
+Meteor.startup(() => {
+  swimlaneColors = Swimlanes.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  editTitle(evt) {
    evt.preventDefault();
@@ -11,15 +18,82 @@ BlazeComponent.extendComponent({
  events() {
    return [{
      'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
+      'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
      submit: this.editTitle,
    }];
  },
 }).register('swimlaneHeader');

 Template.swimlaneActionPopup.events({
+  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
  'click .js-close-swimlane' (evt) {
    evt.preventDefault();
    this.archive();
    Popup.close();
  },
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  },
+
+  events() {
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
+        const titleInput = this.find('.swimlane-name-input');
+        const title = titleInput.value.trim();
+        const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
+
+        if (title) {
+          Swimlanes.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: sortValue.base,
+          });
+
+          titleInput.value = '';
+          titleInput.focus();
+        }
+        // XXX ideally, we should move the popup to the newly
+        // created swimlane so a user can add more than one swimlane
+        // with a minimum of interactions
+        Popup.close();
+      },
+    }];
+  },
+}).register('swimlaneAddPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentSwimlane.color);
+  },
+
+  colors() {
+    return swimlaneColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentSwimlane.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentSwimlane.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setSwimlaneColorPopup');
@@ -1,6 +1,7 @@
 template(name="swimlane")
-  .swimlane.js-lists.js-swimlane
+  .swimlane
    +swimlaneHeader
+  .swimlane.js-lists.js-swimlane
    if isMiniScreen
      if currentList
        +list(currentList)
@@ -15,7 +16,7 @@ template(name="swimlane")
        if currentCardIsInThisList _id ../_id
          +cardDetails(currentCard)
      if currentUser.isBoardMember
-        +addListAndSwimlaneForm
+        +addListForm

 template(name="listsGroup")
  .swimlane.list-group.js-lists
@@ -35,34 +36,9 @@ template(name="listsGroup")
      if currentUser.isBoardMember
        +addListForm

-template(name="addListAndSwimlaneForm")
-  .list.list-composer.js-list-composer
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-list'}}
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-swimlane'}}
-
 template(name="addListForm")
  .list.list-composer.js-list-composer
-    .list-header
+    .list-header-add
      +inlinedForm(autoclose=false)
        input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
          autocomplete="off" autofocus)
@@ -3,14 +3,18 @@ const { calculateIndex, enableClickOnTouch } = Utils;
 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Cards.findOne(Session.get('currentCard'));
  const currentUser = Meteor.user();
-  if (currentUser.profile.boardView === 'board-view-lists')
-    return currentCard && currentCard.listId === listId;
-  else if (currentUser.profile.boardView === 'board-view-swimlanes')
+  if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes')
    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-  else if (currentUser.profile.boardView === 'board-view-cal')
-    return currentCard;
-  else
-    return false;
+  else // Default view: board-view-lists
+    return currentCard && currentCard.listId === listId;
+  // https://github.com/wekan/wekan/issues/1623
+  // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
+  // TODO: In public board, if you would like to switch between List/Swimlane view, you could
+  //       1) If there is no view cookie, save to cookie board-view-lists
+  //          board-view-lists / board-view-swimlanes / board-view-cal
+  //       2) If public user changes clicks board-view-lists then change view and
+  //          then change view and save cookie with view value
+  //          without using currentuser above, because currentuser is null.
 }

 function initSortable(boardComponent, $listsDom) {
@@ -175,48 +179,6 @@ BlazeComponent.extendComponent({
  },
 }).register('addListForm');

-BlazeComponent.extendComponent({
-  // Proxy
-  open() {
-    this.childComponents('inlinedForm')[0].open();
-  },
-
-  events() {
-    return [{
-      submit(evt) {
-        evt.preventDefault();
-        let titleInput = this.find('.list-name-input');
-        if (titleInput) {
-          const title = titleInput.value.trim();
-          if (title) {
-            Lists.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.list').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        } else {
-          titleInput = this.find('.swimlane-name-input');
-          const title = titleInput.value.trim();
-          if (title) {
-            Swimlanes.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.swimlane').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        }
-      },
-    }];
-  },
-}).register('addListAndSwimlaneForm');
-
 Template.swimlane.helpers({
  canSeeAddList() {
    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
@@ -7,7 +7,7 @@
  display: flex
  flex-direction: row
  overflow: 0;
-  max-height: 100%
+  max-height: calc(100% - 26px)

  &.placeholder
    background-color: rgba(0, 0, 0, .2)
@@ -27,20 +27,15 @@
  .swimlane-header-wrap
    display: flex;
    flex-direction: row;
-    flex: 0 0 50px;
-    padding-bottom: 30px;
-    border-bottom: 1px solid #CCC
+    flex: 1 0 100%;
+    background-color: #ccc;

    .swimlane-header
-      -ms-writing-mode: tb-rl;
-      writing-mode: vertical-rl;
-      transform: rotate(180deg);
      font-size: 14px;
-      line-height: 50px;
-      margin-top: 50px;
+      padding: 5px 5px
      font-weight: bold;
      min-height: 9px;
-      width: 50px;
+      width: 100%;
      overflow: hidden;
      -o-text-overflow: ellipsis;
      text-overflow: ellipsis;
@@ -49,7 +44,95 @@

    .swimlane-header-menu
      position: absolute
-      padding: 20px 20px
+      padding: 5px 5px
+
+    .swimlane-header-plus-icon
+      margin-left: 5px
+      margin-right: 10px

 .list-group
  height: 100%
+
+.moving-swimlane
+  display: none
+
+swimlane-color(background, color...)
+  background: background !important
+  if color
+    color: color !important //overwrite text for better visibility
+
+.swimlane-white
+  swimlane-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.swimlane-green
+  swimlane-color(#3cb500, #ffffff) //White text for better visibility
+
+.swimlane-yellow
+  swimlane-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.swimlane-orange
+  swimlane-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.swimlane-red
+  swimlane-color(#eb4646, #ffffff) //White text for better visibility
+
+.swimlane-purple
+  swimlane-color(#a632db, #ffffff) //White text for better visibility
+
+.swimlane-blue
+  swimlane-color(#0079bf, #ffffff) //White text for better visibility
+
+.swimlane-pink
+  swimlane-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.swimlane-sky
+  swimlane-color(#00c2e0, #ffffff) //White text for better visibility
+
+.swimlane-black
+  swimlane-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.swimlane-lime
+  swimlane-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.swimlane-silver
+  swimlane-color(unset, #4d4d4d) //Black text for better visibility
+
+.swimlane-peachpuff
+  swimlane-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.swimlane-crimson
+  swimlane-color(#dc143c, #ffffff) //White text for better visibility
+
+.swimlane-plum
+  swimlane-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.swimlane-darkgreen
+  swimlane-color(#006400, #ffffff) //White text for better visibility
+
+.swimlane-slateblue
+  swimlane-color(#6a5acd, #ffffff) //White text for better visibility
+
+.swimlane-magenta
+  swimlane-color(#ff00ff, #ffffff) //White text for better visibility
+
+.swimlane-gold
+  swimlane-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.swimlane-navy
+  swimlane-color(#000080, #ffffff) //White text for better visibility
+
+.swimlane-gray
+  swimlane-color(#808080, #ffffff) //White text for better visibility
+
+.swimlane-saddlebrown
+  swimlane-color(#8b4513, #ffffff) //White text for better visibility
+
+.swimlane-paleturquoise
+  swimlane-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.swimlane-mistyrose
+  swimlane-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.swimlane-indigo
+  swimlane-color(#4b0082, #ffffff) //White text for better visibility
@@ -191,9 +191,12 @@ services:
      # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
      #---------------------------------------------------------------
      # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
-      # https://github.com/smeijer/kadira
+      # https://github.com/edemaine/kadira-compose
+      # https://github.com/meteor/meteor-apm-agent
      # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
-      # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
+      #- APM_APP_ID=
+      #- APM_APP_SECRET=
      #---------------------------------------------------------------
      # ==== OPTIONAL: LOGS AND STATS ====
      # https://github.com/wekan/wekan/wiki/Logs
@@ -217,25 +220,25 @@ services:
      # https://github.com/wekan/wekan-gogs
      # If you disable Wekan API with false, Export Board does not work.
      - WITH_API=true
+      #---------------------------------------------------------------
+      # ==== EMAIL NOTIFICATION TIMEOUT, ms =====
+      # Defaut: 30000 ms = 30s
+      #- EMAIL_NOTIFICATION_TIMEOUT=30000
      #-----------------------------------------------------------------
      # ==== CORS =====
-      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      # CORS: Set Access-Control-Allow-Origin header.
      #- CORS=*
      #-----------------------------------------------------------------
      # ==== MATOMO INTEGRATION ====
      # Optional: Integration with Matomo https://matomo.org that is installed to your server
      # The address of the server where Matomo is hosted.
-      # example: - MATOMO_ADDRESS=https://example.com/matomo
-      #- MATOMO_ADDRESS=
+      #- MATOMO_ADDRESS=https://example.com/matomo
      # The value of the site ID given in Matomo server for Wekan
-      # example: - MATOMO_SITE_ID=12345
-      #- MATOMO_SITE_ID=
+      #- MATOMO_SITE_ID=1
      # The option do not track which enables users to not be tracked by matomo
-      # example:  - MATOMO_DO_NOT_TRACK=false
-      #- MATOMO_DO_NOT_TRACK=
+      #- MATOMO_DO_NOT_TRACK=true
      # The option that allows matomo to retrieve the username:
-      # example: MATOMO_WITH_USERNAME=true
-      #- MATOMO_WITH_USERNAME=false
+      #- MATOMO_WITH_USERNAME=true
      #-----------------------------------------------------------------
      # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
@@ -243,38 +246,79 @@ services:
      # and allows all iframing etc. See wekan/server/policy.js
      - BROWSER_POLICY_ENABLED=true
      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
-      #- TRUSTED_URL=
+      #- TRUSTED_URL=https://intra.example.com
      #-----------------------------------------------------------------
      # ==== OUTGOING WEBHOOKS ====
      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
-      # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
-      #- WEBHOOKS_ATTRIBUTES=
+      #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
      #-----------------------------------------------------------------
-      # ==== OAUTH2 ONLY WITH OIDC AND DOORKEEPER AS INDENTITY PROVIDER
+      # ==== Debug OIDC OAuth2 etc ====
+      #- DEBUG=true
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 AZURE ====
+      # https://github.com/wekan/wekan/wiki/Azure
+      # 1) Register the application with Azure. Make sure you capture
+      #    the application ID as well as generate a secret key.
+      # 2) Configure the environment variables. This differs slightly
+      #     by installation type, but make sure you have the following:
+      #- OAUTH2_ENABLED=true
+      # Application GUID captured during app registration:
+      #- OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+      # Secret key generated during app registration:
+      #- OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+      #- OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+      #- OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+      #- OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+      # The claim name you want to map to the unique ID field:
+      #- OAUTH2_ID_MAP=email
+      # The claim name you want to map to the username field:
+      #- OAUTH2_USERNAME_MAP=email
+      # The claim name you want to map to the full name field:
+      #- OAUTH2_FULLNAME_MAP=name
+      # Tthe claim name you want to map to the email field:
+      #- OAUTH2_EMAIL_MAP=email
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 KEYCLOAK ====
+      # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+      #- OAUTH2_ENABLED=true
+      #- OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+      #- OAUTH2_SERVER_URL=<Keycloak server name>/auth
+      #- OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+      #- OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+      #- OAUTH2_SECRET=<keycloak client secret>
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 DOORKEEPER ====
      # https://github.com/wekan/wekan/issues/1874
      # https://github.com/wekan/wekan/wiki/OAuth2
      # Enable the OAuth2 connection
-      # example: OAUTH2_ENABLED=true
-      #- OAUTH2_ENABLED=false
+      #- OAUTH2_ENABLED=true
      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-      # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
-      # example: OAUTH2_CLIENT_ID=abcde12345
-      #- OAUTH2_CLIENT_ID=
-      # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
-      # example: OAUTH2_SECRET=54321abcde
-      #- OAUTH2_SECRET=
-      # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
-      # example: OAUTH2_SERVER_URL=https://chat.example.com
-      #- OAUTH2_SERVER_URL=
-      # OAuth2 Authorization Endpoint. Example: /oauth/authorize
-      # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
-      #- OAUTH2_AUTH_ENDPOINT=
-      # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
-      # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
-      #- OAUTH2_USERINFO_ENDPOINT=
-      # OAuth2 Token Endpoint. Example: /oauth/token
-      # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
-      #- OAUTH2_TOKEN_ENDPOINT=
+      # OAuth2 Client ID.
+      #- OAUTH2_CLIENT_ID=abcde12345
+      # OAuth2 Secret.
+      #- OAUTH2_SECRET=54321abcde
+      # OAuth2 Server URL.
+      #- OAUTH2_SERVER_URL=https://chat.example.com
+      # OAuth2 Authorization Endpoint.
+      #- OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      # OAuth2 Userinfo Endpoint.
+      #- OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      # OAuth2 Token Endpoint.
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      # OAuth2 ID Mapping
+      #- OAUTH2_ID_MAP=
+      # OAuth2 Username Mapping
+      #- OAUTH2_USERNAME_MAP=
+      # OAuth2 Fullname Mapping
+      #- OAUTH2_FULLNAME_MAP=
+      # OAuth2 Email Mapping
+      #- OAUTH2_EMAIL_MAP=
+      # OAUTH2 ID Token Whitelist Fields.
+      #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+      # OAUTH2 Request Permissions.
+      #- OAUTH2_REQUEST_PERMISSIONS=[openid email profile]
      #-----------------------------------------------------------------
      # ==== LDAP ====
      # https://github.com/wekan/wekan/wiki/LDAP
@@ -429,6 +473,22 @@ services:
      # LDAP_MERGE_EXISTING_USERS :
      # example : LDAP_MERGE_EXISTING_USERS=true
      #- LDAP_MERGE_EXISTING_USERS=false
+      #
+      # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+      # example: LDAP_EMAIL_MATCH_ENABLE=true
+      #- LDAP_EMAIL_MATCH_ENABLE=false
+      #
+      # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+      # example: LDAP_EMAIL_MATCH_REQUIRE=true
+      #- LDAP_EMAIL_MATCH_REQUIRE=false
+      #
+      # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+      # example: LDAP_EMAIL_MATCH_VERIFIED=true
+      #- LDAP_EMAIL_MATCH_VERIFIED=false
+      #
+      # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+      # example: LDAP_EMAIL_FIELD=mail
+      #- LDAP_EMAIL_FIELD=
      #-----------------------------------------------------------------
      # LDAP_SYNC_USER_DATA :
      # example : LDAP_SYNC_USER_DATA=true
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "نقل بطاقات هذه القائمة",
    "list-select-cards": "تحديد بطاقات هذه القائمة",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "قائمة الإجراءات",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "المزيد",
    "link-list": "رابط إلى هذه القائمة",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -11,10 +11,10 @@
    "act-createCustomField": "създаде собствено поле __customField__",
    "act-createList": "добави __list__ към __board__",
    "act-addBoardMember": "добави __member__ към __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
+    "act-archivedBoard": "__board__ е преместен в Архива",
+    "act-archivedCard": "__card__ е преместена в Архива",
+    "act-archivedList": "__list__ е преместен в Архива",
+    "act-archivedSwimlane": "__swimlane__ е преместен в Архива",
    "act-importBoard": "импортира __board__",
    "act-importCard": "импортира __card__",
    "act-importList": "импортира __list__",
@@ -23,13 +23,13 @@
    "act-removeBoardMember": "премахна __member__ от __board__",
    "act-restoredCard": "възстанови __card__ в __board__",
    "act-unjoinMember": "премахна __member__ от __card__",
-    "act-withBoardTitle": "__board__",
+    "act-withBoardTitle": "__board__    ",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Действия",
    "activities": "Действия",
    "activity": "Дейности",
    "activity-added": "добави %s към %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s е преместена в Архива",
    "activity-attached": "прикачи %s към %s",
    "activity-created": "създаде %s",
    "activity-customfield-created": "създаде собствено поле %s",
@@ -48,14 +48,14 @@
    "activity-checklist-added": "добави списък със задачи към %s",
    "activity-checklist-removed": "премахна списък със задачи от %s",
    "activity-checklist-completed": "завърши списък със задачи %s на %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
    "activity-checklist-item-added": "добави точка към '%s' в/във %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
    "add": "Добави",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "завърши чеклиста %s",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
    "add-attachment": "Добави прикачен файл",
    "add-board": "Добави Табло",
    "add-card": "Добави карта",
@@ -79,18 +79,18 @@
    "and-n-other-card_plural": "И __count__ други карти",
    "apply": "Приложи",
    "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",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "Премести в Архива",
+    "archive-all": "Премести всички в Архива",
+    "archive-board": "Премести Таблото в Архива",
+    "archive-card": "Премести Картата в Архива",
+    "archive-list": "Премести Списъка в Архива",
+    "archive-swimlane": "Премести Коридора в Архива",
+    "archive-selection": "Премести избраното в Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото в Архива?",
    "archived-items": "Архив",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Табла в Архива",
    "restore-board": "Възстанови Таблото",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "Няма Табла в Архива.",
    "archives": "Архив",
    "assign-member": "Възложи на член от екипа",
    "attached": "прикачен",
@@ -118,12 +118,12 @@
    "board-view-lists": "Списъци",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancel",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Тази карта е преместена в Архива.",
+    "board-archived": "Това табло е преместено в Архива.",
    "card-comments-title": "Тази карта има %s коментар.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Можете да преместите картата в Архива, за да я премахнете от Таблото и така да запазите активността в него.",
    "card-due": "Готова за",
    "card-due-on": "Готова за",
    "card-spent": "Изработено време",
@@ -166,7 +166,7 @@
    "clipboard": "Клипборда или с драг & дроп",
    "close": "Затвори",
    "close-board": "Затвори Таблото",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
    "color-black": "черно",
    "color-blue": "синьо",
    "color-crimson": "crimson",
@@ -190,7 +190,7 @@
    "color-silver": "silver",
    "color-sky": "светло синьо",
    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-white": "бяло",
    "color-yellow": "жълто",
    "unset-color": "Unset",
    "comment": "Коментирай",
@@ -331,17 +331,19 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Премести всички карти от този списък в Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
    "list-move-cards": "Премести всички карти в този списък",
    "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Импорт на карта от Trello",
    "listMorePopup-title": "Още",
    "link-list": "Връзка към този списък",
    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
    "lists": "Списъци",
    "swimlanes": "Коридори",
    "log-out": "Изход",
@@ -361,9 +363,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "Моите табла",
    "name": "Име",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "Няма карти в Архива.",
+    "no-archived-lists": "Няма списъци в Архива.",
+    "no-archived-swimlanes": "Няма коридори в Архива.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -443,7 +445,7 @@
    "uploaded-avatar": "Качихте аватар",
    "username": "Потребителско име",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "внимание: тази карта е в списък в Архива",
    "watch": "Наблюдавай",
    "watching": "Наблюдава",
    "watching-info": "You will be notified of any change in this board",
@@ -462,7 +464,7 @@
    "disable-self-registration": "Disable Self-Registration",
    "invite": "Покани",
    "invite-people": "Покани хора",
-    "to-boards": "To board(s)",
+    "to-boards": "в табло/а",
    "email-addresses": "Имейл адреси",
    "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
    "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
@@ -496,7 +498,7 @@
    "OS_Totalmem": "ОС Общо памет",
    "OS_Type": "Тип ОС",
    "OS_Uptime": "OS Ъптайм",
-    "days": "days",
+    "days": "дни",
    "hours": "часа",
    "minutes": "минути",
    "seconds": "секунди",
@@ -517,16 +519,19 @@
    "card-end-on": "Завършена на",
    "editCardReceivedDatePopup-title": "Промени датата на получаване",
    "editCardEndDatePopup-title": "Промени датата на завършване",
-    "setCardColor-title": "Set color",
-    "assigned-by": "Assigned By",
-    "requested-by": "Requested By",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
-    "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
    "default-subtasks-board": "Подзадачи за табло __board__",
    "default": "по подразбиране",
-    "queue": "Queue",
+    "queue": "Опашка",
    "subtask-settings": "Настройки на Подзадачите",
    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
    "show-subtasks-field": "Картата може да има подзадачи",
@@ -541,40 +546,40 @@
    "parent-card": "Карта-източник",
    "source-board": "Source board",
    "no-parent": "Не показвай източника",
-    "activity-added-label": "added label '%s' to %s",
-    "activity-removed-label": "removed label '%s' from %s",
-    "activity-delete-attach": "deleted an attachment from %s",
-    "activity-added-label-card": "added label '%s'",
-    "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен файл от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения файл",
    "r-rule": "Правило",
-    "r-add-trigger": "Add trigger",
-    "r-add-action": "Add action",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
    "r-board-rules": "Правила за таблото",
    "r-add-rule": "Добави правилото",
    "r-view-rule": "Виж правилото",
    "r-delete-rule": "Изтрий правилото",
    "r-new-rule-name": "Заглавие за новото правило",
    "r-no-rules": "Няма правила",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
-    "r-removed-from": "Removed from",
-    "r-the-board": "the board",
-    "r-list": "list",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
    "set-filter": "Set Filter",
    "r-moved-to": "Moved to",
    "r-moved-from": "Moved from",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
-    "r-a-card": "a card",
+    "r-archived": "Преместено в Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
    "r-when-a-label-is": "When a label is",
    "r-when-the-label-is": "When the label is",
    "r-list-name": "list name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
-    "r-name": "name",
+    "r-name": "име",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -584,13 +589,13 @@
    "r-when-the-item": "When the checklist item",
    "r-checked": "Checked",
    "r-unchecked": "Unchecked",
-    "r-move-card-to": "Move card to",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
-    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
-    "r-card": "card",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести в Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
    "r-add": "Добави",
    "r-remove": "Remove",
    "r-label": "label",
@@ -617,8 +622,8 @@
    "r-d-send-email-to": "to",
    "r-d-send-email-subject": "subject",
    "r-d-send-email-message": "message",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
+    "r-d-archive": "Премести картата в Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
    "r-d-add-label": "Add label",
    "r-d-remove-label": "Remove label",
    "r-create-card": "Create new card",
@@ -632,14 +637,14 @@
    "r-d-check-one": "Check item",
    "r-d-uncheck-one": "Uncheck item",
    "r-d-check-of-list": "of checklist",
-    "r-d-add-checklist": "Add checklist",
-    "r-d-remove-checklist": "Remove checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
    "r-by": "by",
-    "r-add-checklist": "Add checklist",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
    "r-board-note": "Note: leave a field empty to match every possible value.",
    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
    "r-when-a-card-is-moved": "When a card is moved to another list",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Muioc’h",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Mou totes les fitxes d'aquesta llista",
    "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Accions de la llista",
    "swimlaneActionPopup-title": "Accions de Carril de Natació",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "importa una fitxa de Trello",
    "listMorePopup-title": "Més",
    "link-list": "Enllaça a aquesta llista",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assignat Per",
    "requested-by": "Demanat Per",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -43,19 +43,19 @@
    "activity-sent": "%s posláno na %s",
    "activity-unjoined": "odpojen %s",
    "activity-subtask-added": "podúkol přidán do %s",
-    "activity-checked-item": "checked %s in checklist %s of %s",
-    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checked-item": "dokončen %s v seznamu %s z %s",
+    "activity-unchecked-item": "nedokončen %s v seznamu %s z %s",
    "activity-checklist-added": "přidán checklist do %s",
    "activity-checklist-removed": "odstraněn checklist z %s",
    "activity-checklist-completed": "dokončen checklist %s z %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-uncompleted": "nedokončen seznam %s z %s",
    "activity-checklist-item-added": "přidána položka checklist do '%s' v %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-item-removed": "odstraněna položka seznamu do '%s' v %s",
    "add": "Přidat",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checked-item-card": "dokončen %s v seznamu %s",
+    "activity-unchecked-item-card": "nedokončen %s v seznamu %s",
    "activity-checklist-completed-card": "dokončen checklist %s",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "activity-checklist-uncompleted-card": "nedokončený seznam %s",
    "add-attachment": "Přidat přílohu",
    "add-board": "Přidat tablo",
    "add-card": "Přidat kartu",
@@ -171,14 +171,14 @@
    "color-blue": "modrá",
    "color-crimson": "crimson",
    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-gold": "zlatá",
+    "color-gray": "šedá",
    "color-green": "zelená",
    "color-indigo": "indigo",
    "color-lime": "světlezelená",
    "color-magenta": "magenta",
    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-navy": "tmavě modrá",
    "color-orange": "oranžová",
    "color-paleturquoise": "paleturquoise",
    "color-peachpuff": "peachpuff",
@@ -187,10 +187,10 @@
    "color-purple": "fialová",
    "color-red": "červená",
    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-silver": "stříbrná",
    "color-sky": "nebeská",
    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-white": "bílá",
    "color-yellow": "žlutá",
    "unset-color": "Unset",
    "comment": "Komentář",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Přesunout všechny karty v tomto sloupci",
    "list-select-cards": "Vybrat všechny karty v tomto sloupci",
+    "set-color-list": "Nastavit barvu",
    "listActionPopup-title": "Vypsat akce",
    "swimlaneActionPopup-title": "Akce swimlane",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importovat Trello kartu",
    "listMorePopup-title": "Více",
    "link-list": "Odkaz na tento sloupec",
@@ -496,7 +498,7 @@
    "OS_Totalmem": "OS Celková paměť",
    "OS_Type": "Typ OS",
    "OS_Uptime": "OS Doba běhu systému",
-    "days": "days",
+    "days": "dní",
    "hours": "hodin",
    "minutes": "minut",
    "seconds": "sekund",
@@ -517,7 +519,10 @@
    "card-end-on": "Končí v",
    "editCardReceivedDatePopup-title": "Změnit datum přijetí",
    "editCardEndDatePopup-title": "Změnit datum konce",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Nastav barvu",
+    "setCardActionsColorPopup-title": "Vyber barvu",
+    "setSwimlaneColorPopup-title": "Vyber barvu",
+    "setListColorPopup-title": "Vyber barvu",
    "assigned-by": "Přidělil(a)",
    "requested-by": "Vyžádal(a)",
    "board-delete-notice": "Smazání je trvalé. Přijdete o všechny sloupce, karty a akce spojené s tímto tablem.",
@@ -585,8 +590,8 @@
    "r-checked": "Zaškrtnuto",
    "r-unchecked": "Odškrtnuto",
    "r-move-card-to": "Přesunout kartu do",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
+    "r-top-of": "Začátek",
+    "r-bottom-of": "Spodek",
    "r-its-list": "toho sloupce",
    "r-archive": "Přesunout do archivu",
    "r-unarchive": "Obnovit z archivu",
@@ -596,7 +601,7 @@
    "r-label": "štítek",
    "r-member": "člen",
    "r-remove-all": "Odstranit všechny členy z této karty",
-    "r-set-color": "Set color to",
+    "r-set-color": "Nastav barvu na",
    "r-checklist": "zaškrtávací seznam",
    "r-check-all": "Zaškrtnout vše",
    "r-uncheck-all": "Odškrtnout vše",
@@ -651,8 +656,10 @@
    "custom-product-name": "Vlastní název produktu",
    "layout": "uspořádání",
    "hide-logo": "Skrýt logo",
-    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
-    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "add-custom-html-after-body-start": "Přidej vlastní HTML za <body>",
+    "add-custom-html-before-body-end": "Přidej vlastní HTML před </body>",
    "error-undefined": "Něco se pokazilo",
-    "error-ldap-login": "Během přihlašování nastala chyba"
+    "error-ldap-login": "Během přihlašování nastala chyba",
+    "display-authentication-method": "Zobraz způsob ověřování",
+    "default-authentication-method": "Zobraz způsob ověřování"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -169,30 +169,30 @@
    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Archiv\" in der Kopfzeile der Startseite anklicken.",
    "color-black": "schwarz",
    "color-blue": "blau",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "Karminrot",
+    "color-darkgreen": "Dunkelgrün",
+    "color-gold": "Gold",
+    "color-gray": "Grau",
    "color-green": "grün",
-    "color-indigo": "indigo",
+    "color-indigo": "Indigo",
    "color-lime": "hellgrün",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "Magentarot",
+    "color-mistyrose": "Altrosa",
+    "color-navy": "Marineblau",
    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "Blasses Türkis",
+    "color-peachpuff": "Pfirsich",
    "color-pink": "pink",
-    "color-plum": "plum",
+    "color-plum": "Pflaume",
    "color-purple": "lila",
    "color-red": "rot",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "Sattelbraun",
+    "color-silver": "Silber",
    "color-sky": "himmelblau",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "Schieferblau",
+    "color-white": "Weiß",
    "color-yellow": "gelb",
-    "unset-color": "Unset",
+    "unset-color": "Nicht festgelegt",
    "comment": "Kommentar",
    "comment-placeholder": "Kommentar schreiben",
    "comment-only": "Nur Kommentare",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archiv\".",
    "list-move-cards": "Alle Karten in dieser Liste verschieben",
    "list-select-cards": "Alle Karten in dieser Liste auswählen",
+    "set-color-list": "Lege Farbe fest",
    "listActionPopup-title": "Listenaktionen",
    "swimlaneActionPopup-title": "Swimlaneaktionen",
+    "swimlaneAddPopup-title": "Swimlane unterhalb einfügen",
    "listImportCardPopup-title": "Eine Trello-Karte importieren",
    "listMorePopup-title": "Mehr",
    "link-list": "Link zu dieser Liste",
@@ -483,7 +485,7 @@
    "error-notAuthorized": "Sie sind nicht berechtigt diese Seite zu sehen.",
    "outgoing-webhooks": "Ausgehende Webhooks",
    "outgoingWebhooksPopup-title": "Ausgehende Webhooks",
-    "boardCardTitlePopup-title": "Kartentitel-Filter",
+    "boardCardTitlePopup-title": "Kartentitelfilter",
    "new-outgoing-webhook": "Neuer ausgehender Webhook",
    "no-name": "(Unbekannt)",
    "Node_version": "Node-Version",
@@ -517,7 +519,10 @@
    "card-end-on": "Endet am",
    "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
    "editCardEndDatePopup-title": "Enddatum ändern",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Farbe festlegen",
+    "setCardActionsColorPopup-title": "Farbe wählen",
+    "setSwimlaneColorPopup-title": "Farbe wählen",
+    "setListColorPopup-title": "Farbe wählen",
    "assigned-by": "Zugewiesen von",
    "requested-by": "Angefordert von",
    "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.",
@@ -596,7 +601,7 @@
    "r-label": "Label",
    "r-member": "Mitglied",
    "r-remove-all": "Entferne alle Mitglieder von der Karte",
-    "r-set-color": "Set color to",
+    "r-set-color": "Farbe festlegen auf",
    "r-checklist": "Checkliste",
    "r-check-all": "Alle markieren",
    "r-uncheck-all": "Alle abwählen",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Füge benutzerdefiniertes HTML nach <body> Anfang hinzu",
    "add-custom-html-before-body-end": "Füge benutzerdefiniertes HTML vor </body>Ende hinzu",
    "error-undefined": "Etwas ist schief gelaufen",
-    "error-ldap-login": "Es ist ein Fehler beim Anmelden aufgetreten"
+    "error-ldap-login": "Es ist ein Fehler beim Anmelden aufgetreten",
+    "display-authentication-method": "Anzeige Authentifizierungsverfahren",
+    "default-authentication-method": "Standardauthentifizierungsverfahren"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Περισσότερα",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -657,5 +662,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Movu ĉiujn kartojn en tiu listo.",
    "list-select-cards": "Elektu ĉiujn kartojn en tiu listo.",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Pli",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Mueve todas las tarjetas en esta lista",
    "list-select-cards": "Selecciona todas las tarjetas en esta lista",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Listar Acciones",
    "swimlaneActionPopup-title": "Acciones de la Calle",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importar una tarjeta Trello",
    "listMorePopup-title": "Mas",
    "link-list": "Enlace a esta lista",
@@ -517,7 +519,10 @@
    "card-end-on": "Termina en",
    "editCardReceivedDatePopup-title": "Cambiar fecha de recepción",
    "editCardEndDatePopup-title": "Cambiar fecha de término",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -192,7 +192,7 @@
    "color-slateblue": "azul",
    "color-white": "blanco",
    "color-yellow": "amarilla",
-    "unset-color": "Unset",
+    "unset-color": "Desmarcar",
    "comment": "Comentar",
    "comment-placeholder": "Escribir comentario",
    "comment-only": "Sólo comentarios",
@@ -306,7 +306,7 @@
    "from-wekan": "Desde exportación previa",
    "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.",
    "import-board-instruction-wekan": "En tu tablero, vete a 'Menú', luego 'Exportar tablero', y copia el texto en el archivo descargado.",
-    "import-board-instruction-about-errors": "Si obtiene errores cuando importe el tablero, a veces la importación funciona igualmente, y el tablero se encuentra en la página de Todos los Tableros.",
+    "import-board-instruction-about-errors": "Aunque obtengas errores cuando importes el tablero, a veces la importación funciona igualmente, y el tablero se encontrará en la página de tableros.",
    "import-json-placeholder": "Pega tus datos JSON válidos aquí",
    "import-map-members": "Mapa de miembros",
    "import-members-map": "Tu tablero importado tiene algunos miembros. Por favor, mapea los miembros que quieres importar con tus usuarios.",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Esto eliminará del tablero todas las tarjetas en esta lista. Para ver las tarjetas en el Archivo y recuperarlas al tablero haga click en \"Menu\" > \"Archivo\"",
    "list-move-cards": "Mover todas las tarjetas de esta lista",
    "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
+    "set-color-list": "Cambiar el color",
    "listActionPopup-title": "Acciones de la lista",
    "swimlaneActionPopup-title": "Acciones del carril de flujo",
+    "swimlaneAddPopup-title": "Añadir un carril de flujo debajo",
    "listImportCardPopup-title": "Importar una tarjeta de Trello",
    "listMorePopup-title": "Más",
    "link-list": "Enlazar a esta lista",
@@ -361,9 +363,9 @@
    "muted-info": "No serás notificado de ningún cambio en este tablero",
    "my-boards": "Mis tableros",
    "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas en el Archivo",
-    "no-archived-lists": "No hay listas en el Archivo",
-    "no-archived-swimlanes": "No hay carriles en el Archivo",
+    "no-archived-cards": "No hay tarjetas archivadas.",
+    "no-archived-lists": "No hay listas archivadas.",
+    "no-archived-swimlanes": "No hay carriles archivados.",
    "no-results": "Sin resultados",
    "normal": "Normal",
    "normal-desc": "Puedes ver y editar tarjetas. No puedes cambiar la configuración.",
@@ -402,9 +404,9 @@
    "rules": "Reglas",
    "search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
    "search-example": "¿Texto a buscar?",
-    "select-color": "Selecciona un color",
+    "select-color": "Seleccionar el color",
    "set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
-    "setWipLimitPopup-title": "Fijar el límite del trabajo en proceso",
+    "setWipLimitPopup-title": "Fija el límite del trabajo en proceso",
    "shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
    "shortcut-autocomplete-emoji": "Autocompletar emoji",
    "shortcut-autocomplete-members": "Autocompletar miembros",
@@ -517,7 +519,10 @@
    "card-end-on": "Finalizado el",
    "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
    "editCardEndDatePopup-title": "Cambiar la fecha de finalización",
-    "setCardColor-title": "Cambiar color",
+    "setCardColorPopup-title": "Cambiar el color",
+    "setCardActionsColorPopup-title": "Elegir un color",
+    "setSwimlaneColorPopup-title": "Elegir un color",
+    "setListColorPopup-title": "Elegir un color",
    "assigned-by": "Asignado por",
    "requested-by": "Solicitado por",
    "board-delete-notice": "Se eliminarán todas las listas, tarjetas y acciones asociadas a este tablero. Esta acción no puede deshacerse.",
@@ -596,7 +601,7 @@
    "r-label": "etiqueta",
    "r-member": "miembro",
    "r-remove-all": "Eliminar todos los miembros de la tarjeta",
-    "r-set-color": "Cambiar color a",
+    "r-set-color": "Cambiar el color a",
    "r-checklist": "lista de verificación",
    "r-check-all": "Marcar todo",
    "r-uncheck-all": "Desmarcar todo",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Añade HTML personalizado después de <body> ",
    "add-custom-html-before-body-end": "Añade HTML personalizado después de </body>",
    "error-undefined": "Algo no está bien",
-    "error-ldap-login": "Ocurrió un error al intentar acceder"
+    "error-ldap-login": "Ocurrió un error al intentar acceder",
+    "display-authentication-method": "Mostrar el método de autenticación",
+    "default-authentication-method": "Método de autenticación por defecto"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Lekuz aldatu zerrendako txartel guztiak",
    "list-select-cards": "Aukeratu zerrenda honetako txartel guztiak",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Zerrendaren ekintzak",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Inportatu Trello txartel bat",
    "listMorePopup-title": "Gehiago",
    "link-list": "Lotura zerrenda honetara",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -169,30 +169,30 @@
    "close-board-pop": "شما می توانید با کلیک کردن بر روی دکمه «بایگانی» از صفحه هدر، صفحه را بازگردانید.",
    "color-black": "مشکی",
    "color-blue": "آبی",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "قرمز",
+    "color-darkgreen": "سبز تیره",
+    "color-gold": "طلایی",
+    "color-gray": "خاکستری",
    "color-green": "سبز",
-    "color-indigo": "indigo",
+    "color-indigo": "نیلی",
    "color-lime": "لیمویی",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "ارغوانی",
+    "color-mistyrose": "صورتی روشن",
+    "color-navy": "لاجوردی",
    "color-orange": "نارنجی",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "فیروزه‌ای کدر",
+    "color-peachpuff": "هلویی",
    "color-pink": "صورتی",
-    "color-plum": "plum",
+    "color-plum": "بنفش کدر",
    "color-purple": "بنفش",
    "color-red": "قرمز",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "کاکائویی",
+    "color-silver": "نقره‌ای",
    "color-sky": "آبی آسمانی",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "آبی فولادی",
+    "color-white": "سفید",
    "color-yellow": "زرد",
-    "unset-color": "Unset",
+    "unset-color": "بازنشانی",
    "comment": "نظر",
    "comment-placeholder": "درج نظر",
    "comment-only": "فقط نظر",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "این کارتباعث حذف تمامی کارت های این لیست از برد می شود . برای مشاهده کارت ها در آرشیو و برگرداندن آنها به برد بر بروی \"Menu\">\"Archive\" کلیک نمایید",
    "list-move-cards": "انتقال تمام کارت های این لیست",
    "list-select-cards": "انتخاب تمام کارت های این لیست",
+    "set-color-list": "انتخاب رنگ",
    "listActionPopup-title": "لیست اقدامات",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "اضافه کردن مسیر شناور",
    "listImportCardPopup-title": "وارد کردن کارت Trello",
    "listMorePopup-title": "بیشتر",
    "link-list": "پیوند به این فهرست",
@@ -483,7 +485,7 @@
    "error-notAuthorized": "شما مجاز به دیدن این صفحه نیستید.",
    "outgoing-webhooks": "Outgoing Webhooks",
    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "boardCardTitlePopup-title": "Card Title Filter",
+    "boardCardTitlePopup-title": "فیلتر موضوع کارت",
    "new-outgoing-webhook": "New Outgoing Webhook",
    "no-name": "(ناشناخته)",
    "Node_version": "نسخه Node ",
@@ -496,7 +498,7 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
+    "days": "روزه‌ها",
    "hours": "ساعت",
    "minutes": "دقیقه",
    "seconds": "ثانیه",
@@ -517,7 +519,10 @@
    "card-end-on": "پایان در",
    "editCardReceivedDatePopup-title": "تغییر تاریخ رسید",
    "editCardEndDatePopup-title": "تغییر تاریخ پایان",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "انتخاب رنگ",
+    "setCardActionsColorPopup-title": "انتخاب کردن رنگ",
+    "setSwimlaneColorPopup-title": "انتخاب کردن رنگ",
+    "setListColorPopup-title": "انتخاب کردن رنگ",
    "assigned-by": "محول شده توسط",
    "requested-by": "تقاضا شده توسط",
    "board-delete-notice": "حذف دائمی است شما تمام لیست ها، کارت ها و اقدامات مرتبط با این برد را از دست خواهید داد.",
@@ -556,14 +561,14 @@
    "r-delete-rule": "حذف قانون",
    "r-new-rule-name": "تیتر قانون جدید",
    "r-no-rules": "بدون قانون",
-    "r-when-a-card": "When a card",
+    "r-when-a-card": "زمانی که کارت",
    "r-is": "هست",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-is-moved": "جابه‌جا شده",
+    "r-added-to": "اضافه شد به",
    "r-removed-from": "حذف از",
    "r-the-board": "برد",
    "r-list": "لیست",
-    "set-filter": "Set Filter",
+    "set-filter": "اضافه کردن فیلتر",
    "r-moved-to": "انتقال به",
    "r-moved-from": "انتقال از",
    "r-archived": "انتقال به آرشیو",
@@ -571,7 +576,7 @@
    "r-a-card": "کارت",
    "r-when-a-label-is": "زمانی که لیبل هست",
    "r-when-the-label-is": "زمانی که لیبل هست",
-    "r-list-name": "list name",
+    "r-list-name": "نام لیست",
    "r-when-a-member": "زمانی که کاربر هست",
    "r-when-the-member": "زمانی که کاربر",
    "r-name": "نام",
@@ -596,7 +601,7 @@
    "r-label": "برچسب",
    "r-member": "عضو",
    "r-remove-all": "حذف همه کاربران از کارت",
-    "r-set-color": "Set color to",
+    "r-set-color": "انتخاب رنگ به",
    "r-checklist": "چک لیست",
    "r-check-all": "انتخاب همه",
    "r-uncheck-all": "لغو انتخاب همه",
@@ -621,9 +626,9 @@
    "r-d-unarchive": "بازگردانی کارت از آرشیو",
    "r-d-add-label": "افزودن برچسب",
    "r-d-remove-label": "حذف برچسب",
-    "r-create-card": "Create new card",
-    "r-in-list": "in list",
-    "r-in-swimlane": "in swimlane",
+    "r-create-card": "ساخت کارت جدید",
+    "r-in-list": "در لیست",
+    "r-in-swimlane": "در مسیرِ شناور",
    "r-d-add-member": "افزودن عضو",
    "r-d-remove-member": "حذف عضو",
    "r-d-remove-all-member": "حذف تمامی کاربران",
@@ -634,14 +639,14 @@
    "r-d-check-of-list": "از چک لیست",
    "r-d-add-checklist": "افزودن چک لیست",
    "r-d-remove-checklist": "حذف چک لیست",
-    "r-by": "by",
+    "r-by": "توسط",
    "r-add-checklist": "افزودن چک لیست",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
-    "r-board-note": "Note: leave a field empty to match every possible value.",
-    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-with-items": "با موارد",
+    "r-items-list": "مورد۱،مورد۲،مورد۳",
+    "r-add-swimlane": "اضافه کردن مسیر شناور",
+    "r-swimlane-name": "نام مسیر شناور",
+    "r-board-note": "نکته: برای نمایش موارد ممکن کادر را خالی بگذارید.",
+    "r-checklist-note": "نکته: چک‌لیست‌ها باید توسط کاما از یک‌دیگر جدا شوند.",
    "r-when-a-card-is-moved": "دمانی که یک کارت به لیست دیگری منتقل شد",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "افزودن کد های HTML بعد از  <body> شروع",
    "add-custom-html-before-body-end": "افزودن کد های HTML قبل از  </body> پایان",
    "error-undefined": "یک اشتباه رخ داده شده است",
-    "error-ldap-login": "هنگام تلاش برای ورود به یک خطا رخ داد"
+    "error-ldap-login": "هنگام تلاش برای ورود به یک خطا رخ داد",
+    "display-authentication-method": "نمایش نوع اعتبارسنجی",
+    "default-authentication-method": "نوع اعتبارسنجی پیشفرض"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi Arkistossa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Arkisto”.",
    "list-move-cards": "Siirrä kaikki kortit tässä listassa",
    "list-select-cards": "Valitse kaikki kortit tässä listassa",
+    "set-color-list": "Aseta väri",
    "listActionPopup-title": "Listaa toimet",
    "swimlaneActionPopup-title": "Swimlane toimet",
+    "swimlaneAddPopup-title": "Lisää Swimlane alle",
    "listImportCardPopup-title": "Tuo Trello kortti",
    "listMorePopup-title": "Lisää",
    "link-list": "Linkki tähän listaan",
@@ -517,7 +519,10 @@
    "card-end-on": "Loppuu",
    "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
    "editCardEndDatePopup-title": "Vaihda loppumispäivää",
-    "setCardColor-title": "Aseta väri",
+    "setCardColorPopup-title": "Aseta väri",
+    "setCardActionsColorPopup-title": "Valitse väri",
+    "setSwimlaneColorPopup-title": "Valitse väri",
+    "setListColorPopup-title": "Valitse väri",
    "assigned-by": "Tehtävänantaja",
    "requested-by": "Pyytäjä",
    "board-delete-notice": "Poistaminen on lopullista. Menetät kaikki listat, kortit ja toimet tällä taululla.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Lisää HTML <body> alun jälkeen",
    "add-custom-html-before-body-end": "Lisä HTML ennen </body> loppua",
    "error-undefined": "Jotain meni pieleen",
-    "error-ldap-login": "Virhe tapahtui yrittäessä kirjautua sisään"
+    "error-ldap-login": "Virhe tapahtui yrittäessä kirjautua sisään",
+    "display-authentication-method": "Näytä kirjautumistapa",
+    "default-authentication-method": "Oletus kirjautumistapa"
 }
@@ -192,7 +192,7 @@
    "color-slateblue": "bleu ardoise",
    "color-white": "blanc",
    "color-yellow": "jaune",
-    "unset-color": "Unset",
+    "unset-color": "Enlever",
    "comment": "Commenter",
    "comment-placeholder": "Écrire un commentaire",
    "comment-only": "Commentaire uniquement",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes archivées et les renvoyer vers le tableau, cliquez sur « Menu » puis « Archives ».",
    "list-move-cards": "Déplacer toutes les cartes de cette liste",
    "list-select-cards": "Sélectionner toutes les cartes de cette liste",
+    "set-color-list": "Définir la couleur",
    "listActionPopup-title": "Actions sur la liste",
    "swimlaneActionPopup-title": "Actions du couloir",
+    "swimlaneAddPopup-title": "Ajouter un couloir en dessous",
    "listImportCardPopup-title": "Importer une carte Trello",
    "listMorePopup-title": "Plus",
    "link-list": "Lien vers cette liste",
@@ -517,7 +519,10 @@
    "card-end-on": "Se termine le",
    "editCardReceivedDatePopup-title": "Modifier la date de réception",
    "editCardEndDatePopup-title": "Modifier la date de fin",
-    "setCardColor-title": "Définir la couleur",
+    "setCardColorPopup-title": "Définir la couleur",
+    "setCardActionsColorPopup-title": "Choisissez une couleur",
+    "setSwimlaneColorPopup-title": "Choisissez une couleur",
+    "setListColorPopup-title": "Choisissez une couleur",
    "assigned-by": "Assigné par",
    "requested-by": "Demandé par",
    "board-delete-notice": "La suppression est définitive. Vous perdrez toutes les listes, cartes et actions associées à ce tableau.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Ajouter le HTML personnalisé après le début du <body>",
    "add-custom-html-before-body-end": "Ajouter le HTML personnalisé avant la fin du </body>",
    "error-undefined": "Une erreur inconnue s'est produite",
-    "error-ldap-login": "Une erreur s'est produite lors de la tentative de connexion"
+    "error-ldap-login": "Une erreur s'est produite lors de la tentative de connexion",
+    "display-authentication-method": "Afficher la méthode d'authentification",
+    "default-authentication-method": "Méthode d'authentification par défaut"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Máis",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -14,7 +14,7 @@
    "act-archivedBoard": "__board__ הועבר לארכיון",
    "act-archivedCard": "__card__ הועבר לארכיון",
    "act-archivedList": "__list__ הועבר לארכיון",
-    "act-archivedSwimlane": "__swimlane__ נשמר בארכיון",
+    "act-archivedSwimlane": "__swimlane__ הועבר לארכיון",
    "act-importBoard": "הלוח __board__ יובא",
    "act-importCard": "הכרטיס __card__ יובא",
    "act-importList": "הרשימה  __list__ יובאה",
@@ -84,7 +84,7 @@
    "archive-board": "העברת הלוח לארכיון",
    "archive-card": "העברת הכרטיס לארכיון",
    "archive-list": "העברת הרשימה לארכיון",
-    "archive-swimlane": "שמור נתיב זרימה לארכיון",
+    "archive-swimlane": "העברת מסלול לארכיון",
    "archive-selection": "העברת הבחירה לארכיון",
    "archiveBoardPopup-title": "להעביר לוח זה לארכיון?",
    "archived-items": "להעביר לארכיון",
@@ -186,10 +186,10 @@
    "color-plum": "שזיף",
    "color-purple": "סגול",
    "color-red": "אדום",
-    "color-saddlebrown": "saddlebrown",
+    "color-saddlebrown": "חום אוכף",
    "color-silver": "כסף",
    "color-sky": "תכלת",
-    "color-slateblue": "slateblue",
+    "color-slateblue": "צפחה כחולה",
    "color-white": "לבן",
    "color-yellow": "צהוב",
    "unset-color": "בטל הגדרה",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "כל הכרטיסים מרשימה זו יוסרו מהלוח. לצפייה בכרטיסים השמורים בארכיון ולהחזירם ללוח, ניתן ללחוץ על „תפריט” > „פריטים בארכיון”.",
    "list-move-cards": "העברת כל הכרטיסים שברשימה זו",
    "list-select-cards": "בחירת כל הכרטיסים שברשימה זו",
+    "set-color-list": "הגדרת צבע",
    "listActionPopup-title": "פעולות רשימה",
    "swimlaneActionPopup-title": "פעולות על מסלול",
+    "swimlaneAddPopup-title": "הוספת מסלול מתחת",
    "listImportCardPopup-title": "יבוא כרטיס מ־Trello",
    "listMorePopup-title": "עוד",
    "link-list": "קישור לרשימה זו",
@@ -363,7 +365,7 @@
    "name": "שם",
    "no-archived-cards": "אין כרטיסים בארכיון",
    "no-archived-lists": "אין רשימות בארכיון",
-    "no-archived-swimlanes": "לא שמורים מסלולים בארכיון",
+    "no-archived-swimlanes": "אין מסלולים בארכיון.",
    "no-results": "אין תוצאות",
    "normal": "רגיל",
    "normal-desc": "הרשאה לצפות ולערוך כרטיסים. לא ניתן לשנות הגדרות.",
@@ -517,7 +519,10 @@
    "card-end-on": "מועד הסיום",
    "editCardReceivedDatePopup-title": "החלפת מועד הקבלה",
    "editCardEndDatePopup-title": "החלפת מועד הסיום",
-    "setCardColor-title": "הגדרת צבע",
+    "setCardColorPopup-title": "הגדרת צבע",
+    "setCardActionsColorPopup-title": "בחירת צבע",
+    "setSwimlaneColorPopup-title": "בחירת צבע",
+    "setListColorPopup-title": "בחירת צבע",
    "assigned-by": "הוקצה על ידי",
    "requested-by": "התבקש על ידי",
    "board-delete-notice": "מחיקה היא לצמיתות. כל הרשימות, הכרטיבים והפעולות שקשורים בלוח הזה ילכו לאיבוד.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "הוספת קוד HTML מותאם אישית לאחר ה־<body> הפותח.",
    "add-custom-html-before-body-end": "הוספת קוד HTML מותאם אישית לפני ה־</body> הסוגר.",
    "error-undefined": "מהו השתבש",
-    "error-ldap-login": "אירעה שגיאה בעת ניסיון הכניסה"
+    "error-ldap-login": "אירעה שגיאה בעת ניסיון הכניסה",
+    "display-authentication-method": "הצגת שיטת אימות",
+    "default-authentication-method": "שיטת אימות כבררת מחדל"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "स्थानांतरित संपूर्ण कार्ड अंदर में  यह list",
    "list-select-cards": "Select संपूर्ण कार्ड अंदर में  यह list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "सूची Actions",
    "swimlaneActionPopup-title": "तैरन Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import एक Trello कार्ड",
    "listMorePopup-title": "More",
    "link-list": "Link तक  यह list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose संपूर्ण lists, कार्ड और actions associated साथ में  यह बोर्ड.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "A listán lévő összes kártya áthelyezése",
    "list-select-cards": "A listán lévő összes kártya kiválasztása",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Műveletek felsorolása",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Trello kártya importálása",
    "listMorePopup-title": "Több",
    "link-list": "Összekapcsolás ezzel a listával",
@@ -517,7 +519,10 @@
    "card-end-on": "Befejeződik ekkor",
    "editCardReceivedDatePopup-title": "Érkezési dátum megváltoztatása",
    "editCardEndDatePopup-title": "Befejezési dátum megváltoztatása",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Pindah semua kartu ke daftar ini",
    "list-select-cards": "Pilih semua kartu di daftar ini",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Daftar Tindakan",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Impor dari Kartu Trello",
    "listMorePopup-title": "Lainnya",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Sposta tutte le schede in questa lista",
    "list-select-cards": "Selezione tutte le schede in questa lista",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Azioni disponibili",
    "swimlaneActionPopup-title": "Azioni corsia",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importa una scheda di Trello",
    "listMorePopup-title": "Altro",
    "link-list": "Link a questa lista",
@@ -517,7 +519,10 @@
    "card-end-on": "Termina il",
    "editCardReceivedDatePopup-title": "Cambia data ricezione",
    "editCardEndDatePopup-title": "Cambia data finale",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assegnato da",
    "requested-by": "Richiesto da",
    "board-delete-notice": "L'eliminazione è permanente. Tutte le azioni, liste e schede associate a questa bacheca andranno perse.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "リストの全カードを移動する",
    "list-select-cards": "リストの全カードを選択",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "操作一覧",
    "swimlaneActionPopup-title": "スイムレーン操作",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Trelloのカードをインポート",
    "listMorePopup-title": "さらに見る",
    "link-list": "このリストへのリンク",
@@ -517,7 +519,10 @@
    "card-end-on": "終了日",
    "editCardReceivedDatePopup-title": "受付日の変更",
    "editCardEndDatePopup-title": "終了日の変更",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "გადაიტანე ყველა ბარათი ამ სიაში",
    "list-select-cards": "მონიშნე ყველა ბარათი ამ სიაში",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "მოქმედებების სია",
    "swimlaneActionPopup-title": "ბილიკის მოქმედებები",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Trello ბარათის იმპორტი",
    "listMorePopup-title": "მეტი",
    "link-list": "დააკავშირეთ ამ ჩამონათვალთან",
@@ -517,7 +519,10 @@
    "card-end-on": "დასრულდება : ",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "შეცვალეთ საბოლოო თარიღი",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "უფლებამოსილების გამცემი ",
    "requested-by": "მომთხოვნი",
    "board-delete-notice": "წაშლის შემთხვევაში თქვენ დაკარგავთ ამ დაფასთან ასოცირებულ ყველა მონაცემს მათ შორის : ჩამონათვალს, ბარათებს და მოქმედებებს. ",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "목록에 있는 모든 카드를 이동",
    "list-select-cards": "목록에 있는 모든 카드를 선택",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "동작 목록",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Trello 카드 가져 오기",
    "listMorePopup-title": "더보기",
    "link-list": "이 리스트에 링크",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -0,0 +1,665 @@
+{
+    "accept": "Приемам",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "прикачи __attachment__ към __card__",
+    "act-addSubtask": "добави задача __checklist__ към __card__",
+    "act-addChecklist": "добави списък със задачи __checklist__ към __card__",
+    "act-addChecklistItem": "добави __checklistItem__ към списък със задачи __checklist__ в __card__",
+    "act-addComment": "Коментира в __card__: __comment__",
+    "act-createBoard": "създаде __board__",
+    "act-createCard": "добави __card__ към __list__",
+    "act-createCustomField": "създаде собствено поле __customField__",
+    "act-createList": "добави __list__ към __board__",
+    "act-addBoardMember": "добави __member__ към __board__",
+    "act-archivedBoard": "__board__ е преместен в Архива",
+    "act-archivedCard": "__card__ е преместена в Архива",
+    "act-archivedList": "__list__ е преместен в Архива",
+    "act-archivedSwimlane": "__swimlane__ е преместен в Архива",
+    "act-importBoard": "импортира __board__",
+    "act-importCard": "импортира __card__",
+    "act-importList": "импортира __list__",
+    "act-joinMember": "добави __member__ към __card__",
+    "act-moveCard": "премести __card__ от __oldList__ в __list__",
+    "act-removeBoardMember": "премахна __member__ от __board__",
+    "act-restoredCard": "възстанови __card__ в __board__",
+    "act-unjoinMember": "премахна __member__ от __card__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Действия",
+    "activities": "Действия",
+    "activity": "Дейности",
+    "activity-added": "добави %s към %s",
+    "activity-archived": "%s е преместена в Архива",
+    "activity-attached": "прикачи %s към %s",
+    "activity-created": "създаде %s",
+    "activity-customfield-created": "създаде собствено поле %s",
+    "activity-excluded": "изключи %s от %s",
+    "activity-imported": "импортира %s в/във %s от %s",
+    "activity-imported-board": "импортира %s от %s",
+    "activity-joined": "се присъедини към %s",
+    "activity-moved": "премести %s от %s в/във %s",
+    "activity-on": "на %s",
+    "activity-removed": "премахна %s от %s",
+    "activity-sent": "изпрати %s до %s",
+    "activity-unjoined": "вече не е част от %s",
+    "activity-subtask-added": "добави задача към %s",
+    "activity-checked-item": "отбеляза%s в списък със задачи %s на %s",
+    "activity-unchecked-item": "размаркира %s от списък със задачи %s на %s",
+    "activity-checklist-added": "добави списък със задачи към %s",
+    "activity-checklist-removed": "премахна списък със задачи от %s",
+    "activity-checklist-completed": "завърши списък със задачи %s на %s",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
+    "activity-checklist-item-added": "добави точка към '%s' в/във %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
+    "add": "Добави",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "завърши чеклиста %s",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
+    "add-attachment": "Добави прикачен файл",
+    "add-board": "Добави Табло",
+    "add-card": "Добави карта",
+    "add-swimlane": "Добави коридор",
+    "add-subtask": "Добави подзадача",
+    "add-checklist": "Добави списък със задачи",
+    "add-checklist-item": "Добави точка към списъка със задачи",
+    "add-cover": "Добави корица",
+    "add-label": "Добави етикет",
+    "add-list": "Добави списък",
+    "add-members": "Добави членове",
+    "added": "Добавено",
+    "addMemberPopup-title": "Членове",
+    "admin": "Администратор",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Съобщение",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Съобщение от администратора",
+    "all-boards": "Всички табла",
+    "and-n-other-card": "И __count__ друга карта",
+    "and-n-other-card_plural": "И __count__ други карти",
+    "apply": "Приложи",
+    "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": "Премести в Архива",
+    "archive-all": "Премести всички в Архива",
+    "archive-board": "Премести Таблото в Архива",
+    "archive-card": "Премести Картата в Архива",
+    "archive-list": "Премести Списъка в Архива",
+    "archive-swimlane": "Премести Коридора в Архива",
+    "archive-selection": "Премести избраното в Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото в Архива?",
+    "archived-items": "Архив",
+    "archived-boards": "Табла в Архива",
+    "restore-board": "Възстанови Таблото",
+    "no-archived-boards": "Няма Табла в Архива.",
+    "archives": "Архив",
+    "assign-member": "Възложи на член от екипа",
+    "attached": "прикачен",
+    "attachment": "Прикаченн файл",
+    "attachment-delete-pop": "Изтриването на прикачен файл е завинаги. Няма как да бъде възстановен.",
+    "attachmentDeletePopup-title": "Желаете ли да изтриете прикачения файл?",
+    "attachments": "Прикачени файлове",
+    "auto-watch": "Автоматично наблюдаване на таблата, когато са създадени",
+    "avatar-too-big": "Аватарът е прекалено голям (максимум 70KB)",
+    "back": "Назад",
+    "board-change-color": "Промени цвета",
+    "board-nb-stars": "%s звезди",
+    "board-not-found": "Таблото не е намерено",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Промени името на Таблото",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Промени наблюдаването",
+    "boardMenuPopup-title": "Меню на Таблото",
+    "boards": "Табла",
+    "board-view": "Board View",
+    "board-view-cal": "Календар",
+    "board-view-swimlanes": "Коридори",
+    "board-view-lists": "Списъци",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "Тази карта е преместена в Архива.",
+    "board-archived": "Това табло е преместено в Архива.",
+    "card-comments-title": "Тази карта има %s коментар.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "Можете да преместите картата в Архива, за да я премахнете от Таблото и така да запазите активността в него.",
+    "card-due": "Готова за",
+    "card-due-on": "Готова за",
+    "card-spent": "Изработено време",
+    "card-edit-attachments": "Промени прикачените файлове",
+    "card-edit-custom-fields": "Промени собствените полета",
+    "card-edit-labels": "Промени етикетите",
+    "card-edit-members": "Промени членовете",
+    "card-labels-title": "Промени етикетите за картата.",
+    "card-members-title": "Добави или премахни членове на Таблото от тази карта.",
+    "card-start": "Начало",
+    "card-start-on": "Започва на",
+    "cardAttachmentsPopup-title": "Прикачи от",
+    "cardCustomField-datePopup-title": "Промени датата",
+    "cardCustomFieldsPopup-title": "Промени собствените полета",
+    "cardDeletePopup-title": "Желаете да изтриете картата?",
+    "cardDetailsActionsPopup-title": "Опции",
+    "cardLabelsPopup-title": "Етикети",
+    "cardMembersPopup-title": "Членове",
+    "cardMorePopup-title": "Още",
+    "cards": "Карти",
+    "cards-count": "Карти",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Карта",
+    "cardType-linkedCard": "Свързана карта",
+    "cardType-linkedBoard": "Свързано табло",
+    "change": "Промени",
+    "change-avatar": "Промени аватара",
+    "change-password": "Промени паролата",
+    "change-permissions": "Промени правата",
+    "change-settings": "Промени настройките",
+    "changeAvatarPopup-title": "Промени аватара",
+    "changeLanguagePopup-title": "Промени езика",
+    "changePasswordPopup-title": "Промени паролата",
+    "changePermissionsPopup-title": "Промени правата",
+    "changeSettingsPopup-title": "Промяна на настройките",
+    "subtasks": "Подзадачи",
+    "checklists": "Списъци със задачи",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Натиснете, за да премахнете това табло от любими.",
+    "clipboard": "Клипборда или с драг & дроп",
+    "close": "Затвори",
+    "close-board": "Затвори Таблото",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
+    "color-black": "черно",
+    "color-blue": "синьо",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "зелено",
+    "color-indigo": "indigo",
+    "color-lime": "лайм",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "оранжево",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "розово",
+    "color-plum": "plum",
+    "color-purple": "пурпурно",
+    "color-red": "червено",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "светло синьо",
+    "color-slateblue": "slateblue",
+    "color-white": "бяло",
+    "color-yellow": "жълто",
+    "unset-color": "Unset",
+    "comment": "Коментирай",
+    "comment-placeholder": "Напиши коментар",
+    "comment-only": "Само коментар",
+    "comment-only-desc": "Може да коментира само в карти.",
+    "no-comments": "Няма коментари",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Компютър",
+    "confirm-subtask-delete-dialog": "Сигурен ли сте, че искате да изтриете подзадачата?",
+    "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?",
+    "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
+    "linkCardPopup-title": "Свържи картата",
+    "searchCardPopup-title": "Търсене на карта",
+    "copyCardPopup-title": "Копирай картата",
+    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Създай",
+    "createBoardPopup-title": "Създай Табло",
+    "chooseBoardSourcePopup-title": "Импортирай Табло",
+    "createLabelPopup-title": "Създай Табло",
+    "createCustomField": "Създай Поле",
+    "createCustomFieldPopup-title": "Създай Поле",
+    "current": "сегашен",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Чекбокс",
+    "custom-field-date": "Дата",
+    "custom-field-dropdown": "Падащо меню",
+    "custom-field-dropdown-none": "(няма)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Номер",
+    "custom-field-text": "Текст",
+    "custom-fields": "Собствени полета",
+    "date": "Дата",
+    "decline": "Отказ",
+    "default-avatar": "Основен аватар",
+    "delete": "Изтрий",
+    "deleteCustomFieldPopup-title": "Изтриване на Собственото поле?",
+    "deleteLabelPopup-title": "Желаете да изтриете етикета?",
+    "description": "Описание",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Отказ",
+    "done": "Готово",
+    "download": "Сваляне",
+    "edit": "Промени",
+    "edit-avatar": "Промени аватара",
+    "edit-profile": "Промяна на профила",
+    "edit-wip-limit": "Промени WIP лимита",
+    "soft-wip-limit": "\"Мек\" WIP лимит",
+    "editCardStartDatePopup-title": "Промени началната дата",
+    "editCardDueDatePopup-title": "Промени датата за готовност",
+    "editCustomFieldPopup-title": "Промени Полето",
+    "editCardSpentTimePopup-title": "Промени изработеното време",
+    "editLabelPopup-title": "Промяна на Етикета",
+    "editNotificationPopup-title": "Промени известията",
+    "editProfilePopup-title": "Промяна на профила",
+    "email": "Имейл",
+    "email-enrollAccount-subject": "Ваш профил беше създаден на __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Неуспешно изпращане на имейла",
+    "email-fail-text": "Възникна грешка при изпращането на имейла",
+    "email-invalid": "Невалиден имейл",
+    "email-invite": "Покани чрез имейл",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Имейлът е изпратен",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Включи WIP лимита",
+    "error-board-doesNotExist": "Това табло не съществува",
+    "error-board-notAdmin": "За да направите това трябва да сте администратор на това табло",
+    "error-board-notAMember": "За да направите това трябва да сте член на това табло",
+    "error-json-malformed": "Текстът Ви не е валиден JSON",
+    "error-json-schema": "JSON информацията Ви не съдържа информация във валиден формат",
+    "error-list-doesNotExist": "Този списък не съществува",
+    "error-user-doesNotExist": "Този потребител не съществува",
+    "error-user-notAllowSelf": "Не можете да поканите себе си",
+    "error-user-notCreated": "Този потребител не е създаден",
+    "error-username-taken": "Това потребителско име е вече заето",
+    "error-email-taken": "Имейлът е вече зает",
+    "export-board": "Експортиране на Табло",
+    "filter": "Филтър",
+    "filter-cards": "Филтрирай картите",
+    "filter-clear": "Премахване на филтрите",
+    "filter-no-label": "без етикет",
+    "filter-no-member": "без член",
+    "filter-no-custom-fields": "Няма Собствени полета",
+    "filter-on": "Има приложени филтри",
+    "filter-on-desc": "В момента филтрирате картите в това табло. Моля, натиснете тук, за да промените филтъра.",
+    "filter-to-selection": "Филтрирай избраните",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Име",
+    "header-logo-title": "Назад към страницата с Вашите табла.",
+    "hide-system-messages": "Скриване на системните съобщения",
+    "headerBarCreateBoardPopup-title": "Създай Табло",
+    "home": "Начало",
+    "import": "Импорт",
+    "link": "Връзка",
+    "import-board": "Импортирай Табло",
+    "import-board-c": "Импортирай Табло",
+    "import-board-title-trello": "Импорт на табло от Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Импортирането ще изтрие всичката налична информация в таблото и ще я замени с нова.",
+    "from-trello": "От Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Копирайте валидната Ви JSON информация тук",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Версия",
+    "initials": "Инициали",
+    "invalid-date": "Невалидна дата",
+    "invalid-time": "Невалиден час",
+    "invalid-user": "Невалиден потребител",
+    "joined": "присъедини",
+    "just-invited": "Бяхте поканени в това табло",
+    "keyboard-shortcuts": "Преки пътища с клавиатурата",
+    "label-create": "Създай етикет",
+    "label-default": "%s етикет (по подразбиране)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Етикети",
+    "language": "Език",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Връзка към тази карта",
+    "list-archive-cards": "Премести всички карти от този списък в Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
+    "list-move-cards": "Премести всички карти в този списък",
+    "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Импорт на карта от Trello",
+    "listMorePopup-title": "Още",
+    "link-list": "Връзка към този списък",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
+    "lists": "Списъци",
+    "swimlanes": "Коридори",
+    "log-out": "Изход",
+    "log-in": "Вход",
+    "loginPopup-title": "Вход",
+    "memberMenuPopup-title": "Настройки на профила",
+    "members": "Членове",
+    "menu": "Меню",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Премести картата",
+    "moveCardToBottom-title": "Премести в края",
+    "moveCardToTop-title": "Премести в началото",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Множествен избор",
+    "multi-selection-on": "Множественият избор е приложен",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "Моите табла",
+    "name": "Име",
+    "no-archived-cards": "Няма карти в Архива.",
+    "no-archived-lists": "Няма списъци в Архива.",
+    "no-archived-swimlanes": "Няма коридори в Архива.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Получавате информация за всички карти, в които сте отбелязани или сте създали",
+    "notify-watch": "Получавате информация за всички табла, списъци и карти, които наблюдавате",
+    "optional": "optional",
+    "or": "или",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Парола",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Профил",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Желаете да изтриете списъка?",
+    "remove-member": "Премахни член",
+    "remove-member-from-card": "Премахни от картата",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Промени името на Таблото",
+    "restore": "Възстанови",
+    "save": "Запази",
+    "search": "Търсене",
+    "rules": "Правила",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Избери цвят",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Въведи WIP лимит",
+    "shortcut-assign-self": "Добави себе си към тази карта",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Изчистване на всички филтри",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Филтрирай моите карти",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Отвори/затвори сайдбара с филтри",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Покажи бройката на картите, ако списъка съдържа повече от",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Любими табла",
+    "starred-boards-description": "Любимите табла се показват в началото на списъка Ви.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "това табло",
+    "this-card": "картата",
+    "spent-time-hours": "Изработено време (часа)",
+    "overtime-hours": "Оувъртайм (часа)",
+    "overtime": "Оувъртайм",
+    "has-overtime-cards": "Има карти с оувъртайм",
+    "has-spenttime-cards": "Има карти с изработено време",
+    "time": "Време",
+    "title": "Title",
+    "tracking": "Следене",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Спри наблюдаването",
+    "upload": "Upload",
+    "upload-avatar": "Качване на аватар",
+    "uploaded-avatar": "Качихте аватар",
+    "username": "Потребителско име",
+    "view-it": "View it",
+    "warn-list-archived": "внимание: тази карта е в списък в Архива",
+    "watch": "Наблюдавай",
+    "watching": "Наблюдава",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Невалиден WIP лимит",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Моля, преместете някои от задачите от този списък или въведете по-висок WIP лимит.",
+    "admin-panel": "Администраторски панел",
+    "settings": "Настройки",
+    "people": "Хора",
+    "registration": "Регистрация",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Покани",
+    "invite-people": "Покани хора",
+    "to-boards": "в табло/а",
+    "email-addresses": "Имейл адреси",
+    "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
+    "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
+    "smtp-tls-description": "Разреши TLS поддръжка за SMTP сървъра",
+    "smtp-host": "SMTP хост",
+    "smtp-port": "SMTP порт",
+    "smtp-username": "Потребителско име",
+    "smtp-password": "Парола",
+    "smtp-tls": "TLS поддръжка",
+    "send-from": "От",
+    "send-smtp-test": "Изпрати тестов имейл на себе си",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "Успешно изпратихте имейл",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Версия на Node",
+    "OS_Arch": "Архитектура на ОС",
+    "OS_Cpus": "Брой CPU ядра",
+    "OS_Freemem": "Свободна памет",
+    "OS_Loadavg": "ОС средно натоварване",
+    "OS_Platform": "ОС платформа",
+    "OS_Release": "ОС Версия",
+    "OS_Totalmem": "ОС Общо памет",
+    "OS_Type": "Тип ОС",
+    "OS_Uptime": "OS Ъптайм",
+    "days": "дни",
+    "hours": "часа",
+    "minutes": "минути",
+    "seconds": "секунди",
+    "show-field-on-card": "Покажи това поле в картата",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Да",
+    "no": "Не",
+    "accounts": "Профили",
+    "accounts-allowEmailChange": "Разреши промяна на имейла",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Създаден на",
+    "verified": "Потвърден",
+    "active": "Активен",
+    "card-received": "Получена",
+    "card-received-on": "Получена на",
+    "card-end": "Завършена",
+    "card-end-on": "Завършена на",
+    "editCardReceivedDatePopup-title": "Промени датата на получаване",
+    "editCardEndDatePopup-title": "Промени датата на завършване",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
+    "default-subtasks-board": "Подзадачи за табло __board__",
+    "default": "по подразбиране",
+    "queue": "Опашка",
+    "subtask-settings": "Настройки на Подзадачите",
+    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
+    "show-subtasks-field": "Картата може да има подзадачи",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Промени източника на картата",
+    "parent-card": "Карта-източник",
+    "source-board": "Source board",
+    "no-parent": "Не показвай източника",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен файл от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения файл",
+    "r-rule": "Правило",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
+    "r-board-rules": "Правила за таблото",
+    "r-add-rule": "Добави правилото",
+    "r-view-rule": "Виж правилото",
+    "r-delete-rule": "Изтрий правилото",
+    "r-new-rule-name": "Заглавие за новото правило",
+    "r-no-rules": "Няма правила",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Преместено в Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "име",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести в Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
+    "r-add": "Добави",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Детайли за правилото",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Премести картата в Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
+    "r-by": "by",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
+}
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Mer",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Verplaats alle kaarten in deze lijst",
    "list-select-cards": "Selecteer alle kaarten in deze lijst",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Lijst acties",
    "swimlaneActionPopup-title": "Swimlane handelingen",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importeer een Trello kaart",
    "listMorePopup-title": "Meer",
    "link-list": "Link naar deze lijst",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -1,6 +1,6 @@
 {
    "accept": "Akceptuj",
-    "act-activity-notify": "Activity Notification",
+    "act-activity-notify": "Powiadomienia aktywności",
    "act-addAttachment": "dodano załącznik __attachement__ do __card__",
    "act-addSubtask": "dodał podzadanie __checklist__ do __card__",
    "act-addChecklist": "dodał listę zadań __checklist__ to __card__",
@@ -78,7 +78,7 @@
    "and-n-other-card": "I __count__ inna karta",
    "and-n-other-card_plural": "I __count__ inne karty",
    "apply": "Zastosuj",
-    "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.",
+    "app-is-offline": "Trwa ładowanie, proszę czekać. Odświeżenie strony może spowodować utratę danych. Jeśli strona się nie przeładowuje, upewnij się, że serwer działa poprawnie.",
    "archive": "Przenieś do Archiwum",
    "archive-all": "Przenieś wszystko do Archiwum",
    "archive-board": "Przenieś tablicę do Archiwum",
@@ -169,30 +169,30 @@
    "close-board-pop": "Będziesz w stanie przywrócić tablicę poprzez kliknięcie przycisku \"Archiwizuj\" w nagłówku strony domowej.",
    "color-black": "czarny",
    "color-blue": "niebieski",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "karmazynowy",
+    "color-darkgreen": "ciemnozielony",
+    "color-gold": "złoty",
+    "color-gray": "szary",
    "color-green": "zielony",
-    "color-indigo": "indigo",
+    "color-indigo": "indygo",
    "color-lime": "limonkowy",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "fuksjowy",
+    "color-mistyrose": "różowy",
+    "color-navy": "granatowy",
    "color-orange": "pomarańczowy",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "turkusowy",
+    "color-peachpuff": "brzoskwiniowy",
    "color-pink": "różowy",
-    "color-plum": "plum",
+    "color-plum": "śliwkowy",
    "color-purple": "fioletowy",
    "color-red": "czerwony",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "jasnobrązowy",
+    "color-silver": "srebrny",
    "color-sky": "błękitny",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "szaroniebieski",
+    "color-white": "miały",
    "color-yellow": "żółty",
-    "unset-color": "Unset",
+    "unset-color": "Nieustawiony",
    "comment": "Komentarz",
    "comment-placeholder": "Dodaj komentarz",
    "comment-only": "Tylko komentowanie",
@@ -299,19 +299,19 @@
    "import-board": "importuj tablice",
    "import-board-c": "Import tablicy",
    "import-board-title-trello": "Importuj tablicę z Trello",
-    "import-board-title-wekan": "Import board from previous export",
-    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-board-title-wekan": "Importuj tablicę z poprzedniego eksportu",
+    "import-sandstorm-backup-warning": "Nie usuwaj danych, które importujesz ze źródłowej tablicy lub Trello zanim upewnisz się, że wszystko zostało prawidłowo przeniesione przy czym brane jest pod uwagę ponowne uruchomienie strony, ponieważ w przypadku błędu braku tablicy stracisz dane.",
    "import-sandstorm-warning": "Zaimportowana tablica usunie wszystkie istniejące dane na aktualnej tablicy oraz zastąpi ją danymi z tej importowanej.",
    "from-trello": "Z Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "Z poprzedniego eksportu",
    "import-board-instruction-trello": "W twojej tablicy na Trello przejdź do 'Menu', następnie 'Więcej', 'Drukuj i eksportuj', 'Eksportuj jako JSON' i skopiuj wynik",
-    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "Na Twojej tablicy przejdź do 'Menu', a następnie wybierz 'Eksportuj tablicę' i skopiuj tekst w pobranym pliku.",
    "import-board-instruction-about-errors": "W przypadku, gdy otrzymujesz błędy importowania tablicy, czasami importowanie pomimo wszystko działa poprawnie i tablica znajduje się w oknie Wszystkie tablice.",
    "import-json-placeholder": "Wklej Twoje dane JSON tutaj",
    "import-map-members": "Przypisz członków",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Twoje zaimportowane tablice mają kilku członków. Proszę wybierz członków których chcesz zaimportować dla Twoich użytkowników",
    "import-show-user-mapping": "Przejrzyj wybranych członków",
-    "import-user-select": "Pick your existing user you want to use as this member",
+    "import-user-select": "Wybierz istniejącego użytkownika, który ma stać się członkiem",
    "importMapMembersAddPopup-title": "Wybierz użytkownika",
    "info": "Wersja",
    "initials": "Inicjały",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "To usunie wszystkie karty z tej listy z tej tablicy. Aby przejrzeć karty w Archiwum i przywrócić na tablicę, kliknij \"Menu\" > \"Archiwizuj\".",
    "list-move-cards": "Przenieś wszystkie karty z tej listy",
    "list-select-cards": "Zaznacz wszystkie karty z tej listy",
+    "set-color-list": "Ustaw kolor",
    "listActionPopup-title": "Lista akcji",
    "swimlaneActionPopup-title": "Opcje diagramu czynności",
+    "swimlaneAddPopup-title": "Dodaj diagram czynności poniżej",
    "listImportCardPopup-title": "Zaimportuj kartę z Trello",
    "listMorePopup-title": "Więcej",
    "link-list": "Podepnij do tej listy",
@@ -476,14 +478,14 @@
    "send-smtp-test": "Wyślij wiadomość testową do siebie",
    "invitation-code": "Kod z zaproszenia",
    "email-invite-register-subject": "__inviter__ wysłał Ci zaproszenie",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email",
+    "email-invite-register-text": "Drogi __user__,\n\n__inviter__ zaprasza Cię do współpracy na naszej tablicy kanban.\n\nAby kontynuować, wejdź w poniższy link:\n__url__\n\nTwój kod zaproszenia to: __icode__\n\nDziękuję.",
+    "email-smtp-test-subject": "Wiadomość testowa SMTP",
    "email-smtp-test-text": "Wiadomość testowa została wysłana z powodzeniem.",
    "error-invitation-code-not-exist": "Kod zaproszenia nie istnieje",
    "error-notAuthorized": "Nie jesteś uprawniony do przeglądania tej strony.",
    "outgoing-webhooks": "Wychodzące webhooki",
    "outgoingWebhooksPopup-title": "Wychodzące webhooki",
-    "boardCardTitlePopup-title": "Card Title Filter",
+    "boardCardTitlePopup-title": "Filtruj poprzez nazwę karty",
    "new-outgoing-webhook": "Nowy wychodzący webhook",
    "no-name": "(nieznany)",
    "Node_version": "Wersja Node",
@@ -496,7 +498,7 @@
    "OS_Totalmem": "Dostępna pamięć RAM",
    "OS_Type": "Typ systemu",
    "OS_Uptime": "Czas działania systemu",
-    "days": "days",
+    "days": "dni",
    "hours": "godzin",
    "minutes": "minut",
    "seconds": "sekund",
@@ -517,7 +519,10 @@
    "card-end-on": "Kończy się",
    "editCardReceivedDatePopup-title": "Zmień datę odebrania",
    "editCardEndDatePopup-title": "Zmień datę ukończenia",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Ustaw kolor",
+    "setCardActionsColorPopup-title": "Wybierz kolor",
+    "setSwimlaneColorPopup-title": "Wybierz kolor",
+    "setListColorPopup-title": "Wybierz kolor",
    "assigned-by": "Przypisane przez",
    "requested-by": "Zlecone przez",
    "board-delete-notice": "Usuwanie jest permanentne. Stracisz wszystkie listy, kart oraz czynności przypisane do tej tablicy.",
@@ -556,14 +561,14 @@
    "r-delete-rule": "Usuń regułę",
    "r-new-rule-name": "Nowa nazwa reguły",
    "r-no-rules": "Brak regułę",
-    "r-when-a-card": "When a card",
+    "r-when-a-card": "Gdy karta",
    "r-is": "jest",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-is-moved": "jest przenoszona",
+    "r-added-to": "dodana do",
    "r-removed-from": "Usunięto z",
    "r-the-board": "tablicy",
    "r-list": "lista",
-    "set-filter": "Set Filter",
+    "set-filter": "Ustaw filtr",
    "r-moved-to": "Przeniesiono do",
    "r-moved-from": "Przeniesiono z",
    "r-archived": "Przeniesione z Archiwum",
@@ -571,7 +576,7 @@
    "r-a-card": "karta",
    "r-when-a-label-is": "Gdy etykieta jest",
    "r-when-the-label-is": "Gdy etykieta jest",
-    "r-list-name": "list name",
+    "r-list-name": "nazwa listy",
    "r-when-a-member": "Gdy członek jest",
    "r-when-the-member": "Gdy członek jest",
    "r-name": "nazwa",
@@ -596,7 +601,7 @@
    "r-label": "etykieta",
    "r-member": "członek",
    "r-remove-all": "Usuń wszystkich członków tej karty",
-    "r-set-color": "Set color to",
+    "r-set-color": "Ustaw kolor na",
    "r-checklist": "lista zadań",
    "r-check-all": "Zaznacz wszystkie",
    "r-uncheck-all": "Odznacz wszystkie",
@@ -621,9 +626,9 @@
    "r-d-unarchive": "Przywróć kartę z Archiwum",
    "r-d-add-label": "Dodaj etykietę",
    "r-d-remove-label": "Usuń etykietę",
-    "r-create-card": "Create new card",
-    "r-in-list": "in list",
-    "r-in-swimlane": "in swimlane",
+    "r-create-card": "Utwórz nową kartę",
+    "r-in-list": "na liście",
+    "r-in-swimlane": "w diagramie zdarzeń",
    "r-d-add-member": "Dodaj członka",
    "r-d-remove-member": "Usuń członka",
    "r-d-remove-all-member": "Usuń wszystkich członków",
@@ -634,14 +639,14 @@
    "r-d-check-of-list": "z listy zadań",
    "r-d-add-checklist": "Dodaj listę zadań",
    "r-d-remove-checklist": "Usuń listę zadań",
-    "r-by": "by",
+    "r-by": "przez",
    "r-add-checklist": "Dodaj listę zadań",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
-    "r-board-note": "Note: leave a field empty to match every possible value.",
-    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-with-items": "z elementami",
+    "r-items-list": "element1,element2,element3",
+    "r-add-swimlane": "Dodaj diagram zdarzeń",
+    "r-swimlane-name": "Nazwa diagramu",
+    "r-board-note": "Uwaga: pozostaw pole puste, aby każda wartość była brana pod uwagę.",
+    "r-checklist-note": "Uwaga: wartości elementów listy muszą być oddzielone przecinkami.",
    "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -651,8 +656,10 @@
    "custom-product-name": "Niestandardowa nazwa produktu",
    "layout": "Układ strony",
    "hide-logo": "Ukryj logo",
-    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
-    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
-    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "add-custom-html-after-body-start": "Dodaj niestandardowy kod HTML po <body> starcie",
+    "add-custom-html-before-body-end": "Dodaj niestandardowy kod HTML przed </body> końcem",
+    "error-undefined": "Coś poszło nie tak",
+    "error-ldap-login": "Wystąpił błąd w trakcie logowania",
+    "display-authentication-method": "Wyświetl metodę logowania",
+    "default-authentication-method": "Domyślna metoda logowania"
 }
@@ -192,7 +192,7 @@
    "color-slateblue": "azul ardósia",
    "color-white": "branco",
    "color-yellow": "amarelo",
-    "unset-color": "Unset",
+    "unset-color": "Remover",
    "comment": "Comentário",
    "comment-placeholder": "Escrever Comentário",
    "comment-only": "Somente comentários",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Isto removerá todos os cartões desta lista para o quadro. Para visualizar cartões arquivados e trazê-los de volta para o quadro, clique em “Menu” > “Arquivo-morto”.",
    "list-move-cards": "Mover todos os cartões desta lista",
    "list-select-cards": "Selecionar todos os cartões nesta lista",
+    "set-color-list": "Definir Cor",
    "listActionPopup-title": "Listar Ações",
    "swimlaneActionPopup-title": "Ações de Raia",
+    "swimlaneAddPopup-title": "Adicionar uma Raia abaixo ",
    "listImportCardPopup-title": "Importe um cartão do Trello",
    "listMorePopup-title": "Mais",
    "link-list": "Vincular a esta lista",
@@ -517,7 +519,10 @@
    "card-end-on": "Termina em",
    "editCardReceivedDatePopup-title": "Modificar data de recebimento",
    "editCardEndDatePopup-title": "Mudar data de fim",
-    "setCardColor-title": "Definir cor",
+    "setCardColorPopup-title": "Definir cor",
+    "setCardActionsColorPopup-title": "Escolha uma cor",
+    "setSwimlaneColorPopup-title": "Escolha uma cor",
+    "setListColorPopup-title": "Escolha uma cor",
    "assigned-by": "Atribuído por",
    "requested-by": "Solicitado por",
    "board-delete-notice": "Excluir é permanente. Você perderá todas as listas, cartões e ações associados nesse quadro.",
@@ -649,10 +654,12 @@
    "authentication-method": "Método de autenticação",
    "authentication-type": "Tipo de autenticação",
    "custom-product-name": "Nome Customizado do Produto",
-    "layout": "Leiaute",
+    "layout": "Layout",
    "hide-logo": "Esconder Logo",
    "add-custom-html-after-body-start": "Adicionar HTML Customizado depois do início do <body>",
    "add-custom-html-before-body-end": "Adicionar HTML Customizado antes do fim do </body>",
    "error-undefined": "Algo deu errado",
-    "error-ldap-login": "Um erro ocorreu enquanto tentava entrar"
+    "error-ldap-login": "Um erro ocorreu enquanto tentava entrar",
+    "display-authentication-method": "Mostrar Método de Autenticação",
+    "default-authentication-method": "Método de Autenticação Padrão"
 }
@@ -1,54 +1,54 @@
 {
    "accept": "Aceitar",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createCustomField": "created custom field __customField__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
+    "act-activity-notify": "Notificação de Actividade",
+    "act-addAttachment": "anexado __attachment__ ao __card__",
+    "act-addSubtask": "adicionou sub-tarefa __checklist__ ao __card__",
+    "act-addChecklist": "adicionou checklist __checklist__ ao __card__",
+    "act-addChecklistItem": "adicionou __checklistItem__ à checklist __checklist__ no __card__",
+    "act-addComment": "comentou em __card__: __comment__",
+    "act-createBoard": "criou __board__",
+    "act-createCard": "adicionou __card__ à __list__",
+    "act-createCustomField": "criou o campo customizado __customField__",
+    "act-createList": "adicionou __list__ a __board__",
+    "act-addBoardMember": "adicionou __member__ a __board__",
+    "act-archivedBoard": "__board__ arquivado",
+    "act-archivedCard": "__card__ arquivado",
+    "act-archivedList": "__list__ arquivada",
+    "act-archivedSwimlane": "__swimlane__ arquivada",
+    "act-importBoard": "__board__ importado",
+    "act-importCard": "__card__ importado",
+    "act-importList": "__list__ importada",
+    "act-joinMember": "__member__ adicionado ao __card__",
+    "act-moveCard": "__card__ movido de __oldList__ para __list__",
+    "act-removeBoardMember": "__member__ removido de __board__",
+    "act-restoredCard": "__card__ restaurado para __board__",
+    "act-unjoinMember": "__member__ removido de __card__",
    "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",
+    "actions": "Ações",
+    "activities": "Atividade",
+    "activity": "Atividade",
+    "activity-added": "adicionado %s a %s",
+    "activity-archived": "%s arquivado",
+    "activity-attached": "anexado %s a %s",
    "activity-created": "Criado %s",
-    "activity-customfield-created": "created custom field %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-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",
-    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-customfield-created": "criado campo customizado %s",
+    "activity-excluded": "excuído %s de %s",
+    "activity-imported": "importado %s para %s de %s",
+    "activity-imported-board": "importado %s de %s",
+    "activity-joined": "entrou em %s",
+    "activity-moved": "movido %s de %s para %s",
+    "activity-on": "em %s",
+    "activity-removed": "removido %s de %s",
+    "activity-sent": "enviado %s para %s",
+    "activity-unjoined": "saiu de %s",
+    "activity-subtask-added": "adicionada subtarefa a %s",
+    "activity-checked-item": "marcado %s na checklist %s de %s",
+    "activity-unchecked-item": "desmarcado %s na checklist %s de %s",
+    "activity-checklist-added": "checklist adicionada a %s",
+    "activity-checklist-removed": "checklist removida de %s",
+    "activity-checklist-completed": "checklist %s de %s foi completada",
+    "activity-checklist-uncompleted": "checklist %s de %s foi marcada como não completada",
    "activity-checklist-item-added": "added checklist item to '%s' in %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Adicionar",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Mais",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -169,30 +169,30 @@
    "close-board-pop": "Вы сможете восстановить доску, нажав \"Архив\" в заголовке домашней страницы.",
    "color-black": "черный",
    "color-blue": "синий",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "малиновый",
+    "color-darkgreen": "темно-зеленый",
+    "color-gold": "золотой",
+    "color-gray": "серый",
    "color-green": "зеленый",
-    "color-indigo": "indigo",
+    "color-indigo": "индиго",
    "color-lime": "лимоновый",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "маджента",
+    "color-mistyrose": "тускло-розовый",
+    "color-navy": "темно-синий",
    "color-orange": "оранжевый",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "бледно-бирюзовый",
+    "color-peachpuff": "персиковый",
    "color-pink": "розовый",
-    "color-plum": "plum",
+    "color-plum": "сливовый",
    "color-purple": "фиолетовый",
    "color-red": "красный",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "кожано-коричневый",
+    "color-silver": "серебристый",
    "color-sky": "голубой",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "серо-голубой",
+    "color-white": "белый",
    "color-yellow": "желтый",
-    "unset-color": "Unset",
+    "unset-color": "Убрать",
    "comment": "Добавить комментарий",
    "comment-placeholder": "Написать комментарий",
    "comment-only": "Только комментирование",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "Это действие удалит все карточки из этого списка с доски. Чтобы просмотреть карточки в Архиве и вернуть их на доску, нажмите “Меню” > “Архив”.",
    "list-move-cards": "Переместить все карточки в этом списке",
    "list-select-cards": "Выбрать все карточки в этом списке",
+    "set-color-list": "Задать цвет",
    "listActionPopup-title": "Список действий",
    "swimlaneActionPopup-title": "Действия с дорожкой",
+    "swimlaneAddPopup-title": "Добавить дорожку ниже",
    "listImportCardPopup-title": "Импортировать Trello карточку",
    "listMorePopup-title": "Поделиться",
    "link-list": "Ссылка на список",
@@ -492,11 +494,11 @@
    "OS_Freemem": "Свободная память",
    "OS_Loadavg": "Средняя загрузка",
    "OS_Platform": "Платформа",
-    "OS_Release": "Релиз",
+    "OS_Release": "Версия ядра",
    "OS_Totalmem": "Общая память",
    "OS_Type": "Тип ОС",
    "OS_Uptime": "Время работы",
-    "days": "days",
+    "days": "дней",
    "hours": "часы",
    "minutes": "минуты",
    "seconds": "секунды",
@@ -517,7 +519,10 @@
    "card-end-on": "Завершится до",
    "editCardReceivedDatePopup-title": "Изменить дату получения",
    "editCardEndDatePopup-title": "Изменить дату завершения",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Задать цвет",
+    "setCardActionsColorPopup-title": "Выберите цвет",
+    "setSwimlaneColorPopup-title": "Выберите цвет",
+    "setListColorPopup-title": "Выберите цвет",
    "assigned-by": "Поручил",
    "requested-by": "Запросил",
    "board-delete-notice": "Удаление является постоянным. Вы потеряете все списки, карты и действия, связанные с этой доской.",
@@ -596,7 +601,7 @@
    "r-label": "метку",
    "r-member": "участника",
    "r-remove-all": "Удалить всех участников из карточки",
-    "r-set-color": "Set color to",
+    "r-set-color": "Сменить цвет на",
    "r-checklist": "контрольный список",
    "r-check-all": "Отметить все",
    "r-uncheck-all": "Снять все",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Добавить HTML после начала <body> ",
    "add-custom-html-before-body-end": "Добавить HTML до завершения </body>",
    "error-undefined": "Что-то пошло не так",
-    "error-ldap-login": "Ошибка при попытке авторизации"
+    "error-ldap-login": "Ошибка при попытке авторизации",
+    "display-authentication-method": "Показывать способ авторизации",
+    "default-authentication-method": "Способ авторизации по умолчанию"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -78,20 +78,20 @@
    "and-n-other-card": "Och __count__ annat kort",
    "and-n-other-card_plural": "Och __count__ andra kort",
    "apply": "Tillämpa",
-    "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.",
+    "app-is-offline": "Läser in, vänligen vänta. Uppdatering av sidan kommer att orsaka förlust av data. Om inläsningen inte fungerar, kontrollera att servern inte har stoppats.",
    "archive": "Flytta till Arkiv",
    "archive-all": "Flytta alla till Arkiv",
    "archive-board": "Flytta Anslagstavla till Arkiv",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
+    "archive-card": "Flytta Kort till Arkiv",
+    "archive-list": "Flytta Lista till Arkiv",
    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
-    "archived-items": "Arkivera",
-    "archived-boards": "Boards in Archive",
+    "archive-selection": "Flytta markerade till Arkiv",
+    "archiveBoardPopup-title": "Flytta Anslagstavla till Arkiv?",
+    "archived-items": "Arkiv",
+    "archived-boards": "Anslagstavlor i Arkiv",
    "restore-board": "Återställ anslagstavla",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Arkivera",
+    "no-archived-boards": "Inga anslagstavlor i Arkiv.",
+    "archives": "Arkiv",
    "assign-member": "Tilldela medlem",
    "attached": "bifogad",
    "attachment": "Bilaga",
@@ -118,12 +118,12 @@
    "board-view-lists": "Listor",
    "bucket-example": "Gilla \"att-göra-innan-jag-dör-lista\" till exempel",
    "cancel": "Avbryt",
-    "card-archived": "This card is moved to Archive.",
+    "card-archived": "Detta kort är flyttat till Arkiv.",
    "board-archived": "Den här anslagstavlan är flyttad till Arkiv.",
    "card-comments-title": "Detta kort har %s kommentar.",
    "card-delete-notice": "Ta bort är permanent. Du kommer att förlora alla åtgärder i samband med detta kort.",
    "card-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsflöde och du kommer inte att kunna öppna kortet igen. Det går inte att ångra.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Du kan flytta ett kort för att Arkiv för att ta bort det från anslagstavlan och bevara aktiviteten.",
    "card-due": "Förfaller",
    "card-due-on": "Förfaller på",
    "card-spent": "Spenderad tid",
@@ -166,13 +166,13 @@
    "clipboard": "Urklipp eller dra och släpp",
    "close": "Stäng",
    "close-board": "Stäng anslagstavla",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Du kommer att kunna återställa anslagstavlan genom att klicka på knappen \"Arkiv\" från hemrubriken.",
    "color-black": "svart",
    "color-blue": "blå",
    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-darkgreen": "mörkgrön",
+    "color-gold": "guld",
+    "color-gray": "grå",
    "color-green": "grön",
    "color-indigo": "indigo",
    "color-lime": "lime",
@@ -186,11 +186,11 @@
    "color-plum": "plum",
    "color-purple": "lila",
    "color-red": "röd",
-    "color-saddlebrown": "saddlebrown",
+    "color-saddlebrown": "sadelbrun",
    "color-silver": "silver",
    "color-sky": "himmel",
    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-white": "vit",
    "color-yellow": "gul",
    "unset-color": "Unset",
    "comment": "Kommentera",
@@ -288,7 +288,7 @@
    "filter-on-desc": "Du filtrerar kort på denna anslagstavla. Klicka här för att redigera filter.",
    "filter-to-selection": "Filter till val",
    "advanced-filter-label": "Avancerat filter",
-    "advanced-filter-description": "Avancerade Filter låter dig skriva en sträng innehållande följande operatorer: == != <= >= && || ( ). Ett mellanslag används som separator mellan operatorerna. Du kan filtrera alla specialfält genom att skriva dess namn och värde. Till exempel: Fält1 == Vårde1. Notera: om fälten eller värden innehåller mellanrum behöver du innesluta dem med enkla citatstecken. Till exempel:  'Fält 1' == 'Värde 1'. För att skippa enkla kontrolltecken (' \\/) kan du använda \\. Till exempel: Fält1 == I\\'m. Du kan även kombinera fler villkor. TIll exempel: F1 == V1 || F1 == V2. Vanligtvis läses operatorerna från vänster till höger. Du kan ändra ordning genom att använda paranteser. TIll exempel: F1 == V1 && ( F2 == V2 || F2 == V3 ). Du kan även söka efter textfält med hjälp av regex: F1 == /Tes.*/i",
+    "advanced-filter-description": "Avancerade filter låter dig skriva en sträng innehållande följande operatorer: == != <= >= && || ( ). Ett mellanslag används som separator mellan operatorerna. Du kan filtrera alla specialfält genom att skriva dess namn och värde. Till exempel: Fält1 == Vårde1. Notera: om fälten eller värden innehåller mellanrum behöver du innesluta dem med enkla citatstecken. Till exempel:  'Fält 1' == 'Värde 1'. För att skippa enkla kontrolltecken (' \\/) kan du använda \\. Till exempel: Fält1 == I\\'m. Du kan även kombinera fler villkor. TIll exempel: F1 == V1 || F1 == V2. Vanligtvis läses operatorerna från vänster till höger. Du kan ändra ordning genom att använda paranteser. TIll exempel: F1 == V1 && ( F2 == V2 || F2 == V3 ). Du kan även söka efter textfält med hjälp av regex: F1 == /Tes.*/i",
    "fullname": "Namn",
    "header-logo-title": "Gå tillbaka till din anslagstavlor-sida.",
    "hide-system-messages": "Göm systemmeddelanden",
@@ -299,20 +299,20 @@
    "import-board": "importera anslagstavla",
    "import-board-c": "Importera anslagstavla",
    "import-board-title-trello": "Importera anslagstavla från Trello",
-    "import-board-title-wekan": "Import board from previous export",
+    "import-board-title-wekan": "Importera anslagstavla från tidigare export",
    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
    "import-sandstorm-warning": "Importerad anslagstavla raderar all befintlig data på anslagstavla och ersätter den med importerat anslagstavla.",
    "from-trello": "Från Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "Från tidigare export",
    "import-board-instruction-trello": "I din Trello-anslagstavla, gå till 'Meny', sedan 'Mera', 'Skriv ut och exportera', 'Exportera JSON' och kopiera den resulterande text.",
-    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "På din anslagstavla, gå till \"Meny\", sedan \"Exportera anslagstavla\" och kopiera texten i den hämtade filen.",
    "import-board-instruction-about-errors": "Om du får fel vid import av anslagstavla, ibland importerar fortfarande fungerar, och styrelsen är på alla sidor för anslagstavlor.",
    "import-json-placeholder": "Klistra in giltigt JSON data här",
    "import-map-members": "Kartlägg medlemmar",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Din importerade anslagstavla har några medlemmar. Vänligen kartlägg medlemmarna du vill importera till dina användare",
    "import-show-user-mapping": "Granska medlemskartläggning",
    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "importMapMembersAddPopup-title": "Välj medlem",
    "info": "Version",
    "initials": "Initialer ",
    "invalid-date": "Ogiltigt datum",
@@ -331,17 +331,19 @@
    "leave-board-pop": "Är du säker på att du vill lämna __boardTitle__? Du kommer att tas bort från alla kort på den här anslagstavlan.",
    "leaveBoardPopup-title": "Lämna anslagstavla ?",
    "link-card": "Länka till detta kort",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Flytta alla kort i den här listan till Arkiv",
+    "list-archive-cards-pop": "Detta kommer att ta bort alla kort i denna lista från anslagstavlan. För att visa kort i Arkiv och få dem tillbaka till anslagstavlan, klicka på \"Meny\" > \"Arkiv\".",
    "list-move-cards": "Flytta alla kort i denna lista",
    "list-select-cards": "Välj alla kort i denna lista",
+    "set-color-list": "Ange färg",
    "listActionPopup-title": "Liståtgärder",
    "swimlaneActionPopup-title": "Simbana-åtgärder",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importera ett Trello kort",
    "listMorePopup-title": "Mera",
    "link-list": "Länk till den här listan",
    "list-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsmatningen och du kommer inte att kunna återställa listan. Det går inte att ångra.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Du kan flytta en lista till Arkiv för att ta bort den från anslagstavlan och bevara aktiviteten.",
    "lists": "Listor",
    "swimlanes": "Simbanor ",
    "log-out": "Logga ut",
@@ -361,8 +363,8 @@
    "muted-info": "Du kommer aldrig att meddelas om eventuella ändringar i denna anslagstavla",
    "my-boards": "Mina anslagstavlor",
    "name": "Namn",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
+    "no-archived-cards": "Inga kort i Arkiv.",
+    "no-archived-lists": "Inga listor i Arkiv.",
    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "Inga reslutat",
    "normal": "Normal",
@@ -443,7 +445,7 @@
    "uploaded-avatar": "Laddade upp en avatar",
    "username": "Änvandarnamn",
    "view-it": "Visa det",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "varning: detta kort finns i en lista i Arkiv",
    "watch": "Bevaka",
    "watching": "Bevakar",
    "watching-info": "Du kommer att meddelas om alla ändringar på denna anslagstavla",
@@ -496,7 +498,7 @@
    "OS_Totalmem": "OS totalt minne",
    "OS_Type": "OS Typ",
    "OS_Uptime": "OS drifttid",
-    "days": "days",
+    "days": "dagar",
    "hours": "timmar",
    "minutes": "minuter",
    "seconds": "sekunder",
@@ -517,7 +519,10 @@
    "card-end-on": "Slutar den",
    "editCardReceivedDatePopup-title": "Ändra mottagningsdatum",
    "editCardEndDatePopup-title": "Ändra slutdatum",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Ange färg",
+    "setCardActionsColorPopup-title": "Välj en färg",
+    "setSwimlaneColorPopup-title": "Välj en färg",
+    "setListColorPopup-title": "Välj en färg",
    "assigned-by": "Tilldelad av",
    "requested-by": "Efterfrågad av",
    "board-delete-notice": "Borttagningen är permanent. Du kommer förlora alla listor, kort och händelser kopplade till den här anslagstavlan.",
@@ -554,30 +559,30 @@
    "r-add-rule": "Lägg till regel",
    "r-view-rule": "Visa regel",
    "r-delete-rule": "Ta bort regel",
-    "r-new-rule-name": "New rule title",
+    "r-new-rule-name": "Ny titel på regel",
    "r-no-rules": "Inga regler",
-    "r-when-a-card": "When a card",
+    "r-when-a-card": "När ett kort",
    "r-is": "är",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-is-moved": "är flyttad",
+    "r-added-to": "tillagd till",
    "r-removed-from": "Borttagen från",
    "r-the-board": "anslagstavlan",
    "r-list": "lista",
-    "set-filter": "Set Filter",
+    "set-filter": "Ställ in filter",
    "r-moved-to": "Flyttad till",
    "r-moved-from": "Flyttad från",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
+    "r-archived": "Flyttad till Arkiv",
+    "r-unarchived": "Återställd från Arkiv",
    "r-a-card": "ett kort",
    "r-when-a-label-is": "När en etikett är",
    "r-when-the-label-is": "När etiketten är",
-    "r-list-name": "list name",
+    "r-list-name": "listnamn",
    "r-when-a-member": "När en medlem är",
    "r-when-the-member": "När medlemmen",
    "r-name": "namn",
-    "r-when-a-attach": "When an attachment",
-    "r-when-a-checklist": "When a checklist is",
-    "r-when-the-checklist": "When the checklist",
+    "r-when-a-attach": "När en bilaga",
+    "r-when-a-checklist": "När en checklista är",
+    "r-when-the-checklist": "När checklistan",
    "r-completed": "Avslutad",
    "r-made-incomplete": "Made incomplete",
    "r-when-a-item": "When a checklist item is",
@@ -617,8 +622,8 @@
    "r-d-send-email-to": "till",
    "r-d-send-email-subject": "ämne",
    "r-d-send-email-message": "meddelande",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
+    "r-d-archive": "Flytta kortet till Arkiv",
+    "r-d-unarchive": "Återställ kortet från Arkiv",
    "r-d-add-label": "Lägg till etikett",
    "r-d-remove-label": "Ta bort etikett",
    "r-create-card": "Create new card",
@@ -634,7 +639,7 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Lägg till checklista",
    "r-d-remove-checklist": "Ta bort checklista",
-    "r-by": "by",
+    "r-by": "av",
    "r-add-checklist": "Lägg till checklista",
    "r-with-items": "with items",
    "r-items-list": "item1,item2,item3",
@@ -653,6 +658,8 @@
    "hide-logo": "Dölj logotypen",
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
-    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-undefined": "Något gick fel",
+    "error-ldap-login": "Ett fel uppstod när du försökte logga in",
+    "display-authentication-method": "Visa autentiseringsmetod",
+    "default-authentication-method": "Standard autentiseringsmetod"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -1,5 +1,5 @@
 {
-    "accept": "Accept",
+    "accept": "ஏற்றுக்கொள்",
    "act-activity-notify": "Activity Notification",
    "act-addAttachment": "attached __attachment__ to __card__",
    "act-addSubtask": "added subtask __checklist__ to __card__",
@@ -31,17 +31,17 @@
    "activity-added": "added %s to %s",
    "activity-archived": "%s moved to Archive",
    "activity-attached": "attached %s to %s",
-    "activity-created": "created %s",
+    "activity-created": "உருவாக்கப்பட்டது ",
    "activity-customfield-created": "created custom field %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-joined": "சேர்ந்தது ",
    "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-unjoined": "பிரிக்கப்பட்டது ",
    "activity-subtask-added": "added subtask to %s",
    "activity-checked-item": "checked %s in checklist %s of %s",
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
@@ -51,7 +51,7 @@
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "added checklist item to '%s' in %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
-    "add": "Add",
+    "add": "சேர் ",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
    "activity-checklist-completed-card": "completed the checklist %s",
@@ -94,14 +94,14 @@
    "archives": "Archive",
    "assign-member": "Assign member",
    "attached": "attached",
-    "attachment": "Attachment",
+    "attachment": "இணைப்பு ",
    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
    "attachmentDeletePopup-title": "Delete Attachment?",
-    "attachments": "Attachments",
+    "attachments": "இணைப்புகள் ",
    "auto-watch": "Automatically watch boards when they are created",
    "avatar-too-big": "The avatar is too large (70KB max)",
-    "back": "Back",
-    "board-change-color": "Change color",
+    "back": "பின்செல் ",
+    "board-change-color": "நிறம் மாற்று ",
    "board-nb-stars": "%s stars",
    "board-not-found": "Board not found",
    "board-private-info": "This board will be <strong>private</strong>.",
@@ -113,7 +113,7 @@
    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "நாள்கட்டி ",
    "board-view-swimlanes": "Swimlanes",
    "board-view-lists": "Lists",
    "bucket-example": "Like “Bucket List” for example",
@@ -142,7 +142,7 @@
    "cardDetailsActionsPopup-title": "Card Actions",
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Members",
-    "cardMorePopup-title": "More",
+    "cardMorePopup-title": "மேலும் ",
    "cards": "Cards",
    "cards-count": "Cards",
    "casSignIn": "Sign In with CAS",
@@ -151,12 +151,12 @@
    "cardType-linkedBoard": "Linked Board",
    "change": "Change",
    "change-avatar": "Change Avatar",
-    "change-password": "Change Password",
+    "change-password": "கடவுச்சொல்லை மாற்று ",
    "change-permissions": "Change permissions",
    "change-settings": "Change Settings",
    "changeAvatarPopup-title": "Change Avatar",
    "changeLanguagePopup-title": "Change Language",
-    "changePasswordPopup-title": "Change Password",
+    "changePasswordPopup-title": "கடவுச்சொல்லை மாற்றுக ",
    "changePermissionsPopup-title": "Change Permissions",
    "changeSettingsPopup-title": "Change Settings",
    "subtasks": "Subtasks",
@@ -170,36 +170,36 @@
    "color-black": "black",
    "color-blue": "blue",
    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
+    "color-darkgreen": "அடர் பச்சை ",
+    "color-gold": "தங்கம் ",
    "color-gray": "gray",
-    "color-green": "green",
+    "color-green": "பச்சை ",
    "color-indigo": "indigo",
-    "color-lime": "lime",
+    "color-lime": "வெளிர் பச்சை ",
    "color-magenta": "magenta",
    "color-mistyrose": "mistyrose",
    "color-navy": "navy",
-    "color-orange": "orange",
+    "color-orange": "ஆரஞ்சு ",
    "color-paleturquoise": "paleturquoise",
    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
    "color-plum": "plum",
    "color-purple": "purple",
-    "color-red": "red",
+    "color-red": "சிகப்பு ",
    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
-    "color-sky": "sky",
+    "color-silver": "வெள்ளி ",
+    "color-sky": "வாணம் ",
    "color-slateblue": "slateblue",
-    "color-white": "white",
-    "color-yellow": "yellow",
+    "color-white": "வெள்ளை ",
+    "color-yellow": "மஞ்சள் ",
    "unset-color": "Unset",
-    "comment": "Comment",
+    "comment": "கருத்து ",
    "comment-placeholder": "Write Comment",
-    "comment-only": "Comment only",
+    "comment-only": "கருத்து மட்டும் ",
    "comment-only-desc": "Can comment on cards only.",
-    "no-comments": "No comments",
+    "no-comments": "கருத்து இல்லை ",
    "no-comments-desc": "Can not see comments and activities.",
-    "computer": "Computer",
+    "computer": "கணினி ",
    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
@@ -209,7 +209,7 @@
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
-    "create": "Create",
+    "create": "உருவாக்கு ",
    "createBoardPopup-title": "Create Board",
    "chooseBoardSourcePopup-title": "Import board",
    "createLabelPopup-title": "Create Label",
@@ -218,16 +218,16 @@
    "current": "current",
    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
    "custom-field-checkbox": "Checkbox",
-    "custom-field-date": "Date",
+    "custom-field-date": "நாள் ",
    "custom-field-dropdown": "Dropdown List",
    "custom-field-dropdown-none": "(none)",
    "custom-field-dropdown-options": "List Options",
    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
    "custom-field-dropdown-unknown": "(unknown)",
-    "custom-field-number": "Number",
+    "custom-field-number": "எண் ",
    "custom-field-text": "Text",
    "custom-fields": "Custom Fields",
-    "date": "Date",
+    "date": "நாள் ",
    "decline": "Decline",
    "default-avatar": "Default avatar",
    "delete": "Delete",
@@ -238,8 +238,8 @@
    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
    "discard": "Discard",
    "done": "Done",
-    "download": "Download",
-    "edit": "Edit",
+    "download": "பதிவிறக்கம் ",
+    "edit": "திருத்து ",
    "edit-avatar": "Change Avatar",
    "edit-profile": "Edit Profile",
    "edit-wip-limit": "Edit WIP Limit",
@@ -251,7 +251,7 @@
    "editLabelPopup-title": "Change Label",
    "editNotificationPopup-title": "Edit Notification",
    "editProfilePopup-title": "Edit Profile",
-    "email": "Email",
+    "email": "மின் அஞ்சல் ",
    "email-enrollAccount-subject": "An account created for you on __siteName__",
    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
    "email-fail": "Sending email failed",
@@ -289,20 +289,20 @@
    "filter-to-selection": "Filter to selection",
    "advanced-filter-label": "Advanced Filter",
    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
-    "fullname": "Full Name",
+    "fullname": "முழு பெயர் ",
    "header-logo-title": "Go back to your boards page.",
    "hide-system-messages": "Hide system messages",
    "headerBarCreateBoardPopup-title": "Create Board",
-    "home": "Home",
-    "import": "Import",
-    "link": "Link",
+    "home": "தொடக்கம் ",
+    "import": "பதிவேற்றம் ",
+    "link": "இணை ",
    "import-board": "import board",
    "import-board-c": "Import board",
    "import-board-title-trello": "Import board from Trello",
    "import-board-title-wekan": "Import board from previous export",
    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
+    "from-trello": "Trello ல் இருந்து ",
    "from-wekan": "From previous export",
    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
@@ -325,7 +325,7 @@
    "label-default": "%s label (default)",
    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
    "labels": "Labels",
-    "language": "Language",
+    "language": "மொழி ",
    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
    "leave-board": "Leave Board",
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
@@ -335,10 +335,12 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "நிறத்தை மாற்று ",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
-    "listMorePopup-title": "More",
+    "listMorePopup-title": "மேலும் ",
    "link-list": "Link to this list",
    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
@@ -360,7 +362,7 @@
    "muted": "Muted",
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
-    "name": "Name",
+    "name": "பெயர் ",
    "no-archived-cards": "No cards in Archive.",
    "no-archived-lists": "No lists in Archive.",
    "no-archived-swimlanes": "No swimlanes in Archive.",
@@ -374,16 +376,16 @@
    "or": "or",
    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
    "page-not-found": "Page not found.",
-    "password": "Password",
+    "password": "கடவுச்சொல் ",
    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
    "participating": "Participating",
    "preview": "Preview",
    "previewAttachedImagePopup-title": "Preview",
    "previewClipboardImagePopup-title": "Preview",
-    "private": "Private",
+    "private": "தனியார் ",
    "private-desc": "This board is private. Only people added to the board can view and edit it.",
    "profile": "Profile",
-    "public": "Public",
+    "public": "பொது ",
    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
    "quick-access-description": "Star a board to add a shortcut in this bar.",
    "remove-cover": "Remove Cover",
@@ -394,11 +396,11 @@
    "remove-member-from-card": "Remove from Card",
    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
    "removeMemberPopup-title": "Remove Member?",
-    "rename": "Rename",
+    "rename": "பெயர்மாற்றம் ",
    "rename-board": "Rename Board",
    "restore": "Restore",
-    "save": "Save",
-    "search": "Search",
+    "save": "சேமி ",
+    "search": "தேடு ",
    "rules": "Rules",
    "search-cards": "Search from card titles and descriptions on this board",
    "search-example": "Text to search for?",
@@ -421,8 +423,8 @@
    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
    "starred-boards": "Starred Boards",
    "starred-boards-description": "Starred boards show up at the top of your boards list.",
-    "subscribe": "Subscribe",
-    "team": "Team",
+    "subscribe": "சந்தா ",
+    "team": "குழு ",
    "this-board": "this board",
    "this-card": "this card",
    "spent-time-hours": "Spent time (hours)",
@@ -460,7 +462,7 @@
    "people": "People",
    "registration": "Registration",
    "disable-self-registration": "Disable Self-Registration",
-    "invite": "Invite",
+    "invite": "அழைப்பு ",
    "invite-people": "Invite People",
    "to-boards": "To board(s)",
    "email-addresses": "Email Addresses",
@@ -470,10 +472,10 @@
    "smtp-host": "SMTP Host",
    "smtp-port": "SMTP Port",
    "smtp-username": "Username",
-    "smtp-password": "Password",
+    "smtp-password": "கடவுச்சொல் ",
    "smtp-tls": "TLS support",
-    "send-from": "From",
-    "send-smtp-test": "Send a test email to yourself",
+    "send-from": "அனுப்புனர் ",
+    "send-smtp-test": "சோதனை மின்னஞ்சல் அணுப்புக ",
    "invitation-code": "Invitation Code",
    "email-invite-register-subject": "__inviter__ sent you an invitation",
    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
@@ -513,11 +515,14 @@
    "active": "Active",
    "card-received": "Received",
    "card-received-on": "Received on",
-    "card-end": "End",
+    "card-end": "முடிவு ",
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -591,7 +596,7 @@
    "r-archive": "Move to Archive",
    "r-unarchive": "Restore from Archive",
    "r-card": "card",
-    "r-add": "Add",
+    "r-add": "சேர் ",
    "r-remove": "Remove",
    "r-label": "label",
    "r-member": "member",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "ย้ายการ์ดทั้งหมดในรายการนี้",
    "list-select-cards": "เลือกการ์ดทั้งหมดในรายการนี้",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "รายการการดำเนิน",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "นำเข้าการ์ด Trello",
    "listMorePopup-title": "เพิ่มเติม",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Listedeki tüm kartları taşı",
    "list-select-cards": "Listedeki tüm kartları seç",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Liste İşlemleri",
    "swimlaneActionPopup-title": "Kulvar İşlemleri",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Bir Trello kartını içeri aktar",
    "listMorePopup-title": "Daha",
    "link-list": "Listeye doğrudan bağlantı",
@@ -517,7 +519,10 @@
    "card-end-on": "Bitiş zamanı",
    "editCardReceivedDatePopup-title": "Giriş tarihini değiştir",
    "editCardEndDatePopup-title": "Bitiş tarihini değiştir",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "renk ayarla",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Atamayı yapan",
    "requested-by": "Talep Eden",
    "board-delete-notice": "Silme kalıcıdır. Bu kartla ilişkili tüm listeleri, kartları ve işlemleri kaybedeceksiniz.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Bir şeyler yanlış gitti",
-    "error-ldap-login": "Giriş yapmaya çalışırken bir hata oluştu"
+    "error-ldap-login": "Giriş yapmaya çalışırken bir hata oluştu",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "More",
    "link-list": "Link to this list",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -2,7 +2,7 @@
    "accept": "接受",
    "act-activity-notify": "活动通知",
    "act-addAttachment": "添加附件 __attachment__ 至卡片 __card__",
-    "act-addSubtask": "添加清单 __checklist__ 到__card__",
+    "act-addSubtask": "添加子任务 __checklist__ 到__card__",
    "act-addChecklist": "添加清单 __checklist__ 到 __card__",
    "act-addChecklistItem": "向  __card__ 中的清单 __checklist__ 添加 __checklistItem__",
    "act-addComment": "在 __card__ 发布评论: __comment__",
@@ -169,30 +169,30 @@
    "close-board-pop": "您可以通过主页头部的“归档”按钮，来恢复看板。",
    "color-black": "黑色",
    "color-blue": "蓝色",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "深红",
+    "color-darkgreen": "墨绿",
+    "color-gold": "金",
+    "color-gray": "灰",
    "color-green": "绿色",
-    "color-indigo": "indigo",
+    "color-indigo": "靛蓝",
    "color-lime": "绿黄",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "洋红",
+    "color-mistyrose": "玫瑰红",
+    "color-navy": "藏青",
    "color-orange": "橙色",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "宝石绿",
+    "color-peachpuff": "桃红",
    "color-pink": "粉红",
-    "color-plum": "plum",
+    "color-plum": "紫红",
    "color-purple": "紫色",
    "color-red": "红色",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "棕褐",
+    "color-silver": "银",
    "color-sky": "天蓝",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "石板蓝",
+    "color-white": "白",
    "color-yellow": "黄色",
-    "unset-color": "Unset",
+    "unset-color": "复原",
    "comment": "评论",
    "comment-placeholder": "添加评论",
    "comment-only": "仅能评论",
@@ -335,8 +335,10 @@
    "list-archive-cards-pop": "将移动看板中列表的所有卡片，查看或回复归档中的卡片，点击“菜单”->“归档”",
    "list-move-cards": "移动列表中的所有卡片",
    "list-select-cards": "选择列表中的所有卡片",
+    "set-color-list": "设置颜色",
    "listActionPopup-title": "列表操作",
    "swimlaneActionPopup-title": "泳道图操作",
+    "swimlaneAddPopup-title": "在下面添加一个泳道",
    "listImportCardPopup-title": "导入 Trello 卡片",
    "listMorePopup-title": "更多",
    "link-list": "关联到这个列表",
@@ -517,7 +519,10 @@
    "card-end-on": "终止于",
    "editCardReceivedDatePopup-title": "修改接收日期",
    "editCardEndDatePopup-title": "修改终止日期",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "设置颜色",
+    "setCardActionsColorPopup-title": "选择一种颜色",
+    "setSwimlaneColorPopup-title": "选择一种颜色",
+    "setListColorPopup-title": "选择一种颜色",
    "assigned-by": "分配人",
    "requested-by": "需求人",
    "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。",
@@ -596,7 +601,7 @@
    "r-label": "标签",
    "r-member": "成员",
    "r-remove-all": "从卡片移除所有成员",
-    "r-set-color": "Set color to",
+    "r-set-color": "设置颜色",
    "r-checklist": "清单",
    "r-check-all": "勾选所有",
    "r-uncheck-all": "取消勾选所有",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "添加定制的HTML在开始<body>之前",
    "add-custom-html-before-body-end": "添加定制的HTML在结束</body>之后",
    "error-undefined": "出了点问题",
-    "error-ldap-login": "尝试登陆时出错"
+    "error-ldap-login": "尝试登陆时出错",
+    "display-authentication-method": "显示认证方式",
+    "default-authentication-method": "缺省认证方式"
 }
@@ -1,51 +1,51 @@
 {
    "accept": "接受",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "已新增附件__attachment__至__card__",
-    "act-addSubtask": "已新增子任務__checklist__至__card__",
-    "act-addChecklist": "已新增待辦清單__checklist__至__card__",
-    "act-addChecklistItem": "已新增__checklistItem__到__card__中的待辦清單__checklist__",
-    "act-addComment": "已評論__card__: __comment__",
+    "act-activity-notify": "活動通知",
+    "act-addAttachment": "已新增附件 __attachment__ 到 __card__",
+    "act-addSubtask": "已新增子任務 __checklist__ 到 __card__",
+    "act-addChecklist": "已新增待辦清單 __checklist__ 到 __card__",
+    "act-addChecklistItem": "已新增 __checklistItem__ 到 __card__ 中的待辦清單 __checklist__",
+    "act-addComment": "已評論 __card__： __comment__",
    "act-createBoard": "已新增 __board__",
-    "act-createCard": "已將__card__加入__list__",
-    "act-createCustomField": "已新增自訂欄位__customField__",
-    "act-createList": "已新增__list__至__board__",
-    "act-addBoardMember": "已在__board__中新增成員__member__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "已匯入__board__",
-    "act-importCard": "已匯入__card__",
-    "act-importList": "已匯入__list__",
-    "act-joinMember": "已在__card__中新增成員__member__",
-    "act-moveCard": "已將__card__從__oldList__移動至__list__",
-    "act-removeBoardMember": "已從__board__中移除成員__member__",
-    "act-restoredCard": "已將__card__回復至__board__",
-    "act-unjoinMember": "已從__card__中移除成員__member__",
+    "act-createCard": "已將 __card__ 加入 __list__",
+    "act-createCustomField": "已新增自訂欄位 __customField__",
+    "act-createList": "已新增 __list__ 到 __board__",
+    "act-addBoardMember": "已在 __board__ 中新增成員 __member__",
+    "act-archivedBoard": "__board__ 已被移到封存",
+    "act-archivedCard": "__card__ 已被移到封存",
+    "act-archivedList": "__list__ 已被移到封存",
+    "act-archivedSwimlane": "__swimlane__ 已被移到封存",
+    "act-importBoard": "已匯入 __board__",
+    "act-importCard": "已匯入 __card__",
+    "act-importList": "已匯入 __list__",
+    "act-joinMember": "已在 __card__ 中新增成員 __member__",
+    "act-moveCard": "已將 __card__ 從 __oldList__ 移到 __list__",
+    "act-removeBoardMember": "已從 __board__ 中移除成員 __member__",
+    "act-restoredCard": "已將 __card__ 回復到 __board__",
+    "act-unjoinMember": "已從 __card__ 中移除成員 __member__",
    "act-withBoardTitle": "__board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "操作",
    "activities": "活動",
    "activity": "活動",
-    "activity-added": "新增 %s 至 %s",
-    "activity-archived": "%s moved to Archive",
-    "activity-attached": "已新增附件 %s 至 %s",
+    "activity-added": "新增 %s 到 %s",
+    "activity-archived": "%s 已被移到封存",
+    "activity-attached": "已新增附件 %s 到 %s",
    "activity-created": "建立 %s",
-    "activity-customfield-created": "created custom field %s",
+    "activity-customfield-created": "已建立的自訂欄位 %s",
    "activity-excluded": "排除 %s 從 %s",
-    "activity-imported": "匯入 %s 至 %s 從 %s 中",
+    "activity-imported": "匯入 %s 到 %s 從 %s 中",
    "activity-imported-board": "已匯入 %s 從 %s 中",
-    "activity-joined": "關聯 %s",
-    "activity-moved": "將 %s 從 %s 移動到 %s",
+    "activity-joined": "已關聯 %s",
+    "activity-moved": "將 %s 從 %s 移到 %s",
    "activity-on": "在 %s",
-    "activity-removed": "移除 %s 從 %s 中",
-    "activity-sent": "寄送 %s 至 %s",
-    "activity-unjoined": "解除關聯 %s",
-    "activity-subtask-added": "added subtask to %s",
+    "activity-removed": "已移除 %s 從 %s 中",
+    "activity-sent": "已寄送 %s 到 %s",
+    "activity-unjoined": "已解除關聯 %s",
+    "activity-subtask-added": "已新增子任務到 %s",
    "activity-checked-item": "checked %s in checklist %s of %s",
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
-    "activity-checklist-added": "新增待辦清單至 %s",
+    "activity-checklist-added": "已新增待辦清單到 %s",
    "activity-checklist-removed": "removed a checklist from %s",
    "activity-checklist-completed": "completed the checklist %s of %s",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
@@ -59,8 +59,8 @@
    "add-attachment": "新增附件",
    "add-board": "新增看板",
    "add-card": "新增卡片",
-    "add-swimlane": "Add Swimlane",
-    "add-subtask": "Add Subtask",
+    "add-swimlane": "新增泳道圖",
+    "add-subtask": "新增子任務",
    "add-checklist": "新增待辦清單",
    "add-checklist-item": "新增項目",
    "add-cover": "新增封面",
@@ -72,166 +72,166 @@
    "admin": "管理員",
    "admin-desc": "可以瀏覽並編輯卡片，移除成員，並且更改該看板的設定",
    "admin-announcement": "公告",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
+    "admin-announcement-active": "啟用全系統範圍公告",
+    "admin-announcement-title": "來自 Administrator 的公告",
    "all-boards": "全部看板",
    "and-n-other-card": "和其他 __count__ 個卡片",
    "and-n-other-card_plural": "和其他 __count__ 個卡片",
    "apply": "送出",
-    "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",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
-    "archived-items": "刪除",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "請稍候，資料讀取中，重整頁面可能會導致資料遺失。如果讀取一直沒有進度, 請檢查伺服器是否還在運行。",
+    "archive": "移到封存",
+    "archive-all": "全部移到封存",
+    "archive-board": "將看板移到封存",
+    "archive-card": "將卡片移到封存",
+    "archive-list": "將清單移到封存",
+    "archive-swimlane": "將泳道圖移到封存",
+    "archive-selection": "將選取內容移到封存",
+    "archiveBoardPopup-title": "將看板移到封存？",
+    "archived-items": "封存",
+    "archived-boards": "封存中的看板",
    "restore-board": "還原看板",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "刪除",
+    "no-archived-boards": "封存中沒有看板。",
+    "archives": "封存",
    "assign-member": "分配成員",
    "attached": "附加",
    "attachment": "附件",
    "attachment-delete-pop": "刪除附件的操作無法還原。",
    "attachmentDeletePopup-title": "刪除附件？",
    "attachments": "附件",
-    "auto-watch": "新增看板時自動加入觀察",
-    "avatar-too-big": "頭像檔案太大 (最大 70 KB)",
+    "auto-watch": "新增看板時自動加入觀看",
+    "avatar-too-big": "頭像檔案太大（最大 70 KB）",
    "back": "返回",
-    "board-change-color": "更改顏色",
+    "board-change-color": "更換顏色",
    "board-nb-stars": "%s 星號標記",
    "board-not-found": "看板不存在",
-    "board-private-info": "該看板將被設為 <strong>私有</strong>.",
-    "board-public-info": "該看板將被設為 <strong>公開</strong>.",
-    "boardChangeColorPopup-title": "修改看板背景",
+    "board-private-info": "此看板將被設為 <strong>私密</strong>.",
+    "board-public-info": "此看板將被設為 <strong>公開</strong>.",
+    "boardChangeColorPopup-title": "更換看板背景",
    "boardChangeTitlePopup-title": "重新命名看板",
-    "boardChangeVisibilityPopup-title": "更改可視級別",
+    "boardChangeVisibilityPopup-title": "改變觀看權限",
    "boardChangeWatchPopup-title": "更改觀察",
    "boardMenuPopup-title": "看板選單",
    "boards": "看板",
-    "board-view": "Board View",
-    "board-view-cal": "Calendar",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "看板視圖",
+    "board-view-cal": "行事曆",
+    "board-view-swimlanes": "泳道圖",
    "board-view-lists": "清單",
-    "bucket-example": "例如 “目標清單”",
+    "bucket-example": "例如「目標清單」",
    "cancel": "取消",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "此卡片已移到封存。",
+    "board-archived": "此看板已移到封存。",
    "card-comments-title": "該卡片有 %s 則評論",
-    "card-delete-notice": "徹底刪除的操作不可復原，你將會遺失該卡片相關的所有操作記錄。",
-    "card-delete-pop": "所有的動作將從活動動態中被移除且您將無法重新打開該卡片。此操作無法復原。",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
-    "card-due": "到期",
-    "card-due-on": "到期",
-    "card-spent": "Spent Time",
+    "card-delete-notice": "刪除是永久性的，您將遺失該卡片的所有相關操作記錄。",
+    "card-delete-pop": "所有活動中的內容都將被刪除，此操作無法撤消，您將無法重新開啟此卡片。",
+    "card-delete-suggest-archive": "您可以將卡片移到封存來將卡片從看板上移除，並且保留其中的活動。",
+    "card-due": "期限",
+    "card-due-on": "期限日",
+    "card-spent": "耗費時間",
    "card-edit-attachments": "編輯附件",
-    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-custom-fields": "編輯自訂欄位",
    "card-edit-labels": "編輯標籤",
    "card-edit-members": "編輯成員",
    "card-labels-title": "更改該卡片上的標籤",
    "card-members-title": "在該卡片中新增或移除看板成員",
    "card-start": "開始",
-    "card-start-on": "開始",
+    "card-start-on": "開始日",
    "cardAttachmentsPopup-title": "附件來源",
-    "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
-    "cardDeletePopup-title": "徹底刪除卡片？",
+    "cardCustomField-datePopup-title": "更改日期",
+    "cardCustomFieldsPopup-title": "編輯自訂欄位",
+    "cardDeletePopup-title": "刪除卡片？",
    "cardDetailsActionsPopup-title": "卡片動作",
    "cardLabelsPopup-title": "標籤",
    "cardMembersPopup-title": "成員",
    "cardMorePopup-title": "更多",
    "cards": "卡片",
    "cards-count": "卡片",
-    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Card",
-    "cardType-linkedCard": "Linked Card",
-    "cardType-linkedBoard": "Linked Board",
+    "casSignIn": "以 CAS 登入",
+    "cardType-card": "卡片",
+    "cardType-linkedCard": "已連結卡片",
+    "cardType-linkedBoard": "已連結看板",
    "change": "變更",
-    "change-avatar": "更改大頭貼",
-    "change-password": "更改密碼",
+    "change-avatar": "更換大頭貼",
+    "change-password": "變更密碼",
    "change-permissions": "更改許可權",
    "change-settings": "更改設定",
-    "changeAvatarPopup-title": "更改大頭貼",
+    "changeAvatarPopup-title": "更換大頭貼",
    "changeLanguagePopup-title": "更改語言",
-    "changePasswordPopup-title": "更改密碼",
+    "changePasswordPopup-title": "變更密碼",
    "changePermissionsPopup-title": "更改許可權",
    "changeSettingsPopup-title": "更改設定",
-    "subtasks": "Subtasks",
+    "subtasks": "子任務",
    "checklists": "待辦清單",
-    "click-to-star": "點此來標記該看板",
-    "click-to-unstar": "點此來去除該看板的標記",
+    "click-to-star": "點擊以添加標記於此看板。",
+    "click-to-unstar": "點擊以移除標記於此看板。",
    "clipboard": "剪貼簿貼上或者拖曳檔案",
    "close": "關閉",
    "close-board": "關閉看板",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "您可以通過點擊主頁眉中的「封存」按鈕來恢復看板。",
    "color-black": "黑色",
    "color-blue": "藍色",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "艷紅",
+    "color-darkgreen": "暗綠",
+    "color-gold": "金色",
+    "color-gray": "灰色",
    "color-green": "綠色",
-    "color-indigo": "indigo",
+    "color-indigo": "紫藍",
    "color-lime": "綠黃",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "洋紅",
+    "color-mistyrose": "玫瑰粉",
+    "color-navy": "藏青",
    "color-orange": "橙色",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "淡藍綠",
+    "color-peachpuff": "桃色",
    "color-pink": "粉紅",
-    "color-plum": "plum",
+    "color-plum": "梅色",
    "color-purple": "紫色",
    "color-red": "紅色",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "馬鞍棕",
+    "color-silver": "銀色",
    "color-sky": "天藍",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "青藍",
+    "color-white": "白色",
    "color-yellow": "黃色",
-    "unset-color": "Unset",
-    "comment": "留言",
-    "comment-placeholder": "新增評論",
-    "comment-only": "只可以發表評論",
-    "comment-only-desc": "只可以對卡片發表評論",
-    "no-comments": "No comments",
-    "no-comments-desc": "Can not see comments and activities.",
+    "unset-color": "未設置",
+    "comment": "評論",
+    "comment-placeholder": "撰寫評論",
+    "comment-only": "只能發表評論",
+    "comment-only-desc": "只能在卡片上發表評論",
+    "no-comments": "沒有評論",
+    "no-comments-desc": "無法檢視評論和活動。",
    "computer": "從本機上傳",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
-    "copy-card-link-to-clipboard": "將卡片連結複製到剪貼板",
-    "linkCardPopup-title": "Link Card",
-    "searchCardPopup-title": "Search Card",
-    "copyCardPopup-title": "Copy Card",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "confirm-subtask-delete-dialog": "你確定要刪除子任務嗎？",
+    "confirm-checklist-delete-dialog": "你確定要刪除待辦清單嗎？",
+    "copy-card-link-to-clipboard": "將卡片連結複製到剪貼簿",
+    "linkCardPopup-title": "連結卡片",
+    "searchCardPopup-title": "搜尋卡片",
+    "copyCardPopup-title": "複製卡片",
+    "copyChecklistToManyCardsPopup-title": "複製待辦清單的樣板到多個卡片",
+    "copyChecklistToManyCardsPopup-instructions": "使用此 JSON 格式來表示目標卡片的標題和描述",
+    "copyChecklistToManyCardsPopup-format": "[ {\\\"title\\\": \\\"第一個卡片標題\\\", \\\"description\\\":\\\"第一個卡片描述\\\"}, {\\\"title\\\":\\\"第二個卡片標題\\\",\\\"description\\\":\\\"第二個卡片描述\\\"},{\\\"title\\\":\\\"最後一個卡片標題\\\",\\\"description\\\":\\\"最後一個卡片描述\\\"} ]",
    "create": "建立",
    "createBoardPopup-title": "建立看板",
    "chooseBoardSourcePopup-title": "匯入看板",
    "createLabelPopup-title": "建立標籤",
-    "createCustomField": "Create Field",
-    "createCustomFieldPopup-title": "Create Field",
+    "createCustomField": "建立欄位",
+    "createCustomFieldPopup-title": "建立欄位",
    "current": "目前",
-    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
-    "custom-field-checkbox": "Checkbox",
+    "custom-field-delete-pop": "此操作將會從所有卡片中移除自訂欄位以及銷毀歷史紀錄，並且無法撤消。",
+    "custom-field-checkbox": "複選框",
    "custom-field-date": "日期",
-    "custom-field-dropdown": "Dropdown List",
-    "custom-field-dropdown-none": "(none)",
-    "custom-field-dropdown-options": "List Options",
-    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
-    "custom-field-dropdown-unknown": "(unknown)",
-    "custom-field-number": "Number",
-    "custom-field-text": "Text",
-    "custom-fields": "Custom Fields",
+    "custom-field-dropdown": "下拉式選單",
+    "custom-field-dropdown-none": "（無）",
+    "custom-field-dropdown-options": "清單選項",
+    "custom-field-dropdown-options-placeholder": "按下 Enter 新增更多選項",
+    "custom-field-dropdown-unknown": "（未知）",
+    "custom-field-number": "數字",
+    "custom-field-text": "文字",
+    "custom-fields": "自訂欄位",
    "date": "日期",
    "decline": "拒絕",
    "default-avatar": "預設大頭貼",
    "delete": "刪除",
-    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteCustomFieldPopup-title": "刪除自訂欄位？",
    "deleteLabelPopup-title": "刪除標籤？",
    "description": "描述",
    "disambiguateMultiLabelPopup-title": "清除標籤動作歧義",
@@ -240,22 +240,22 @@
    "done": "完成",
    "download": "下載",
    "edit": "編輯",
-    "edit-avatar": "更改大頭貼",
-    "edit-profile": "編輯資料",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
-    "editCardStartDatePopup-title": "更改開始日期",
-    "editCardDueDatePopup-title": "更改到期日期",
-    "editCustomFieldPopup-title": "Edit Field",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "edit-avatar": "更換大頭貼",
+    "edit-profile": "編輯個人資料",
+    "edit-wip-limit": "編輯 WIP 限制",
+    "soft-wip-limit": "軟性 WIP 限制",
+    "editCardStartDatePopup-title": "變更開始日期",
+    "editCardDueDatePopup-title": "變更到期日期",
+    "editCustomFieldPopup-title": "編輯欄位",
+    "editCardSpentTimePopup-title": "變更耗費時間",
    "editLabelPopup-title": "更改標籤",
    "editNotificationPopup-title": "更改通知",
-    "editProfilePopup-title": "編輯資料",
+    "editProfilePopup-title": "編輯個人資料",
    "email": "電子郵件",
    "email-enrollAccount-subject": "您在 __siteName__ 的帳號已經建立",
    "email-enrollAccount-text": "親愛的 __user__,\n\n點選下面的連結，即刻開始使用這項服務。\n\n__url__\n\n謝謝。",
    "email-fail": "郵件寄送失敗",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "嘗試發送郵件時出現錯誤",
    "email-invalid": "電子郵件地址錯誤",
    "email-invite": "寄送郵件邀請",
    "email-invite-subject": "__inviter__ 向您發出邀請",
@@ -277,17 +277,17 @@
    "error-user-notCreated": "該使用者未能成功建立",
    "error-username-taken": "這個使用者名稱已被使用",
    "error-email-taken": "電子信箱已被使用",
-    "export-board": "Export board",
-    "filter": "過濾",
-    "filter-cards": "過濾卡片",
-    "filter-clear": "清空過濾條件",
+    "export-board": "匯出看板",
+    "filter": "篩選",
+    "filter-cards": "篩選卡片",
+    "filter-clear": "清除篩選條件",
    "filter-no-label": "沒有標籤",
    "filter-no-member": "沒有成員",
-    "filter-no-custom-fields": "No Custom Fields",
-    "filter-on": "過濾條件啟用",
-    "filter-on-desc": "你正在過濾該看板上的卡片，點此編輯過濾條件。",
-    "filter-to-selection": "要選擇的過濾條件",
-    "advanced-filter-label": "Advanced Filter",
+    "filter-no-custom-fields": "沒有自訂欄位",
+    "filter-on": "篩選器已開啟",
+    "filter-on-desc": "你正在篩選該看板上的卡片，點此編輯篩選條件。",
+    "filter-to-selection": "選擇的篩選條件",
+    "advanced-filter-label": "進階篩選",
    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
    "fullname": "全稱",
    "header-logo-title": "返回您的看板頁面",
@@ -335,15 +335,17 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "移動清單中的所有卡片",
    "list-select-cards": "選擇清單中的所有卡片",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "清單操作",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "匯入 Trello 卡片",
    "listMorePopup-title": "更多",
    "link-list": "連結到這個清單",
    "list-delete-pop": "所有的動作將從活動動態中被移除且您將無法再開啟該清單\b。此操作無法復原。",
    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "清單",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "泳道圖",
    "log-out": "登出",
    "log-in": "登入",
    "loginPopup-title": "登入",
@@ -517,7 +519,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -588,7 +593,7 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
+    "r-archive": "移到封存",
    "r-unarchive": "Restore from Archive",
    "r-card": "card",
    "r-add": "新增",
@@ -654,5 +659,7 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method"
 }
@@ -347,10 +347,37 @@ Boards.helpers({
    return Lists.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } });
  },

+  nullSortLists() {
+    return Lists.find({
+      boardId: this._id,
+      archived: false,
+      sort: { $eq: null },
+    });
+  },
+
  swimlanes() {
    return Swimlanes.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } });
  },

+  nextSwimlane(swimlane) {
+    return Swimlanes.findOne({
+      boardId: this._id,
+      archived: false,
+      sort: { $gte: swimlane.sort },
+      _id: { $ne: swimlane._id },
+    }, {
+      sort: { sort: 1 },
+    });
+  },
+
+  nullSortSwimlanes() {
+    return Swimlanes.find({
+      boardId: this._id,
+      archived: false,
+      sort: { $eq: null },
+    });
+  },
+
  hasOvertimeCards(){
    const card = Cards.findOne({isOvertime: true, boardId: this._id, archived: false} );
    return card !== undefined;
@@ -1113,9 +1140,14 @@ if (Meteor.isServer) {
      Authentication.checkBoardAccess(req.userId, boardId);
      const board = Boards.findOne({ _id: boardId });
      function isTrue(data){
-        return data.toLowerCase() === 'true';
+        try {
+          return data.toLowerCase() === 'true';
+        }
+        catch (error) {
+          return data;
+        }
      }
-      board.setMemberPermission(memberId, isTrue(isAdmin), isTrue(isNoComments), isTrue(isCommentOnly), req.userId);
+      const query = board.setMemberPermission(memberId, isTrue(isAdmin), isTrue(isNoComments), isTrue(isCommentOnly), req.userId);

      JsonRoutes.sendResult(res, {
        code: 200,
@@ -69,7 +69,7 @@ Cards.attachSchema(new SimpleSchema({
    type: String,
    optional: true,
    allowedValues: [
-      'green', 'yellow', 'orange', 'red', 'purple',
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
      'blue', 'sky', 'lime', 'pink', 'black',
      'silver', 'peachpuff', 'crimson', 'plum', 'darkgreen',
      'slateblue', 'magenta', 'gold', 'navy', 'gray',
@@ -1526,6 +1526,10 @@ if (Meteor.isServer) {
    Authentication.checkUserId(req.userId);
    const paramBoardId = req.params.boardId;
    const paramListId = req.params.listId;
+    const currentCards = Cards.find({
+      listId: paramListId,
+      archived: false,
+    }, { sort: ['sort'] });
    const check = Users.findOne({
      _id: req.body.authorId,
    });
@@ -1538,7 +1542,7 @@ if (Meteor.isServer) {
        description: req.body.description,
        userId: req.body.authorId,
        swimlaneId: req.body.swimlaneId,
-        sort: 0,
+        sort: currentCards.count(),
        members,
      });
      JsonRoutes.sendResult(res, {
@@ -1571,13 +1575,16 @@ if (Meteor.isServer) {
   *
   * @description Edit a card
   *
-   * The color has to be chosen between `green`, `yellow`, `orange`, `red`,
-   * `purple`, `blue`, `sky`, `lime`, `pink`, `black`, `silver`, `peachpuff`,
-   * `crimson`, `plum`, `darkgreen`, `slateblue`, `magenta`, `gold`, `navy`,
-   * `gray`, `saddlebrown`, `paleturquoise`, `mistyrose`, `indigo`:
+   * The color has to be chosen between `white`, `green`, `yellow`, `orange`,
+   * `red`, `purple`, `blue`, `sky`, `lime`, `pink`, `black`, `silver`,
+   * `peachpuff`, `crimson`, `plum`, `darkgreen`, `slateblue`, `magenta`,
+   * `gold`, `navy`, `gray`, `saddlebrown`, `paleturquoise`, `mistyrose`,
+   * `indigo`:
   *
   * <img src="/card-colors.png" width="40%" alt="Wekan card colors" />
   *
+   * Note: setting the color to white has the same effect than removing it.
+   *
   * @param {string} boardId the board ID of the card
   * @param {string} list the list ID of the card
   * @param {string} cardId the ID of the card
@@ -31,7 +31,7 @@ if (Meteor.isServer) {
      user = Meteor.users.findOne({
        'services.resume.loginTokens.hashedToken': hashToken,
      });
-    } else {
+    } else if (!Meteor.settings.public.sandstorm) {
      Authentication.checkUserId(req.userId);
      user = Users.findOne({ _id: req.userId, isAdmin: true });
    }
@@ -92,6 +92,21 @@ Lists.attachSchema(new SimpleSchema({
    type: Boolean,
    defaultValue: false,
  },
+  color: {
+    /**
+     * the color of the list
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
 }));

 Lists.allow({
@@ -148,6 +163,12 @@ Lists.helpers({
      return list.wipLimit[option] ? list.wipLimit[option] : 0; // Necessary check to avoid exceptions for the case where the doc doesn't have the wipLimit field yet set
    }
  },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
 });

 Lists.mutations({
@@ -174,6 +195,17 @@ Lists.mutations({
  setWipLimit(limit) {
    return { $set: { 'wipLimit.value': limit } };
  },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });

 Meteor.methods({
@@ -314,9 +346,11 @@ if (Meteor.isServer) {
    try {
      Authentication.checkUserId( req.userId);
      const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
      const id = Lists.insert({
        title: req.body.title,
        boardId: paramBoardId,
+        sort: board.lists().count(),
      });
      JsonRoutes.sendResult(res, {
        code: 200,
@@ -40,6 +40,14 @@ Settings.attachSchema(new SimpleSchema({
    type: String,
    optional: true,
  },
+  displayAuthenticationMethod: {
+    type: Boolean,
+    optional: true,
+  },
+  defaultAuthenticationMethod: {
+    type: String,
+    optional: false,
+  },
  hideLogo: {
    type: Boolean,
    optional: true,
@@ -85,7 +93,8 @@ if (Meteor.isServer) {
      const from = `Boards Support <support@${domain}>`;
      const defaultSetting = {disableRegistration: false, mailServer: {
        username: '', password: '', host: '', port: '', enableTLS: false, from,
-      }, createdAt: now, modifiedAt: now};
+      }, createdAt: now, modifiedAt: now, displayAuthenticationMethod: true,
+      defaultAuthenticationMethod: 'password'};
      Settings.insert(defaultSetting);
    }
    const newSetting = Settings.findOne();
@@ -49,6 +49,21 @@ Swimlanes.attachSchema(new SimpleSchema({
    // XXX We should probably provide a default
    optional: true,
  },
+  color: {
+    /**
+     * the color of the swimlane
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
  updatedAt: {
    /**
     * when was the swimlane last edited
@@ -93,6 +108,12 @@ Swimlanes.helpers({
  board() {
    return Boards.findOne(this.boardId);
  },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
 });

 Swimlanes.mutations({
@@ -107,6 +128,17 @@ Swimlanes.mutations({
  restore() {
    return { $set: { archived: false } };
  },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });

 Swimlanes.hookOptions.after.update = { fetchPrevious: false };
@@ -224,9 +256,11 @@ if (Meteor.isServer) {
    try {
      Authentication.checkUserId( req.userId);
      const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
      const id = Swimlanes.insert({
        title: req.body.title,
        boardId: paramBoardId,
+        sort: board.swimlanes().count(),
      });
      JsonRoutes.sendResult(res, {
        code: 200,
@@ -569,7 +569,7 @@ if (Meteor.isServer) {
      user.username = user.services.oidc.username;
      user.emails = [{ address: email, verified: true }];
      const initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
-      user.profile = { initials, fullname: user.services.oidc.fullname };
+      user.profile = { initials, fullname: user.services.oidc.fullname, boardView: 'board-view-lists' };
      user.authenticationMethod = 'oauth2';

      // see if any existing user has this email address or username, otherwise create new
@@ -1,6 +1,6 @@
 {
  "name": "wekan",
-  "version": "v2.02.0",
+  "version": "v2.26.0",
  "description": "Open-Source kanban",
  "private": true,
  "scripts": {
@@ -87,6 +87,9 @@ tx pull -f -l ko
 echo "Latvian (Latvia):"
 tx pull -f -l lv_LV

+echo "Macedonian:"
+tx pull -f -l mk
+
 echo "Mongolian (Mongolia):"
 tx pull -f -l mn_MN

@@ -1,29 +1,33 @@
 # If you want to restart even on crash, uncomment while and done lines.

 #while true; do
-	cd ~/repos/wekan/.build/bundle
-	export MONGO_URL='mongodb://127.0.0.1:27017/admin'
+        cd ~/repos/wekan/.build/bundle
+        #---------------------------------------------
+        # Debug OIDC OAuth2 etc.
+        #export export DEBUG=true
+        #---------------------------------------------
+        export MONGO_URL='mongodb://127.0.0.1:27017/admin'
        # ROOT_URL EXAMPLES FOR WEBSERVERS: https://github.com/wekan/wekan/wiki/Settings
-	# Production: https://example.com/wekan
-	# Local: http://localhost:3000
-	#export ipaddress=$(ifdata -pa eth0)
-	export ROOT_URL='http://localhost'
+        # Production: https://example.com/wekan
+        # Local: http://localhost:3000
+        #export ipaddress=$(ifdata -pa eth0)
+        export ROOT_URL='http://localhost'
        #---------------------------------------------
        # Working email IS NOT REQUIRED to use Wekan.
        # https://github.com/wekan/wekan/wiki/Adding-users
-	# https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
-	# https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
-	export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
-	export MAIL_FROM='Wekan Support <support@example.com>'
-	# This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
-	export PORT=80
+        # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+        # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
+        export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
+        export MAIL_FROM='Wekan Support <support@example.com>'
+        # This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
+        export PORT=80
        #---------------------------------------------
-	# Wekan Export Board works when WITH_API='true'.
+        # Wekan Export Board works when WITH_API='true'.
        # If you disable Wekan API, Export Board does not work.
-	export WITH_API='true'
+        export WITH_API='true'
        #---------------------------------------------
        # CORS: Set Access-Control-Allow-Origin header. Example: *
-        #- CORS=*
+        #export CORS=*
        #---------------------------------------------
        ## Optional: Integration with Matomo https://matomo.org that is installed to your server
        ## The address of the server where Matomo is hosted:
@@ -39,36 +43,81 @@
        # Example: export MATOMO_WITH_USERNAME=true
        #export MATOMO_WITH_USERNAME='false'
        # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
-	# Setting this to false is not recommended, it also disables all other browser policy protections
-	# and allows all iframing etc. See wekan/server/policy.js
-	# Default value: true
-	export BROWSER_POLICY_ENABLED=true
+        # Setting this to false is not recommended, it also disables all other browser policy protections
+        # and allows all iframing etc. See wekan/server/policy.js
+        # Default value: true
+        export BROWSER_POLICY_ENABLED=true
        # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
-	# Example: export TRUSTED_URL=http://example.com
+        # Example: export TRUSTED_URL=http://example.com
        export TRUSTED_URL=''
        # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
        # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
-	export WEBHOOKS_ATTRIBUTES=''
+        export WEBHOOKS_ATTRIBUTES=''
        #---------------------------------------------
+        # ==== OAUTH2 AZURE ====
+        # https://github.com/wekan/wekan/wiki/Azure
+        # 1) Register the application with Azure. Make sure you capture
+        #    the application ID as well as generate a secret key.
+        # 2) Configure the environment variables. This differs slightly
+        #     by installation type, but make sure you have the following:
+        #export OAUTH2_ENABLED=true
+        # Application GUID captured during app registration:
+        #export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+        # Secret key generated during app registration:
+        #export OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        #export OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+        #export OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+        #export OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+        #export OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+        # The claim name you want to map to the unique ID field:
+        #export OAUTH2_ID_MAP=email
+        # The claim name you want to map to the username field:
+        #export OAUTH2_USERNAME_MAP=email
+        # The claim name you want to map to the full name field:
+        #export OAUTH2_FULLNAME_MAP=name
+        # Tthe claim name you want to map to the email field:
+        #export OAUTH2_EMAIL_MAP=email
+        #-----------------------------------------------------------------
+        # ==== OAUTH2 KEYCLOAK ====
+        # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+        #export OAUTH2_ENABLED=true
+        #export OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+        #export OAUTH2_SERVER_URL=<Keycloak server name>/auth
+        #export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+        #export OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+        #export OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+        #export OAUTH2_SECRET=<keycloak client secret>
+        #-----------------------------------------------------------------
+        # ==== OAUTH2 DOORKEEPER ====
+        # https://github.com/wekan/wekan/issues/1874
+        # https://github.com/wekan/wekan/wiki/OAuth2
+        # Enable the OAuth2 connection
+        #export OAUTH2_ENABLED=true
        # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-        # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
-        # example: export OAUTH2_CLIENT_ID=abcde12345
-        #export OAUTH2_CLIENT_ID=''
-        # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
-        # example: export OAUTH2_SECRET=54321abcde
-        #export OAUTH2_SECRET=''
-        # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
-        # example: export OAUTH2_SERVER_URL=https://chat.example.com
-        #export OAUTH2_SERVER_URL=''
-        # OAuth2 Authorization Endpoint. Example: /oauth/authorize
-        # example: export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
-        #export OAUTH2_AUTH_ENDPOINT=''
-        # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
-        # example: export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
-        #export OAUTH2_USERINFO_ENDPOINT=''
-        # OAuth2 Token Endpoint. Example: /oauth/token
-        # example: export OAUTH2_TOKEN_ENDPOINT=/oauth/token
-        #export OAUTH2_TOKEN_ENDPOINT=''
+        # OAuth2 Client ID.
+        #export OAUTH2_CLIENT_ID=abcde12345
+        # OAuth2 Secret.
+        #export OAUTH2_SECRET=54321abcde
+        # OAuth2 Server URL.
+        #export OAUTH2_SERVER_URL=https://chat.example.com
+        # OAuth2 Authorization Endpoint.
+        #export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+        # OAuth2 Userinfo Endpoint.
+        #export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+        # OAuth2 Token Endpoint.
+        #export OAUTH2_TOKEN_ENDPOINT=/oauth/token
+        # OAuth2 ID Mapping
+        #export OAUTH2_ID_MAP=
+        # OAuth2 Username Mapping
+        #export OAUTH2_USERNAME_MAP=
+        # OAuth2 Fullname Mapping
+        #export OAUTH2_FULLNAME_MAP=
+        # OAuth2 Email Mapping
+        #export OAUTH2_EMAIL_MAP=
+        # OAUTH2 ID Token Whitelist Fields.
+        #export OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+        # OAUTH2 Request Permissions.
+        #export OAUTH2_REQUEST_PERMISSIONS=[openid profile email]
        #---------------------------------------------
        # LDAP_ENABLE : Enable or not the connection by the LDAP
        # example :  export LDAP_ENABLE=true
@@ -178,6 +227,18 @@
        # LDAP_MERGE_EXISTING_USERS :
        # example :  export LDAP_MERGE_EXISTING_USERS=true
        #export LDAP_MERGE_EXISTING_USERS=false
+        # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+        # example: LDAP_EMAIL_MATCH_ENABLE=true
+        #export LDAP_EMAIL_MATCH_ENABLE=false
+        # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+        # example: LDAP_EMAIL_MATCH_REQUIRE=true
+        #export LDAP_EMAIL_MATCH_REQUIRE=false
+        # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+        # example: LDAP_EMAIL_MATCH_VERIFIED=true
+        #export LDAP_EMAIL_MATCH_VERIFIED=false
+        # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+        # example: LDAP_EMAIL_FIELD=mail
+        #export LDAP_EMAIL_FIELD=
        # LDAP_SYNC_USER_DATA :
        # example :  export LDAP_SYNC_USER_DATA=true
        #export LDAP_SYNC_USER_DATA=false
@@ -192,15 +253,15 @@
        #export LDAP_DEFAULT_DOMAIN=
        # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
        # example : LOGOUT_WITH_TIMER=true
-        #- LOGOUT_WITH_TIMER=
+        #export LOGOUT_WITH_TIMER=
        # LOGOUT_IN : The number of days
        # example : LOGOUT_IN=1
-        #- LOGOUT_IN=
-        #- LOGOUT_ON_HOURS=
+        #export LOGOUT_IN=
+        #export LOGOUT_ON_HOURS=
        # LOGOUT_ON_MINUTES : The number of minutes
        # example : LOGOUT_ON_MINUTES=55
-        #- LOGOUT_ON_MINUTES=
+        #export LOGOUT_ON_MINUTES=

-	node main.js & >> ~/repos/wekan.log
-	cd ~/repos
+        node main.js & >> ~/repos/wekan.log
+        cd ~/repos
 #done
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
    appTitle = (defaultText = "Wekan"),
    # The name of the app as it is displayed to the user.

-    appVersion = 204,
+    appVersion = 228,
    # Increment this for every release.

-    appMarketingVersion = (defaultText = "2.02.0~2019-01-22"),
+    appMarketingVersion = (defaultText = "2.26.0~2019-02-25"),
    # Human-readable presentation of the app version.

    minUpgradableAppVersion = 0,
@@ -76,8 +76,8 @@ Meteor.startup(() => {
            authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
            userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
            tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
-            idTokenWhitelistFields: [],
-            requestPermissions: ['openid'],
+            idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
+            requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS || ['openid', 'profile', 'email'],
          },
        }
      );
@@ -398,3 +398,27 @@ Migrations.add('add-custom-html-before-body-end', () => {
    },
  }, noValidateMulti);
 });
+
+Migrations.add('add-displayAuthenticationMethod', () => {
+  Settings.update({
+    displayAuthenticationMethod: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      displayAuthenticationMethod: true,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-defaultAuthenticationMethod', () => {
+  Settings.update({
+    defaultAuthenticationMethod: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      defaultAuthenticationMethod: 'password',
+    },
+  }, noValidateMulti);
+});
@@ -36,7 +36,7 @@ Meteor.startup(() => {
      } catch (e) {
        return;
      }
-    }, 30000);
+    }, process.env.EMAIL_NOTIFICATION_TIMEOUT || 30000);
  });
 });

@@ -1,5 +1,15 @@
 Meteor.publish('setting', () => {
-  return Settings.find({}, {fields:{disableRegistration: 1, productName: 1, hideLogo: 1, customHTMLafterBodyStart: 1, customHTMLbeforeBodyEnd: 1}});
+  return Settings.find({}, {
+    fields:{
+      disableRegistration: 1,
+      productName: 1,
+      hideLogo: 1,
+      customHTMLafterBodyStart: 1,
+      customHTMLbeforeBodyEnd: 1,
+      displayAuthenticationMethod: 1,
+      defaultAuthenticationMethod: 1,
+    },
+  });
 });

 Meteor.publish('mailServer', function () {
@@ -3,9 +3,13 @@
 # All supported keys are defined here together with descriptions and default values

 # list of supported keys
-keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"

 # default values
+DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
+DEFAULT_DEBUG="false"
+KEY_DEBUG="debug"
+
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
 "\t\t\t Default behaviour will preffer binding over unix socket, to disable unix socket binding set value to 'nill' string\n"\
 "\t\t\t To bind to instance of mongodb provided through content interface,set value to relative path to the socket inside '$SNAP_DATA/shared' directory"
@@ -52,6 +56,10 @@ DESCRIPTION_WITH_API="Enable/disable the api of wekan"
 DEFAULT_WITH_API="true"
 KEY_WITH_API="with-api"

+DESCRIPTION_EMAIL_NOTIFICATION_TIMEOUT="Email notification timeout, ms. Default: 30000 (=30s)."
+DEFAULT_EMAIL_NOTIFICATION_TIMEOUT="30000"
+KEY_EMAIL_NOTIFICATION_TIMEOUT="email-notification-timeout"
+
 DESCRIPTION_CORS="Enable/disable CORS: Set Access-Control-Allow-Origin header. Example: *"
 DEFAULT_CORS=""
 KEY_CORS="cors"
@@ -114,6 +122,34 @@ DESCRIPTION_OAUTH2_TOKEN_ENDPOINT="OAuth2 token endpoint. Example: /oauth/token"
 DEFAULT_OAUTH2_TOKEN_ENDPOINT=""
 KEY_OAUTH2_TOKEN_ENDPOINT="oauth2-token-endpoint"

+DESCRIPTION_OAUTH2_ID_MAP="OAuth2 ID Mapping. Example: email"
+DEFAULT_OAUTH2_ID_MAP=""
+KEY_OAUTH2_ID_MAP="oauth2-id-map"
+
+DESCRIPTION_OAUTH2_USERNAME_MAP="OAuth2 Username Mapping. Example: email"
+DEFAULT_OAUTH2_USERNAME_MAP=""
+KEY_OAUTH2_USERNAME_MAP="oauth2-username-map"
+
+DESCRIPTION_OAUTH2_FULLNAME_MAP="OAuth2 Fullname Mapping. Example: name"
+DEFAULT_OAUTH2_FULLNAME_MAP=""
+KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map"
+
+DESCRIPTION_OAUTH2_FULLNAME_MAP="OAuth2 Fullname Mapping. Example: name"
+DEFAULT_OAUTH2_FULLNAME_MAP=""
+KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map"
+
+DESCRIPTION_OAUTH2_EMAIL_MAP="OAuth2 Email Mapping. Example: email"
+DEFAULT_OAUTH2_EMAIL_MAP=""
+KEY_OAUTH2_EMAIL_MAP="oauth2-email-map"
+
+DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="OAuth2 ID Token Whitelist Fields. Example: []"
+DEFAULT_OAUTH2_ID_TOKEN_WHITELIST_FIELDS=""
+KEY_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="oauth2-id-token-whitelist-fields"
+
+DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: [openid profile email]"
+DEFAULT_OAUTH2_REQUEST_PERMISSIONS=""
+KEY_OAUTH2_REQUEST_PERMISSIONS="oauth2-request-permissions"
+
 DESCRIPTION_LDAP_ENABLE="Enable or not the connection by the LDAP"
 DEFAULT_LDAP_ENABLE="false"
 KEY_LDAP_ENABLE="ldap-enable"
@@ -258,6 +294,22 @@ DESCRIPTION_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users . Default: fals
 DEFAULT_LDAP_MERGE_EXISTING_USERS="false"
 KEY_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users"

+DESCRIPTION_LDAP_EMAIL_MATCH_ENABLE="ldap-email-match-enable . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_ENABLE="false"
+KEY_LDAP_EMAIL_MATCH_ENABLE="ldap-email-match-enable"
+
+DESCRIPTION_LDAP_EMAIL_MATCH_REQUIRE="ldap-email-match-require . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_REQUIRE="false"
+KEY_LDAP_EMAIL_MATCH_REQUIRE="ldap-email-match-require"
+
+DESCRIPTION_LDAP_EMAIL_MATCH_VERIFIED="ldap-email-match-verified . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_VERIFIED="false"
+KEY_LDAP_EMAIL_MATCH_VERIFIED="ldap-email-match-verified"
+
+DESCRIPTION_LDAP_EMAIL_FIELD="Which field contains the ldap e-mail address"
+DEFAULT_LDAP_EMAIL_FIELD=""
+KEY_LDAP_EMAIL_FIELD="ldap-email-field"
+
 DESCRIPTION_LDAP_SYNC_USER_DATA="ldap-sync-user-data . Default: false"
 DEFAULT_LDAP_SYNC_USER_DATA="false"
 KEY_LDAP_SYNC_USER_DATA="ldap-sync-user-data"
@@ -290,7 +342,6 @@ DESCRIPTION_LOGOUT_ON_MINUTES="The number of minutes"
 DEFAULT_LOGOUT_ON_MINUTES=""
 KEY_LOGOUT_ON_MINUTES="logout-on-minutes"

-
 DESCRIPTION_DEFAULT_AUTHENTICATION_METHOD="The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
 DEFAULT_DEFAULT_AUTHENTICATION_METHOD=""
 KEY_DEFAULT_AUTHENTICATION_METHOD="default-authentication-method"
@@ -29,4 +29,4 @@ if [ "x" != "x${MONGODB_PORT}" ]; then
 fi
 echo "mongodb bind options: $BIND_OPTIONS"

-mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS
+mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles
@@ -8,6 +8,13 @@ if [ "$CADDY_ENABLED" = "true" ]; then
 fi

 echo -e "Wekan: The open-source kanban.\n"
+echo -e "\n"
+echo -e "Debug OIDC OAuth2 etc."
+echo -e "To enable the Debug of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME debug='true'"
+echo -e "\t-Disable the Debug of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME debug='false'"
+echo -e "\n"
 echo -e "Make sure you have connected all interfaces, check more by calling $ snap interfaces ${SNAP_NAME}"
 echo -e "\n"
 echo -e "${SNAP_NAME} has multiple services, to check status use systemctl"
@@ -29,250 +36,298 @@ echo -e "\t\t-disable mongodb in $SNAP_NAME by calling: $ snap set $SNAP_NAME se
 echo -e "\t\t-set mongodb-bind-unix-socket to point to serving mongodb. Use relative path inside shared directory, e.g run/mongodb-27017.sock"
 echo -e "\n"
 echo -e "To enable the API of wekan:"
-echo -e "\t$ snap set $SNAP_NAME WITH_API='true'"
+echo -e "\t$ snap set $SNAP_NAME with-api='true'"
 echo -e "\t-Disable the API:"
-echo -e "\t$ snap set $SNAP_NAME WITH_API='false'"
+echo -e "\t$ snap set $SNAP_NAME with-api='false'"
+echo -e "\n"
+echo -e "To enable the Email Notification Timeout of wekan in ms, default 30000 (=30s):"
+echo -e "\t$ snap set $SNAP_NAME email-notification-timeout='10000'"
+echo -e "\t-Disable the Email Notification Timeout of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME email-notification-timeout='30000'"
 echo -e "\n"
 echo -e "To enable the CORS of wekan, to set Access-Control-Allow-Origin header:"
-echo -e "\t$ snap set $SNAP_NAME CORS='*'"
+echo -e "\t$ snap set $SNAP_NAME cors='*'"
 echo -e "\t-Disable the CORS:"
-echo -e "\t$ snap set $SNAP_NAME CORS=''"
+echo -e "\t$ snap set $SNAP_NAME cors=''"
 echo -e "\n"
 echo -e "Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside."
 echo -e "\t\t Setting this to false is not recommended, it also disables all other browser policy protections"
 echo -e "\t\t and allows all iframing etc. See wekan/server/policy.js"
-echo -e "To enable the Content Policy of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME CONTENT_POLICY_ENABLED='true'"
-echo -e "\t-Disable the Content Policy of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME CONTENT_POLICY_ENABLED='false'"
+echo -e "To enable the Browser Policy of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME browser-policy-enabled='true'"
+echo -e "\t-Disable the Browser Policy of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME browser-policy-enabled='false'"
 echo -e "\n"
 echo -e "When browser policy is enabled, HTML code at this URL can have iframe that embeds Wekan inside."
 echo -e "To enable the Trusted URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME TRUSTED_URL='https://example.com'"
+echo -e "\t$ snap set $SNAP_NAME trusted-url='https://example.com'"
 echo -e "\t-Disable the Trusted URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME TRUSTED_URL=''"
+echo -e "\t$ snap set $SNAP_NAME trusted-url=''"
 echo -e "\n"
 echo -e "What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
 echo -e "To enable the Webhooks Attributes of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES='cardId,listId,oldListId,boardId,comment,user,card,commentId'"
+echo -e "\t$ snap set $SNAP_NAME webhooks-attributes='cardId,listId,oldListId,boardId,comment,user,card,commentId'"
 echo -e "\t-Disable the Webhooks Attributes of Wekan to send all default ones:"
-echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES=''"
+echo -e "\t$ snap set $SNAP_NAME webhooks-attributes=''"
 echo -e "\n"
-echo -e "OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345"
+echo -e "OAuth2 Client ID."
 echo -e "To enable the OAuth2 Client ID of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_CLIENT_ID='54321abcde'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-client-id='54321abcde'"
 echo -e "\t-Disable the OAuth2 Client ID of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_CLIENT_ID=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-client-id=''"
 echo -e "\n"
-echo -e "OAuth2 Secret, for example from Rocket.Chat. Example: 54321abcde"
+echo -e "OAuth2 Secret."
 echo -e "To enable the OAuth2 Secret of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SECRET='54321abcde'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-secret='54321abcde'"
 echo -e "\t-Disable the OAuth2 Secret of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SECRET=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-secret=''"
 echo -e "\n"
-echo -e "OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com"
+echo -e "OAuth2 Server URL."
 echo -e "To enable the OAuth2 Server URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SERVER_URL='https://chat.example.com'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-server-url='https://chat.example.com'"
 echo -e "\t-Disable the OAuth2 Server URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SERVER_URL=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-server-url=''"
 echo -e "\n"
-echo -e "OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com"
-echo -e "To enable the OAuth2 Server URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SERVER_URL='https://chat.example.com'"
-echo -e "\t-Disable the OAuth2 Server URL of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_SERVER_URL=''"
-echo -e "\n"
-echo -e "OAuth2 Authorization Endpoint. Example: /oauth/authorize"
+echo -e "OAuth2 Authorization Endpoint."
 echo -e "To enable the OAuth2 Authorization Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_AUTH_ENDPOINT='/oauth/authorize'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-auth-endpoint='/oauth/authorize'"
 echo -e "\t-Disable the OAuth2 Authorization Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_AUTH_ENDPOINT=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-auth-endpoint=''"
 echo -e "\n"
-echo -e "OAuth2 Userinfo Endpoint. Example: /oauth/userinfo"
+echo -e "OAuth2 Userinfo Endpoint."
 echo -e "To enable the OAuth2 Userinfo Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_USERINFO_ENDPOINT='/oauth/authorize'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-userinfo-endpoint='/oauth/authorize'"
 echo -e "\t-Disable the OAuth2 Userinfo Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_USERINFO_ENDPOINT=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-userinfo-endpoint=''"
 echo -e "\n"
-echo -e "OAuth2 Token Endpoint. Example: /oauth/token"
+echo -e "OAuth2 Token Endpoint."
 echo -e "To enable the OAuth2 Token Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_TOKEN_ENDPOINT='/oauth/token'"
+echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint='/oauth/token'"
 echo -e "\t-Disable the OAuth2 Token Endpoint of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME OAUTH2_TOKEN_ENDPOINT=''"
+echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint=''"
+echo -e "\n"
+echo -e "OAuth2 ID Mapping."
+echo -e "To enable the OAuth2 ID Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-map='username.uid'"
+echo -e "\t-Disable the OAuth2 ID Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-map=''"
+echo -e "\n"
+echo -e "OAuth2 Username Mapping."
+echo -e "To enable the OAuth2 Username Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-username-map='username'"
+echo -e "\t-Disable the OAuth2 Username Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-username-map=''"
+echo -e "\n"
+echo -e "OAuth2 Fullname Mapping."
+echo -e "To enable the OAuth2 Fullname Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map='fullname'"
+echo -e "\t-Disable the OAuth2 Fullname Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map=''"
+echo -e "\n"
+echo -e "OAuth2 Email Mapping."
+echo -e "To enable the OAuth2 Email Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-email-map='email'"
+echo -e "\t-Disable the OAuth2 Email Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-email-map=''"
+echo -e "\n"
+echo -e "OAuth2 ID Token Whitelist Fields."
+echo -e "To enable the OAuth2 ID Token Whitelist Fields of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields='[]'"
+echo -e "\t-Disable the OAuth2 ID Token Whitelist Fields of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields=''"
+echo -e "\n"
+echo -e "OAuth2 Request Permissions."
+echo -e "To enable the OAuth2 Request Permissions of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-request-permissions='[openid profile email]'"
+echo -e "\t-Disable the OAuth2 Request Permissions of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-request-permissions=''"
 echo -e "\n"
 echo -e "Ldap Enable."
 echo -e "To enable the ldap of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_ENABLE='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-enable='true'"
 echo -e "\t-Disable the ldap of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_ENABLE='false'"
+echo -e "\t$ snap set $SNAP_NAME ldap-enable='false'"
 echo -e "\n"
 echo -e "Ldap Port."
 echo -e "The port of the ldap server:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_PORT='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-port='12345'"
 echo -e "\n"
 echo -e "Ldap Host."
 echo -e "The host server for the LDAP server:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_HOST='localhost'"
+echo -e "\t$ snap set $SNAP_NAME ldap-host='localhost'"
 echo -e "\n"
 echo -e "Ldap Base Dn."
 echo -e "The base DN for the LDAP Tree:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_BASEDN='ou=user,dc=example,dc=org'"
+echo -e "\t$ snap set $SNAP_NAME ldap-basedn='ou=user,dc=example,dc=org'"
 echo -e "\n"
 echo -e "Ldap Login Fallback."
 echo -e "Fallback on the default authentication method:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_LOGIN_FALLBACK='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-login-fallback='true'"
 echo -e "\n"
 echo -e "Ldap Reconnect."
 echo -e "Reconnect to the server if the connection is lost:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_RECONNECT='false'"
+echo -e "\t$ snap set $SNAP_NAME ldap-reconnect='false'"
 echo -e "\n"
 echo -e "Ldap Timeout."
 echo -e "Overall timeout, in milliseconds:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_TIMEOUT='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-timeout='12345'"
 echo -e "\n"
 echo -e "Ldap Idle Timeout."
 echo -e "Specifies the timeout for idle LDAP connections in milliseconds:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_IDLE_TIMEOUT='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-idle-timeout='12345'"
 echo -e "\n"
 echo -e "Ldap Connect Timeout."
 echo -e "Connection timeout, in milliseconds:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_CONNECT_TIMEOUT='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-connect-timeout='12345'"
 echo -e "\n"
 echo -e "Ldap Authentication."
 echo -e "If the LDAP needs a user account to search:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_AUTHENTIFICATION='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication='true'"
 echo -e "\n"
 echo -e "Ldap Authentication User Dn."
 echo -e "The search user Dn:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_AUTHENTIFICATION_USERDN='cn=admin,dc=example,dc=org'"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='cn=admin,dc=example,dc=org'"
 echo -e "\n"
 echo -e "Ldap Authentication Password."
 echo -e "The password for the search user:"
-echo -e "\t$ snap set $SNAP_NAME AUTHENTIFICATION_PASSWORD='admin'"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-password='admin'"
 echo -e "\n"
 echo -e "Ldap Log Enabled."
 echo -e "Enable logs for the module:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_LOG_ENABLED='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-log-enabled='true'"
 echo -e "\n"
 echo -e "Ldap Background Sync."
 echo -e "If the sync of the users should be done in the background:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_BACKGROUND_SYNC='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync='true'"
 echo -e "\n"
 echo -e "Ldap Background Sync Interval."
 echo -e "At which interval does the background task sync in milliseconds:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_BACKGROUND_SYNC_INTERVAL='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-interval='12345'"
 echo -e "\n"
 echo -e "Ldap Background Sync Keep Existant Users Updated."
-echo -e "\t$ snap set $SNAP_NAME LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-keep-existant-users-updated='true'"
 echo -e "\n"
 echo -e "Ldap Background Sync Import New Users."
-echo -e "\t$ snap set $SNAP_NAME LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-import-new-users='true'"
 echo -e "\n"
 echo -e "Ldap Encryption."
 echo -e "Allow LDAPS:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_ENCRYPTION='ssl'"
+echo -e "\t$ snap set $SNAP_NAME ldap-encryption='ssl'"
 echo -e "\n"
 echo -e "Ldap Ca Cert."
 echo -e "The certification for the LDAPS server:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----"
+echo -e "\t$ snap set $SNAP_NAME ldap-ca-cert=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----"
 echo -e "\n"
 echo -e "Ldap Reject Unauthorized."
 echo -e "Reject Unauthorized Certificate:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_REJECT_UNAUTHORIZED='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-reject-unauthorized='true'"
 echo -e "\n"
 echo -e "Ldap User Search Filter."
 echo -e "Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_USER_SEARCH_FILTER=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-filter=''"
 echo -e "\n"
 echo -e "Ldap User Search Scope."
 echo -e "base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree). Example: one"
-echo -e "\t$ snap set $SNAP_NAME LDAP_USER_SEARCH_SCOPE=one"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-scope=one"
 echo -e "\n"
 echo -e "Ldap User Search Field."
 echo -e "Which field is used to find the user:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_USER_SEARCH_FIELD='uid'"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-field='uid'"
 echo -e "\n"
 echo -e "Ldap Search Page Size."
 echo -e "Used for pagination (0=unlimited):"
-echo -e "\t$ snap set $SNAP_NAME LDAP_SEARCH_PAGE_SIZE='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-search-page-size='12345'"
 echo -e "\n"
 echo -e "Ldap Search Size Limit."
 echo -e "The limit number of entries (0=unlimited):"
-echo -e "\t$ snap set $SNAP_NAME LDAP_SEARCH_SIZE_LIMIT='12345'"
+echo -e "\t$ snap set $SNAP_NAME ldap-search-size-limit='12345'"
 echo -e "\n"
 echo -e "Ldap Group Filter Enable."
 echo -e "Enable group filtering:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_ENABLE='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-enable='true'"
 echo -e "\n"
 echo -e "Ldap Group Filter ObjectClass."
 echo -e "The object class for filtering:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_OBJECTCLASS='group'"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-objectclass='group'"
 echo -e "\n"
 echo -e "Ldap Group Filter Id Attribute."
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-id-attribute=''"
 echo -e "\n"
 echo -e "Ldap Group Filter Member Attribute."
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-member-attribute=''"
 echo -e "\n"
 echo -e "Ldap Group Filter Member Format."
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-member-format=''"
 echo -e "\n"
 echo -e "Ldap Group Filter Group Name."
-echo -e "\t$ snap set $SNAP_NAME LDAP_GROUP_FILTER_GROUP_NAME=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-name=''"
 echo -e "\n"
 echo -e "Ldap Unique Identifier Field."
 echo -e "This field is sometimes class GUID (Globally Unique Identifier):"
-echo -e "\t$ snap set $SNAP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD=guid"
+echo -e "\t$ snap set $SNAP_NAME ldap-unique-identifier-field=guid"
 echo -e "\n"
 echo -e "Ldap Utf8 Names Slugify."
 echo -e "Convert the username to utf8:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_UTF8_NAMES_SLUGIFY='false'"
+echo -e "\t$ snap set $SNAP_NAME ldap-utf8-names-slugify='false'"
 echo -e "\n"
 echo -e "Ldap Username Field."
 echo -e "Which field contains the ldap username:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_USERNAME_FIELD='username'"
+echo -e "\t$ snap set $SNAP_NAME ldap-username-field='username'"
 echo -e "\n"
 echo -e "Ldap Fullname Field."
 echo -e "Which field contains the ldap fullname:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_FULLNAME_FIELD='fullname'"
+echo -e "\t$ snap set $SNAP_NAME ldap-fullname-field='fullname'"
 echo -e "\n"
 echo -e "Ldap Merge Existing Users."
-echo -e "\t$ snap set $SNAP_NAME LDAP_MERGE_EXISTING_USERS='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-merge-existing-users='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Enable."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-enable='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Require."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-require='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Verified."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-verfied='false'"
+echo -e "\n"
+echo -e "Ldap Fullname Field."
+echo -e "Which field contains the ldap email address:"
+echo -e "\t$ snap set $SNAP_NAME ldap-fullname-field='fullname'"
 echo -e "\n"
 echo -e "Ldap Sync User Data."
 echo -e "Enable synchronization of user data:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_SYNC_USER_DATA='true'"
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-user-data='true'"
 echo -e "\n"
 echo -e "Ldap Sync User Data Fieldmap."
 echo -e "A field map for the matching:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_SYNC_USER_DATA_FIELDMAP={\"cn\":\"name\", \"mail\":\"email\"}"
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-user-data-fieldmap={\"cn\":\"name\", \"mail\":\"email\"}"
 echo -e "\n"
 echo -e "Ldap Sync Group Roles."
-echo -e "\t$ snap set $SNAP_NAME LDAP_SYNC_GROUP_ROLES=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-group-roles=''"
 echo -e "\n"
 echo -e "Ldap Default Domain."
 echo -e "The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP:"
-echo -e "\t$ snap set $SNAP_NAME LDAP_DEFAULT_DOMAIN=''"
+echo -e "\t$ snap set $SNAP_NAME ldap-default-domain=''"
 echo -e "\n"
 # echo -e "Logout with timer."
 # echo -e "Enable or not the option that allows to disconnect an user after a given time:"
-# echo -e "\t$ snap set $SNAP_NAME LOGOUT_WITH_TIMER='true'"
+# echo -e "\t$ snap set $SNAP_NAME logout-with-timer='true'"
 # echo -e "\n"
 # echo -e "Logout in."
 # echo -e "Logout in how many days:"
-# echo -e "\t$ snap set $SNAP_NAME LOGOUT_IN='1'"
+# echo -e "\t$ snap set $SNAP_NAME logout-in='1'"
 # echo -e "\n"
 # echo -e "Logout on hours."
 # echo -e "Logout in how many hours:"
-# echo -e "\t$ snap set $SNAP_NAME LOGOUT_ON_HOURS='9'"
+# echo -e "\t$ snap set $SNAP_NAME logout-on-hours='9'"
 # echo -e "\n"
 # echo -e "Logout on minutes."
 # echo -e "Logout in how many minutes:"
-# echo -e "\t$ snap set $SNAP_NAME LOGOUT_ON_MINUTES='5'"
+# echo -e "\t$ snap set $SNAP_NAME logout-on-minutes='5'"
 # echo -e "\n"
 echo -e "Default authentication method."
 echo -e "The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
-echo -e "\t$ snap set $SNAP_NAME DEFAULT_AUTHENTICATION_METHOD='ldap'"
+echo -e "\t$ snap set $SNAP_NAME default-authentication-method='ldap'"
 echo -e "\n"
 # parse config file for supported settings keys
 echo -e "wekan supports settings keys"
@@ -1,3 +1,10 @@
+REM ------------------------------------------------------------
+
+REM # Debug OIDC OAuth2 etc.
+REM SET DEBUG=true
+
+REM ------------------------------------------------------------
+
 SET MONGO_URL=mongodb://127.0.0.1:27017/wekan
 SET ROOT_URL=http://127.0.0.1:2000/
 SET MAIL_URL=smtp://user:pass@mailserver.example.com:25/
@@ -67,6 +74,11 @@ REM # OAuth2 Token Endpoint. Example: /oauth/token
 REM # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
 REM SET OAUTH2_TOKEN_ENDPOINT=

+REM # OAUTH2 ID Token Whitelist Fields.
+REM SET OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+REM # OAUTH2 Request Permissions.
+REM SET OAUTH2_REQUEST_PERMISSIONS=[openid email profile]
+
 REM ------------------------------------------------------------

 REM # LDAP_ENABLE : Enable or not the connection by the LDAP
@@ -209,6 +221,22 @@ REM # LDAP_MERGE_EXISTING_USERS :
 REM # example : LDAP_MERGE_EXISTING_USERS=true
 REM SET LDAP_MERGE_EXISTING_USERS=false

+REM # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+REM # example: LDAP_EMAIL_MATCH_ENABLE=true
+REM SET LDAP_EMAIL_MATCH_ENABLE=false
+
+REM # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+REM # example: LDAP_EMAIL_MATCH_REQUIRE=true
+REM SET LDAP_EMAIL_MATCH_REQUIRE=false
+
+REM # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+REM # example: LDAP_EMAIL_MATCH_VERIFIED=true
+REM SET LDAP_EMAIL_MATCH_VERIFIED=false
+
+REM # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+REM # example: LDAP_EMAIL_FIELD=mail
+REM SET LDAP_EMAIL_FIELD=
+
 REM # LDAP_SYNC_USER_DATA :
 REM # example : LDAP_SYNC_USER_DATA=true
 REM SET LDAP_SYNC_USER_DATA=false
@@ -245,4 +273,4 @@ REM SET LOGOUT_ON_MINUTES=

 cd .build\bundle
 node main.js
-cd ..\..
+cd ..\..