v1.69.2

Update meteor
2026-11-14 06:01:59 -05:00 · 2018-11-05 15:46:43 +02:00 · 2018-11-05 15:43:35 +02:00
177 changed files with 6504 additions and 17513 deletions
@@ -6,7 +6,7 @@
    "browser": true
  },
  "parserOptions": {
-    "ecmaVersion": 2017,
+    "ecmaVersion": 6,
    "sourceType": "module",
    "ecmaFeatures": {
      "experimentalObjectRestSpread": true
@@ -1,11 +1,5 @@
 ## Issue

-Add these issues to elsewhere:
- LDAP: https://github.com/wekan/wekan-ldap/issues
- Snap: https://github.com/wekan/wekan-snap/issues
-
-Other Wekan issues can be added here.
-
 **Server Setup Information**:

 * Did you test in newest Wekan?:
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
@@ -3,17 +3,18 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.

-meteor-base@1.2.0
+meteor-base@1.4.0

 # Build system
-ecmascript
+ecmascript@0.12.0
 stylus@2.513.13
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
+standard-minifier-css@1.5.0
+standard-minifier-js@2.4.0
 mquandalle:jade
+coffeescript@2.3.1_2!

 # Polyfills
-es5-shim@4.6.15
+es5-shim@4.8.0

 # Collections
 aldeed:collection2
@@ -23,7 +24,7 @@ dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.3.1
+mongo@1.6.0
 mquandalle:collection-mutations

 # Account system
@@ -31,17 +32,15 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:flow-routing
-wekan:wekan-ldap
-wekan:accounts-cas
-wekan-accounts-oidc
+salleman:accounts-oidc

 # Utilities
-check@1.2.5
+check@1.3.1
 jquery@1.11.10
-random@1.0.10
-reactive-dict@1.2.0
-session@1.1.7
-tracker@1.1.3
+random@1.1.0
+reactive-dict@1.2.1
+session@1.1.8
+tracker@1.2.0
 underscore@1.0.10
 3stack:presence
 alethes:pages
@@ -55,7 +54,7 @@ mquandalle:autofocus
 ongoworks:speakingurl
 raix:handlebar-helpers
 tap:i18n
-http@1.3.0
+http@1.4.1

 # UI components
 blaze
@@ -65,30 +64,29 @@ mousetrap:mousetrap
 mquandalle:jquery-textcomplete
 mquandalle:jquery-ui-drag-drop-sort
 mquandalle:mousetrap-bindglobal
+mquandalle:perfect-scrollbar
 peerlibrary:blaze-components@=0.15.1
 perak:markdown
 templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
-shell-server@0.3.0
+shell-server@0.4.0
 simple:rest-accounts-password
 useraccounts:core
 email@1.2.3
 horka:swipebox
-dynamic-import@0.2.0
+dynamic-import@0.5.0
 staringatlights:fast-render

 mixmax:smart-disconnect
-accounts-password@1.5.0
+accounts-password@1.5.1
 cfs:gridfs
 eluck:accounts-lockout
 rzymek:fullcalendar
 momentjs:moment@2.22.2
-browser-policy-framing
+browser-policy-framing@1.1.0
 mquandalle:moment
 msavin:usercache
-wekan-scrollbar
-mquandalle:perfect-scrollbar
-mdg:meteor-apm-agent
-meteorhacks:unblock
+wekan:wekan-ldap
+wekan:accounts-cas
@@ -1 +1 @@
-METEOR@1.6.0.1
+METEOR@1.8.1-beta.0
@@ -1,7 +1,7 @@
 3stack:presence@1.1.2
-accounts-base@1.4.0
-accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-base@1.4.3
+accounts-oauth@1.1.16
+accounts-password@1.5.1
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -11,19 +11,19 @@ alethes:pages@1.8.6
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
-autoupdate@1.3.12
-babel-compiler@6.24.7
-babel-runtime@1.1.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
+autoupdate@1.5.0
+babel-compiler@7.2.0
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
 blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.6.0
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
-caching-compiler@1.1.9
+caching-compiler@1.2.0
 caching-html-compiler@1.1.2
-callback-hook@1.0.10
+callback-hook@1.1.0
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
@@ -41,38 +41,40 @@ cfs:storage-adapter@0.2.3
 cfs:tempstore@0.1.5
 cfs:upload-http@0.0.20
 cfs:worker@0.1.4
-check@1.2.5
+check@1.3.1
 chuangbo:cookie@1.1.0
-coffeescript@1.12.7_3
-coffeescript-compiler@1.12.7_3
+coffeescript@2.3.1_2
+coffeescript-compiler@2.3.1_2
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp-client@2.3.3
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@2.2.0
 deps@1.0.12
-diff-sequence@1.0.7
-dynamic-import@0.2.1
-ecmascript@0.9.0
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
-ecmascript-runtime-server@0.5.0
+diff-sequence@1.1.0
+dynamic-import@0.5.0
+ecmascript@0.12.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
 ejson@1.1.0
 eluck:accounts-lockout@0.9.0
 email@1.2.3
-es5-shim@4.6.15
+es5-shim@4.8.0
 fastclick@1.0.13
+fetch@0.1.0
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.3.0
-id-map@1.0.9
+http@1.4.1
+id-map@1.1.0
 idmontie:migrations@1.0.3
+inter-process-messaging@0.1.0
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
@@ -81,33 +83,33 @@ kenton:accounts-sandstorm@0.7.0
 launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 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
+meteor@1.9.2
+meteor-base@1.4.0
 meteor-platform@1.2.6
 meteorhacks:aggregate@1.3.0
 meteorhacks:collection-utils@1.2.0
 meteorhacks:meteorx@1.4.1
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
-meteorhacks:unblock@1.1.0
 meteorspark:util@0.2.0
-minifier-css@1.2.16
-minifier-js@2.2.2
+minifier-css@1.4.0
+minifier-js@2.4.0
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.3
+minimongo@1.4.5
 mixmax:smart-disconnect@0.0.4
 mobile-status-bar@1.0.14
-modules@0.11.0
-modules-runtime@0.9.1
+modern-browsers@0.1.2
+modules@0.13.0
+modules-runtime@0.10.2
 momentjs:moment@2.22.2
-mongo@1.3.1
+mongo@1.6.0
+mongo-decimal@0.1.0
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 mongo-livedata@1.0.12
 mousetrap:mousetrap@1.4.6_1
 mquandalle:autofocus@1.0.0
@@ -121,47 +123,48 @@ mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
 msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
-npm-mongo@2.2.33
-oauth@1.2.1
-oauth2@1.2.0
+npm-mongo@3.1.1
+oauth@1.2.3
+oauth2@1.2.1
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
-ordered-dict@1.0.9
+ordered-dict@1.1.0
 peerlibrary:assert@0.2.5
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.7.0
+peerlibrary:computed-field@0.9.0
 peerlibrary:reactive-field@0.3.0
 perak:markdown@1.0.5
-promise@0.10.0
+promise@0.11.1
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
 rajit:bootstrap3-datepicker@1.7.1
-random@1.0.10
-rate-limit@1.0.8
-reactive-dict@1.2.0
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.2.1
 reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.1.0
 rzymek:fullcalendar@3.8.0
-wekan-accounts-oidc@1.0.10
-wekan-oidc@1.0.12
+salleman:accounts-oidc@1.0.9
+salleman:oidc@1.0.9
 service-configuration@1.0.11
-session@1.1.7
+session@1.1.8
 sha@1.0.9
-shell-server@0.3.1
+shell-server@0.4.0
 simple:authenticate-user-by-token@1.0.1
 simple:json-routes@2.1.0
 simple:rest-accounts-password@1.1.2
 simple:rest-bearer-token-parser@1.0.1
 simple:rest-json-error-handler@1.0.1
+socket-stream-client@0.2.2
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.0.10
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.3
+srp@1.0.12
+standard-minifier-css@1.5.0
+standard-minifier-js@2.4.0
 staringatlights:fast-render@2.16.5
 staringatlights:inject-data@2.0.5
 stylus@2.513.13
@@ -171,17 +174,16 @@ templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
-url@1.1.0
+url@1.2.0
 useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.4.0
+webapp@1.7.0
 webapp-hashing@1.0.9
-wekan-scrollbar@3.1.3
 wekan:accounts-cas@0.1.0
 wekan:wekan-ldap@0.0.2
 yasaricli:slugify@0.0.7
@@ -1,810 +1,11 @@
-# v2.37 2019-03-04 Wekan release
-
-This release fixes the following bugs:
-
- [Fix Adding Labels to cards is not possible anymore](https://github.com/wekan/wekan/issues/2223).
-
-Thanks to GitHub user xet7 for contributions.
-
-# v2.36 2019-03-03 Wekan release
-
-This release adds the following UI changes:
-
- [Combine hamburger menus at right](https://github.com/wekan/wekan/issues/2219):
-  - Hamburger button open sidebar;
-  - Sidebar has at top right Cog icon that opens Board Settings;
-  - Hide sidebar arrows.
-
-and fixes the following bugs:
-
- [Add more Webhook translations](https://github.com/wekan/wekan/issues/1969).
-  In progress.
-
-and moved the following code around:
-
- [Forked salleman-oidc](https://github.com/wekan/wekan/commit/8867bec8e65f1ef6be0c731918e8eefcacb7acb0)
-  to https://github.com/wekan/meteor-accounts-oidc where salleman also has write access,
-  xet7 can make changes directly and GitHub issues are enabled.
-
-Thanks to GitHub user xet7 for contributions.
-    
-# v2.35 2019-03-01 Wekan release
-
-This release fixes the following bugs:
-
- [Add Filter fix back](https://github.com/wekan/wekan/issues/2213), 
-  because there was no bug in filter fix.              
-
-Thanks to GitHub user xet7 for contributions.
-
-# v2.34 2019-03-01 Wekan release
-
-This release tried to fix following bugs, but did not fix anything:
-
- Revert [Filter fix](https://github.com/wekan/wekan/issues/2213) because of
-  [mongodb data tampered](https://github.com/wekan/wekan-snap/issues/83).
-  This was added back at Wekan v2.35.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v2.33 2019-02-28 Wekan release
-
-This release adds the following upgrades:
-
- [Upgrade Node.js to v8.15.1](https://github.com/wekan/wekan/commit/5cafdd9878ab4b6123024ec33279ccdae75f554f).
-
-Thanks to Node.js developers and GitHub user xet7 for contributions.
-
-# v2.32 2019-02-28 Wekan release
-
-This release adds the following [performance improvements](https://github.com/wekan/wekan/pull/2214), thanks to justinr1234:
-
- New indexes for queries that were missing an index;
- Bulk querying documents to reduce the number of mongo queries when loading a board;
- Ensure oplog is being used to query the database by providing a `sort` key when `limit` is used querying the `boards` collection.
-
-and fixes the following bugs related to [Template features](https://github.com/wekan/wekan/issues/2209), thanks to andresmanelli:
-
- [Fix filtering in swimlane view](https://github.com/wekan/wekan/commit/49229e1723de14cdc66dc6480624bba426d35e36) that was [broken since v2.29](https://github.com/wekan/wekan/issues/2213).
-
-Thanks to above GitHub users for their contributions.
-
-# v2.31 2019-02-28 Wekan release
-
-This release fixes the following bugs related to [Template features](https://github.com/wekan/wekan/issues/2209), thanks to GitHub user andresmanelli:
-
- [Fix copy card](https://github.com/wekan/wekan/issues/2210).
-
-# v2.30 2019-02-28 Wekan release
-
-This release adds the following new [Template features](https://github.com/wekan/wekan/issues/2209), thanks to GitHub user andresmanelli:
-
- [Fix popup title. Add element title modification](https://github.com/wekan/wekan/commit/888e1ad5d3e32be53283aa32198057f669f3d706);
- [Copy template attachments](https://github.com/wekan/wekan/commit/abb71083215462d91b084c4de13af0b130638e4d);
- [Standarize copy functions. Match labels by name](https://github.com/wekan/wekan/commit/da21a2a410c9b905de89d66236748e0c8f5357ea).
-
-# v2.29 2019-02-27 Wekan release
+# v1.69.2 2018-11-05 Wekan Edge release

 This release adds the following new features:

- Swimlane/List/Board/Card templates. In Progress, please test and [add comment if you find not listed bugs](https://github.com/wekan/wekan/issues/2165).
-  Thanks to GitHub user andresmanelli.
+- Upgrade Meteor to 1.8.x;
+- Add build scripts.

-# v2.28 2019-02-27 Wekan release
-
-This release adds the following new Sandstorm features and fixes:
-
- All Boards page [so it's possible to go back from subtask board](https://github.com/wekan/wekan/issues/2082).
- Board favorites.
- New Sandstorm board first user is Admin and [has IFTTT Rules](https://github.com/wekan/wekan/issues/2125) and Standalone Wekan Admin Panel.
-  Probably some Admin Panel features do not work yet. Please keep backup of your grains before testing Admin Panel.
- Linked Cards and Linked Boards.
- Some not needed options like Logout etc have been hidden from top bar right menu. 
- [Import board now works. "Board not found" is not problem anymore](https://github.com/wekan/wekan/issues/1430), because you can go to All Boards page to change to imported board.
-
-and removes the following features:
-
- Remove Welcome Board from Standalone Wekan, [to fix Welcome board not translated](https://github.com/wekan/wekan/issues/1601).
-  Sandstorm Wekan does not have Welcome Board.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v2.27 2019-02-27 Wekan release
-
-This release fixes the following bugs:
-
- [Fix OIDC error "a.join is not a function"](https://github.com/wekan/wekan/issues/2206)
-  by reverting configurable OAUTH2_ID_TOKEN_WHITELIST_FIELDS and
-  OAUTH2_REQUEST_PERMISSIONS from Wekan v2.22-2.26.
-  Thanks to GitHub user xet7.
-
-# 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:
-
- REVERTED in v2.27 ([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:
-
- REVERTED in v2.27 ([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.
- REVERTED in v2.27 (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:
-
- [Add per card color: Card / Hamburger menu / Set Color](https://github.com/wekan/wekan/pull/2116) with [color picker](https://github.com/wekan/wekan/pull/2117);
- [OpenAPI and generating of REST API Docs](https://github.com/wekan/wekan/pull/1965);
- [Allow to retrieve full export of board from the REST API](https://github.com/wekan/wekan/pull/2118) through generic authentication.
-  When the board is big, retrieving individual cards is heavy for both the server and the number of requests.
-  Allowing the API to directly call on export and then treat the data makes the whole process smoother.
-
-and adds the following new features with Apache I-CLA, thanks to xet7 and bentiss:
-
- [Translate and add color names to IFTTT Rules dropdown](https://github.com/wekan/wekan/commit/44e4df2492b95226f1297e7f556d61b1afaab714), thanks to xet7.
-  [Fix to this feature blank item](https://github.com/wekan/wekan/pull/2119), thanks to bentiss.
-
-and adds these updates:
-
- Update translations. Thanks to translators.
- Added missing translation for 'days'. Thanks to Chartman123.
-
-and fixes these typos;
-
- Fix typo, changelog year to 2019. Thanks to xorander00.
- Fix License to 2019. Thanks to ajRiverav.
-
-Thanks to above GitHub users for their contributions.
-
-# v2.01 2019-01-06 Wekan release
-
-Update translations. Thanks to translators.
-
-# v2.00 2019-01-04 Wekan release
-
-Update translations. Thanks to translators.
-
-# v1.99 2019-01-04 Wekan release
-
-This release adds the following new features:
-
- [IFTTT Rules improvements](https://github.com/wekan/wekan/pull/2088). Thanks to Angtrim.
- Add [find.sh](https://github.com/wekan/wekan/blob/devel/find.sh) bash script that ignores
-  extra directories when searching. xet7 uses this a lot when developing. Thanks to xet7.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.98 2019-01-01 Wekan release
-
-This release adds the following new features:
-
- Add optional Nginx reverse proxy config to docker-compose.yml and nginx directory. Thanks to MyTheValentinus.
-
-and fixes the following bugs:
-
- docker-compose.yml back to MongoDB 3.2.21 because 3.2.22 MongoDB container does not exist yet. Thanks to xet7.
- [Mobile fixes](https://github.com/wekan/wekan/pull/2084), thanks to hupptechnologies:
-  - Move home button / avatar bar from bottom to top. So at top first is home button / avatar, then others.
-  - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is
-    need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible.
-  - Also check that other buttons go to visible page.
-    
-Thanks to above GitHub users for their contributions.
-
-# v1.97 2018-12-26 Wekan release
-
-This release adds the following new features:
-
- Upgrade to Node 8.15.0 and MongoDB 3.2.22.
- Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken.
-    
-Thanks to GitHub user xet7 for contributions.
-
-# v1.96 2018-12-24 Wekan release
-
-This release adds the following new features:
-
- [Combine all docker-compose.yml files](https://github.com/wekan/wekan/commit/3f948ba49ba7266c436ff138716bdcae9e879903).
-
-and tries to fix following bugs:
-
- Revert "Improve authentication", remove login dropdown and "Default Authentication Method" that were added
-  in Wekan v1.95 because login did not work with email address.
-  It was later found that login did work with username, so later this could be fixed and added back.
- Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work.
-  Most likely Meteor 1.8.x version is still broken.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.95 2018-12-21 Wekan release
-
-This release adds the following new features:
-
- [Improve authentication](https://github.com/wekan/wekan/pull/2065): remove login dropdown,
-  and add setting `DEFAULT_AUTHENTICATION_METHOD=ldap` or
-  `sudo snap set wekan default-authentication-method='ldap'`. Thanks to Akuket. Closes wekan/wekan-ldap#31
-  NOTE: This was reverted in Wekan v1.96 because login did not work with email address.
-  It was later found that login did work with username, so later this could be fixed and added back.
- [Drag handles and long press on mobile when using desktop mode of mobile
-  browser](https://github.com/wekan/wekan/pull/2067). Thanks to hupptechnologies.
- Upgrade to node v8.14.1 . Thanks to xet7.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.94 2018-12-18 Wekan release
-
-This release adds the following new features:
-
- Admin Panel / Layout / Custom HTML after `<body>` start, and Custom HTML before `</body>` end.
-  In progress, does not work yet. Thanks to xet7.
- Add Bitnami Stacksmith. In progress test version, that does work, but is not released yet. Thanks to j-fuentes.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.93 2018-12-16 Wekan release
-
-This release adds the following new features:
-
- In translations, only show name "Wekan" in Admin Panel Wekan version.
-  Elsewhere use general descriptions for whitelabeling.
-
-Thanks to GitHub user xet7 and translators for their contributions.
-
-# v1.92 2018-12-16 Wekan release
-
-This release fixes the following bugs:
-
- Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng.
- Fix [Card scrollbar ignores mousewheel](https://github.com/wekan/wekan-scrollbar/commit/94a40da51627c6322afca50a5b1f4aa55c7ce7bf). Thanks to rinnaz and xet7. Closes #2058
- Fix [favicon paths for non-suburl cases](https://github.com/wekan/wekan/commit/c1733fc89c4c73a1ab3f4054d0a9ebff7741a804). Thanks to xet7. Related #1692
-
-Thanks to above GitHub users for their contributions.
-
-# v1.91 2018-12-15 Wekan release
-
-This release fixes the following bugs:
-
- [Add back mquandalle:perfect-scrollbar package](https://github.com/wekan/wekan/issues/2057)
-  so that Firefox and Chrome stop complaining in browser dev tools console.
-
-Thanks to GitHub users uusijani and xet7 for their contributions.
-
-# v1.90 2018-12-15 Wekan release
-
-This release fixes the following bugs:
-
- [Remove not working duplicate saveMailServerInfo](https://github.com/wekan/wekan/commit/ab031d9da134aa13490a26dbe97ad2d7d01d534a),
-  to remove error from browser dev tools console.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.89 2018-12-15 Wekan release
-
-This release adds the following new features:
-
- Admin Panel / Layout / Custom Product Name [now changes webpage title](https://github.com/wekan/wekan/commit/dbb1a86ca377e551063cc04c5189fad4aa9148c0).
-  Related #1196
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.88 2018-12-14 Wekan release
-
-This release fixes the following bugs:
-
- Fix: [Scrollbar used](https://github.com/wekan/wekan/issues/2056) [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50),
-  so forked package to https://github.com/wekan/wekan-scrollbar and included
-  non-minified file locally to Wekan, so that using scrollbar works without direct connection
-  to Internet. Wekan should not load any external files by default, as was case before
-  new scrollbar, and is again now [after this fix](https://github.com/wekan/wekan/commit/c546464d9f56117a8bf580512cd62fc1102559c3).
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.87 2018-12-13 Wekan release
-
-This release fixes the following bugs:
-
- Fix Reference error.
-
-Thanks to GitHub user Akuket for contributions.
-
-# v1.86 2018-12-13 Wekan release
-
-This release fixes the following bugs:
-
- Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29);
- Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32).
-
-Thanks to GitHub user Akuket for contributions.
-
-# v1.85 2018-12-09 Wekan release
-
-This release fixes the following bugs:
-
- Fix [Clicking the scrollbar closes the card on Chrome](https://github.com/wekan/wekan/issues/1404)
-  by changing [mquandalle:perfect-scrollbar to malihu-jquery-custom-scrollbar](https://github.com/wekan/wekan/pull/2050).
-  that works also when clicking scrollbar in Chrome. Also added back required packages that were removed in PR.
-
-Thanks to GitHub users hupptechnologies and xet7 for their contributions.
-
-# v1.84 2018-12-07 Wekan release
-
-This release fixes the following bugs:
-
- Fix 2/8: IFTTT Rule action/trigger ["Remove all members from the card"](https://github.com/wekan/wekan/issues/1972).
-
-Thanks to GitHub user BurakTuran9 for contributions.
-
-# v1.83 2018-12-06 Wekan release
-
-This release fixes the following bugs:
-
- Fix 1/8: IFTTT Rule action/trigger [When a checklist is completed](https://github.com/wekan/wekan/issues/1972).
-  And partial incomplete fix to when all of checklist is set as uncompleted. Help in fixing welcome.
-
-Thanks to GitHub users BurakTuran9 and xet7 for their contributions.
-
-# v1.82 2018-12-05 Wekan release
-
-This release fixes the following bugs:
-
- Partially #2045 revert [Improve authentication](https://github.com/wekan/wekan/issues/2016),
-  adding back password/LDAP dropdown, because login did now work.
-  NOTE: This was added in v1.71, reverted at v1.73 because login did not work, added back at v1.79,
-  and then reverted partially at v1.82 because login did not work.
-  Related LDAP logout timer does not work yet.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.81 2018-12-04 Wekan release
-
-This release fixes the following bugs:
-
- Remove extra commas `,` and add missing backslash `\`. 
-  Maybe after that login, logout and CORS works.
-
-Thanks to GitHub user xet7 for contributions.
-
-Related #2045,
-related wekan/wekan-snap#69
-
-# v1.80 2018-12-03 Wekan release
-
-This release adds the following new features:
-
- Upgrade Node from v8.12 to v8.14
-
-and fixes the following bugs:
-
- Revert non-working architectures that were added at v1.79, so now Wekan is just amd64 as before.
-
-Thanks to GitHub user xet7 for contributions.
-
-# v1.79 2018-12-03 Wekan release
-
-This release adds the following new features:
-
- [Improve authentication, removing Login password/LDAP dropdown](https://github.com/wekan/wekan/issues/2016).
-  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
-  Thanks to Akuket.
- Thanks to xet7:
-  - Build snap also on i386, armhf and arm64. Ignore if it fails. More fixes will be added later.
-  - Add CORS https://enable-cors.org/server_meteor.html to Standalone Wekan settings.
-  - Add missing LDAP and TIMER environment variables.
-
-and fixes the following bugs:
-
- Fix: Message box for deleting subtask unreachable.
-  Thanks to hupptechnologies. Closes #1800
- Fix wrong dates in ChangeLog. Thanks to kelvinhammond.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.78 2018-11-20 Wekan release
-
- Update translations (de).
-
-# v1.77 2018-11-20 Wekan release
-
- Update version number. Trying to get Snap automatic review working, so that
-  it would accept new Wekan release.
-
-# v1.76 2018-11-20 Wekan release
-
-This release adds the following new features:
-
- Add [LDAP_FULLNAME_FIELD](https://github.com/wekan/wekan-ldap/issues/10) to
-  [configs](https://github.com/wekan/wekan/commit/8e3f53021775069dba125efd4b7200d0d70a1ed1)
-  and other options that were not in all config files. Thanks to alkemyst and xet7.
-
-and fixes the following bugs:
-
- Fix: When saving Custom Layout, save also SMTP settings. Thanks to xet7.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.75 2018-11-20 Wekan release
-
-This release adds the following new features:
-
- Admin Panel / Layout: Hide Logo: Yes / No. This does hide Wekan logo on Login page and Board page. Thanks to xet7.
-
-and fixes the following bugs:
-
- [Fix Snap database-list-backups command](https://github.com/wekan/wekan-snap/issues/26). Thanks to WaryWolf.
-
-Thanks to above GitHub users for their contributions.
-
-# v1.74.1 2018-11-18 Wekan Edge release
-
-This release adds the following new features:
-
- [Full Name from LDAP server via environment variable](https://github.com/wekan/wekan-ldap/pull/18).
-
-Thanks to GitHub user alkemyst for contributions.
-
-# v1.74 2018-11-17 Wekan release
-
- Update version number to get this released to snap. Thanks to xet7.
-
-# v1.73 2018-11-17 Wekan release
-
-This release fixes the following bugs:
-
- Revert Improve authentication to [fix Login failure](https://github.com/wekan/wekan/issues/2004).
-  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
-
-Thanks to GitHub users Broxxx3 and xet7 for their contributions.
-
-# v1.72 2018-11-17 Wekan release
-
- Update translations (fi).
-
-# v1.71 2018-11-17 Wekan release
-
-This release adds the following new features and bugfixes:
-
- Add languages, thanks to translators:
-  - Danish
-  - Swahili / Kiswahili
- Rename Recycle Bin to Archive. Thanks to xet7.
- Update readme for clarity. Thanks to xet7.
- [Improve authentication](https://github.com/wekan/wekan/pull/2003), thanks to Akuket:
-  - Removing the select box: Now it just checks the user.authenticationMethod value to choose the authentication method.
-  - Adding an option to choose the default authentication method with env var.
-  - Bug fix that allowed a user to connect with the password method while his user.authenticationMethod is "ldap" for example.
-  - Adding a server-side method which allows disconnecting a user after a delay defined by env vars.
-  - NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
- [Improve shell scripts](https://github.com/wekan/wekan/pull/2002). Thanks to warnerjon12.
-
-Thanks to above GitHub users and translators for their contributions.
-
-# v1.70 2018-11-09 Wekan release
-
-This release adds the following new features:
-
- [Auto create Custom Field to all cards. Show Custom Field Label on
-   minicard](https://github.com/wekan/wekan/pull/1987).
-
-and fixes the following bugs:
-
- Some fixes to Wekan import, thanks to xet7:
-  - isCommentOnly and isNoComments are now optional
-  - Turn off import error checking, so something is imported anyway, and import does not stop at error.
-  - Now most of Sandstorm export do import to Standalone Wekan, but some of imported cards, dates etc are missing.
-  - Sandstorm Import Wekan board warning messages are now translateable. But bug "Board not found" still exists.
- LDAP: Added INTERNAL_LOG_LEVEL. Fix lint and ldap group filter options. Thanks to Akuket.
-
-Thanks to above mentioned GitHub users for their contributions.
+Thanks to xet7 !

 # v1.69 2018-11-03 Wekan release

@@ -889,11 +90,11 @@ REST API: [Allow to remove the full list of labels/members through the API](http

 Thanks to GitHub user bentiss for contributions.

-# v1.62 2018-10-24 Wekan release
+# v1.62 2018-20-24 Wekan release

 - Fix missing dropdown arrow on Chrome. Thanks to xet7. Closes #1964

-# v1.61 2018-10-24 Wekan release
+# v1.61 2018-20-24 Wekan release

 - Fix lint error. Thanks to xet7.

@@ -2,7 +2,6 @@ FROM debian:buster-slim
 LABEL maintainer="wekan"

 # Declare Arguments
-ARG DEBUG
 ARG NODE_VERSION
 ARG METEOR_RELEASE
 ARG METEOR_EDGE
@@ -12,7 +11,6 @@ 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
@@ -27,10 +25,6 @@ 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 LDAP_ENABLE
 ARG LDAP_PORT
 ARG LDAP_HOST
@@ -65,29 +59,17 @@ ARG LDAP_GROUP_FILTER_GROUP_NAME
 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
 ARG LDAP_SYNC_GROUP_ROLES
 ARG LDAP_DEFAULT_DOMAIN
-ARG LOGOUT_WITH_TIMER
-ARG LOGOUT_IN
-ARG LOGOUT_ON_HOURS
-ARG LOGOUT_ON_MINUTES
-ARG CORS
-ARG DEFAULT_AUTHENTICATION_METHOD

 # Set the environment variables (defaults where required)
 # 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.1 \
+ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
+    NODE_VERSION=v8.12.0 \
    METEOR_RELEASE=1.6.0.1 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -96,7 +78,6 @@ 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 \
@@ -111,10 +92,6 @@ 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="" \
    LDAP_ENABLE=false \
    LDAP_PORT=389 \
    LDAP_HOST="" \
@@ -149,22 +126,11 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_UNIQUE_IDENTIFIER_FIELD="" \
    LDAP_UTF8_NAMES_SLUGIFY=true \
    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="" \
-    LDAP_DEFAULT_DOMAIN="" \
-    LOGOUT_WITH_TIMER=false \
-    LOGOUT_IN="" \
-    LOGOUT_ON_HOURS="" \
-    LOGOUT_ON_MINUTES="" \
-    CORS="" \
-    DEFAULT_AUTHENTICATION_METHOD=""
+    LDAP_DEFAULT_DOMAIN=""

 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
@@ -193,7 +159,7 @@ RUN \
    # Also see beginning of wekan/server/authentication.js
    #   import Fiber from "fibers";
    #   Fiber.poolSize = 1e9;
-    # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released
+    # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released 
    # Description at https://releases.wekan.team/node.txt
    #wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
    #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795  node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
@@ -266,27 +232,10 @@ RUN \
    gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \
-    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \
-    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
-    gosu wekan:wekan rm -rf meteor-accounts-oidc && \
    sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
    cd /home/wekan/.meteor && \
    gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
    \
-    # extract the OpenAPI specification
-    npm install -g api2html && \
-    mkdir -p /home/wekan/python && \
-    chown wekan:wekan --recursive /home/wekan/python && \
-    cd /home/wekan/python && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/Kronuz/esprima-python && \
-    cd /home/wekan/python/esprima-python && \
-    python3 setup.py install --record files.txt && \
-    cd /home/wekan/app &&\
-    mkdir -p ./public/api && \
-    python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
-    /opt/nodejs/bin/api2html -c ./public/wekan-logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
    # Build app
    cd /home/wekan/app && \
    gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
@@ -311,13 +260,10 @@ RUN \
    # Cleanup
    apt-get remove --purge -y ${BUILD_DEPS} && \
    apt-get autoremove -y && \
-    npm uninstall -g api2html &&\
    rm -R /var/lib/apt/lists/* && \
    rm -R /home/wekan/.meteor && \
    rm -R /home/wekan/app && \
    rm -R /home/wekan/app_build && \
-    cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
-    rm -R /home/wekan/python && \
    rm /home/wekan/install_meteor.sh

 ENV PORT=8080
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014-2019 The Wekan Team
+Copyright (c) 2014-2018 The Wekan Team

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,103 +1,4 @@
-# Wekan - Open Source kanban
-
-[![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
-[![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
-[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container status")](https://hub.docker.com/r/wekanteam/wekan)
-[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.docker.com/r/wekanteam/wekan)
-[![Wekan Build Status][travis_badge]][travis_status]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wekan/wekan&amp;utm_campaign=Badge_Grade)
-[![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
-[![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
-[![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
-
-## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
-
-Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.
-New English strings of new features can be added as PRs to edge branch file wekan/i18n/en.i18n.json .
-
-## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)
-
-Please add most of your questions as GitHub issue: [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues).
-It's better than at chat where details get lost when chat scrolls up.
-
-## Chat
-
-[![Wekan Vanila Chat][vanila_badge]][vanila_chat] - Most Wekan community and developers are here at #wekan chat channel.
-Use webbrowser to register, and after that you can also alternatively use mobile app Rocket.Chat by Rocket.Chat with
-address https://chat.vanila.io and same username and password.
-
-[Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
-
-## FAQ
-
-**NOTE**: 
- Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
- Please don't feed the trolls and spammers that are mentioned in the FAQ :)
-
-## About Wekan
-
-Wekan is an completely [Open Source][open_source] and [Free software][free_software]
-collaborative kanban board application with MIT license.
-
-Whether you’re maintaining a personal todo list, planning your holidays with some friends,
-or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool
-to keep your things organized. They give you a visual overview of the current state of your project,
-and make you productive by allowing you to focus on the few items that matter the most.
-
-Since Wekan is a free software, you don’t have to trust us with your data and can
-install Wekan on your own computer or server. In fact we encourage you to do
-that by providing one-click installation on various platforms.
-
- Wekan is used in [most countries of the world](https://snapcraft.io/wekan).
- Wekan largest user has 13k users using Wekan in their company.
- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 50 languages.
- [Features][features]: Wekan has real-time user interface.
- [Platforms][platforms]: Wekan supports many platforms.
-  Wekan is critical part of new platforms Wekan is currently being integrated to.
- [Integrations][integrations]: Current possible integrations and future plans.
-
-## Requirements
-
- 64bit: Linux [Snap](https://github.com/wekan/wekan-snap/wiki/Install) or [Sandstorm](https://sandstorm.io) /
-  [Mac](https://github.com/wekan/wekan/wiki/Mac) / [Windows](https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows).
-  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms). [ARM progress](https://github.com/wekan/wekan/issues/1053#issuecomment-410919264).
- 1 GB RAM minimum free for Wekan. Production server should have miminum total 4 GB RAM.
-  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/devel/docker-compose.yml): 3 frontend servers,
-  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
- Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
- SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
-  Old versions have security issues because of old versions Node.js etc. Only newest Wekan is supported.
-  Wekan on Sandstorm is not usually affected by any Standalone Wekan (Snap/Docker/Source) security issues.
- [Reporting all new bugs immediately](https://github.com/wekan/wekan/issues).
-  New features and fixes are added to Wekan [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
- [Backups](https://github.com/wekan/wekan/wiki/Backup) of Wekan database once a day miminum.
-  Bugs, updates, users deleting list or card, harddrive full, harddrive crash etc can eat your data. There is no undo yet.
-  Some bug can cause Wekan board to not load at all, requiring manual fixing of database content.
-
-## Roadmap
-
-[Roadmap Milestones](https://github.com/wekan/wekan/milestones)
-
-[Developer Documentation][dev_docs]
-
- There is many companies and individuals contributing code to Wekan, to add features and bugfixes
-  [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
- [Please add Add new Feature Requests and Bug Reports immediately](https://github.com/wekan/wekan/issues).
- [Commercial Support](https://wekan.team).
- [Bounties](https://wekan.team/bounties/index.html).
-
-We also welcome sponsors for features and bugfixes.
-By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.
-
-## Demo
-
-[Wekan demo][roadmap_wefork]
-
-## Screenshot
-
-[More screenshots at Features page](https://github.com/wekan/wekan/wiki/Features)
-
-[![Screenshot of Wekan][screenshot_wefork]][roadmap_wefork]
+# Wekan

 ## Stable

@@ -110,6 +11,66 @@ By working directly with Wekan you get the benefit of active maintenance and new

 - edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs).

+[![Translate Wekan at Transifex](https://img.shields.io/badge/Translate%20Wekan-at%20Transifex-brightgreen.svg "Freenode IRC")](https://transifex.com/wekan/wekan)
+
+[![Wekan Vanila Chat][vanila_badge]][vanila_chat] 
+[![IRC #wekan](https://img.shields.io/badge/IRC%20%23wekan-on%20Freenode-brightgreen.svg "Freenode IRC")](http://webchat.freenode.net?channels=%23wekan&uio=d4)
+
+[![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
+[![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
+[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container status")](https://hub.docker.com/r/wekanteam/wekan)
+[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.docker.com/r/wekanteam/wekan)
+[![Wekan Build Status][travis_badge]][travis_status]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wekan/wekan&amp;utm_campaign=Badge_Grade)
+[![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
+[![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
+[![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
+
+**NOTE**: 
+- Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
+- Please don't feed the trolls and spammers that are mentioned in the FAQ :)
+
+Wekan is an completely [Open Source][open_source] and [Free software][free_software]
+collaborative kanban board application with MIT license.
+
+Whether you’re maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most.
+
+Since Wekan is a free software, you don’t have to trust us with your data and can
+install Wekan on your own computer or server. In fact we encourage you to do
+that by providing one-click installation on various platforms.
+
+- [Features][features]: Wekan has real-time user interface. Not all features are implemented, yet.
+- [Platforms][platforms]: Wekan supports many platforms and plan is to add more. This will be the first place to look if you want to **install** it, test out and learn more in depth.
+- [Integrations][integrations]: Current possible integrations and future plans.
+- [Team](https://github.com/wekan/wekan/wiki/Team): The people who spends their time and make wekan into what it is right now.
+
+## Roadmap
+
+[Roadmap](https://github.com/wekan/wekan/wiki/Roadmap)
+
+Upcoming Wekan App Development Platform will make possible many use cases. If you don't find your feature or integration in
+GitHub issues and [Features][features] or [Integrations][integrations] page at wiki, please add them.
+
+We are very welcoming to new developers and teams to submit new pull requests to devel branch to make this Wekan App Development Platform possible faster. Please see [Developer Documentation][dev_docs] to get started.
+
+We also welcome sponsors for features and bugfixes. By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.
+
+Actual work happens at [Wekan GitHub issues][wekan_issues].
+
+See [Development links on Wekan wiki](https://github.com/wekan/wekan/wiki#Development) bottom of the page for more info.
+
+If you want to know what is going on exactly this moment, you can check out the [project page](https://github.com/wekan/wekan/projects/2).
+
+## Demo
+
+[Wekan demo][roadmap_wefork]
+
+## Screenshot
+
+[More screenshots at Features page](https://github.com/wekan/wekan/wiki/Features)
+
+[![Screenshot of Wekan][screenshot_wefork]][roadmap_wefork]
+
 ## License

 Wekan is released under the very permissive [MIT license](LICENSE), and made
@@ -1,9 +0,0 @@
-appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.37.0"
-files:
-  userUploads:
-    - README.md
-  userScripts:
-    build: stacksmith/user-scripts/build.sh
-    boot: stacksmith/user-scripts/boot.sh
-    run: stacksmith/user-scripts/run.sh
@@ -1,3 +1,9 @@
+Template.boardListHeaderBar.events({
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('archivedBoards');
@@ -20,20 +20,16 @@ template(name="boardBody")
      class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
      if showOverlay.get
        .board-overlay
-      if currentBoard.isTemplatesBoard
+      if isViewSwimlanes
        each currentBoard.swimlanes
          +swimlane(this)
-      else if isViewSwimlanes
-        each currentBoard.swimlanes
-          +swimlane(this)
-      else if isViewLists
-        +listsGroup(currentBoard)
-      else if isViewCalendar
+      if isViewLists
+        +listsGroup
+      if isViewCalendar
        +calendarView

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

 BlazeComponent.extendComponent({
  onCreated() {
@@ -36,37 +35,6 @@ 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;
@@ -75,64 +43,21 @@ BlazeComponent.extendComponent({
    $swimlanesDom.sortable({
      tolerance: 'pointer',
      appendTo: '.board-canvas',
-      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;
-      },
+      helper: 'clone',
      handle: '.js-swimlane-header',
-      items: '.swimlane:not(.placeholder)',
+      items: '.js-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.prevAll('.js-swimlane').get(0);
-        const nextSwimlaneDom = ui.item.nextAll('.js-swimlane').get(0);
+        const prevSwimlaneDom = ui.item.prev('.js-swimlane').get(0);
+        const nextSwimlaneDom = ui.item.next('.js-swimlane').get(0);
        const sortIndex = calculateIndex(prevSwimlaneDom, nextSwimlaneDom, 1);

        $swimlanesDom.sortable('cancel');
@@ -147,30 +72,6 @@ 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
@@ -202,7 +103,7 @@ BlazeComponent.extendComponent({

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

@@ -332,9 +233,4 @@ BlazeComponent.extendComponent({
      },
    };
  },
-  isViewCalendar() {
-    const currentUser = Meteor.user();
-    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-cal');
-  },
 }).register('calendarView');
@@ -7,69 +7,71 @@ template(name="boardHeaderBar")

  .board-header-btns.left
    unless isMiniScreen
-      if currentBoard
-        if currentUser
-          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-            if showStarCounter
-              span
-                = currentBoard.stars
+      unless isSandstorm
+        if currentBoard
+          if currentUser
+            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+              if showStarCounter
+                span
+                  = currentBoard.stars

-          a.board-header-btn(
-            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-            title="{{_ currentBoard.permission}}")
-            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-            span {{_ currentBoard.permission}}
+            a.board-header-btn(
+              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+              title="{{_ currentBoard.permission}}")
+              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+              span {{_ currentBoard.permission}}

-          a.board-header-btn.js-watch-board(
-            title="{{_ watchLevel }}")
-            if $eq watchLevel "watching"
-              i.fa.fa-eye
-            if $eq watchLevel "tracking"
-              i.fa.fa-bell
-            if $eq watchLevel "muted"
-              i.fa.fa-bell-slash
-            span {{_ watchLevel}}
+            a.board-header-btn.js-watch-board(
+              title="{{_ watchLevel }}")
+              if $eq watchLevel "watching"
+                i.fa.fa-eye
+              if $eq watchLevel "tracking"
+                i.fa.fa-bell
+              if $eq watchLevel "muted"
+                i.fa.fa-bell-slash
+              span {{_ watchLevel}}

-        else
-          a.board-header-btn.js-log-in(
-            title="{{_ 'log-in'}}")
-            i.fa.fa-sign-in
-            span {{_ 'log-in'}}
+          else
+            a.board-header-btn.js-log-in(
+              title="{{_ 'log-in'}}")
+              i.fa.fa-sign-in
+              span {{_ 'log-in'}}

  .board-header-btns.right
    if currentBoard
      if isMiniScreen
-        if currentUser
-          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-            if showStarCounter
-              span
-                = currentBoard.stars
+        unless isSandstorm
+          if currentUser
+            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+              if showStarCounter
+                span
+                  = currentBoard.stars

-          a.board-header-btn(
-            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-            title="{{_ currentBoard.permission}}")
-            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-            span {{_ currentBoard.permission}}
+            a.board-header-btn(
+              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+              title="{{_ currentBoard.permission}}")
+              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+              span {{_ currentBoard.permission}}

-          a.board-header-btn.js-watch-board(
-            title="{{_ watchLevel }}")
-            if $eq watchLevel "watching"
-              i.fa.fa-eye
-            if $eq watchLevel "tracking"
-              i.fa.fa-bell
-            if $eq watchLevel "muted"
-              i.fa.fa-bell-slash
-            span {{_ watchLevel}}
+            a.board-header-btn.js-watch-board(
+              title="{{_ watchLevel }}")
+              if $eq watchLevel "watching"
+                i.fa.fa-eye
+              if $eq watchLevel "tracking"
+                i.fa.fa-bell
+              if $eq watchLevel "muted"
+                i.fa.fa-bell-slash
+              span {{_ watchLevel}}

-        else
-          a.board-header-btn.js-log-in(
-            title="{{_ 'log-in'}}")
-            i.fa.fa-sign-in
-            span {{_ 'log-in'}}
+          else
+            a.board-header-btn.js-log-in(
+              title="{{_ 'log-in'}}")
+              i.fa.fa-sign-in
+              span {{_ 'log-in'}}

      if isSandstorm
        if currentUser
@@ -94,11 +96,10 @@ template(name="boardHeaderBar")
        i.fa.fa-search
        span {{_ 'search'}}

-      unless currentBoard.isTemplatesBoard
-        a.board-header-btn.js-toggle-board-view(
-          title="{{_ 'board-view'}}")
-          i.fa.fa-th-large
-          span {{_ currentUser.profile.boardView}}
+      a.board-header-btn.js-toggle-board-view(
+        title="{{_ 'board-view'}}")
+        i.fa.fa-th-large
+        span {{_ currentUser.profile.boardView}}

      if canModifyBoard
        a.board-header-btn.js-multiselection-activate(
@@ -111,8 +112,40 @@ template(name="boardHeaderBar")
              i.fa.fa-times-thin

      .separator
-      a.board-header-btn.js-toggle-sidebar
-        i.fa.fa-navicon
+      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}")
+        i.board-header-btn-icon.fa.fa-navicon
+
+template(name="boardMenuPopup")
+  ul.pop-over-list
+    li: a.js-custom-fields {{_ 'custom-fields'}}
+    li: a.js-open-archives {{_ 'archived-items'}}
+    if currentUser.isBoardAdmin
+      li: a.js-change-board-color {{_ 'board-change-color'}}
+    //-
+      XXX Language should be handled by sandstorm, but for now display a
+      language selection link in the board menu. This link is normally present
+      in the header bar that is not displayed on sandstorm.
+    if isSandstorm
+      li: a.js-change-language {{_ 'language'}}
+  unless isSandstorm
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
+        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+        li: a.js-archive-board {{_ 'archive-board'}}
+        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+      hr
+      ul.pop-over-list
+        li: a.js-subtask-settings {{_ 'subtask-settings'}}
+
+  if isSandstorm
+    hr
+    ul.pop-over-list
+      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+      li: a.js-import-board {{_ 'import-board-c'}}
+    hr
+    ul.pop-over-list
+      li: a.js-subtask-settings {{_ 'subtask-settings'}}

 template(name="boardVisibilityList")
  ul.pop-over-list
@@ -163,6 +196,64 @@ template(name="boardChangeWatchPopup")
            i.fa.fa-check
          span.sub-name {{_ 'muted-info'}}

+template(name="boardChangeColorPopup")
+  .board-backgrounds-list.clearfix
+    each backgroundColors
+      .board-background-select.js-select-background
+        span.background-box(class="board-color-{{this}}")
+          if isSelected
+            i.fa.fa-check
+
+template(name="boardSubtaskSettingsPopup")
+  form.board-subtask-settings
+    h3 {{_ 'show-parent-in-minicard'}}
+      a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-full-path'}}
+      a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-parent'}}
+      a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-full-path'}}
+      a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-parent'}}
+      a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        span {{_ 'no-parent'}}
+    div
+      hr
+
+    div.check-div
+      a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        span {{_ 'show-subtasks-field'}}
+
+    label
+      | {{_ 'deposit-subtasks-board'}}
+      select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}")
+          each boards
+            if isBoardSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+          if isNullBoardSelected
+            option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}}
+          else
+            option(value='null') {{_ 'custom-field-dropdown-none'}}
+    div
+      hr
+
+    label
+      | {{_ 'deposit-subtasks-list'}}
+      select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}")
+          each lists
+            if isListSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+
 template(name="createBoard")
  form
    label
@@ -184,10 +275,14 @@ template(name="createBoard")
    input.primary.wide(type="submit" value="{{_ 'create'}}")
    span.quiet
      | {{_ 'or'}}
-      a.js-import-board {{_ 'import'}}
-    span.quiet
-      | /
-      a.js-board-template {{_ 'template'}}
+      a.js-import-board {{_ 'import-board'}}
+
+template(name="chooseBoardSource")
+  ul.pop-over-list
+    li
+      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
+    li
+      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}

 template(name="boardChangeTitlePopup")
  form
@@ -202,3 +297,28 @@ template(name="boardChangeTitlePopup")
 template(name="boardCreateRulePopup")
  p {{_ 'close-board-pop'}}
  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+
+template(name="archiveBoardPopup")
+  p {{_ 'close-board-pop'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+template(name="outgoingWebhooksPopup")
+  each integrations
+    form.integration-form
+      if title
+        h4 {{title}}
+      else
+        h4 {{_ 'no-name'}}
+      label
+        | URL
+        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
+        input(type="hidden" value=_id name="id")
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+  form.integration-form
+    h4
+      | {{_ 'new-outgoing-webhook'}}
+    label
+      | URL
+      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
+    input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -97,9 +97,6 @@ BlazeComponent.extendComponent({
          currentUser.setBoardView('board-view-lists');
        }
      },
-      'click .js-toggle-sidebar'() {
-        Sidebar.toggle();
-      },
      'click .js-open-filter-view'() {
        Sidebar.setView('filter');
      },
@@ -138,6 +135,124 @@ Template.boardHeaderBar.helpers({
  },
 });

+BlazeComponent.extendComponent({
+  backgroundColors() {
+    return Boards.simpleSchema()._schema.color.allowedValues;
+  },
+
+  isSelected() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    return currentBoard.color === this.currentData().toString();
+  },
+
+  events() {
+    return [{
+      'click .js-select-background'(evt) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const newColor = this.currentData().toString();
+        currentBoard.setColor(newColor);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardChangeColorPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+  },
+
+  allowsSubtasks() {
+    return this.currentBoard.allowsSubtasks;
+  },
+
+  isBoardSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  isNullBoardSelected() {
+    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
+  },
+
+  boards() {
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  lists() {
+    return Lists.find({
+      boardId: this.currentBoard._id,
+      archived: false,
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  hasLists() {
+    return this.lists().count() > 0;
+  },
+
+  isListSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  presentParentTask() {
+    let result = this.currentBoard.presentParentTask;
+    if ((result === null) || (result === undefined)) {
+      result = 'no-parent';
+    }
+    return result;
+  },
+
+  events() {
+    return [{
+      'click .js-field-has-subtasks'(evt) {
+        evt.preventDefault();
+        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
+        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
+      },
+      'change .js-field-deposit-board'(evt) {
+        let value = evt.target.value;
+        if (value === 'null') {
+          value = null;
+        }
+        this.currentBoard.setSubtasksDefaultBoardId(value);
+        evt.preventDefault();
+      },
+      'change .js-field-deposit-list'(evt) {
+        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
+        evt.preventDefault();
+      },
+      'click .js-field-show-parent-in-minicard'(evt) {
+        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
+        const options = [
+          'prefix-with-full-path',
+          'prefix-with-parent',
+          'subtext-with-full-path',
+          'subtext-with-parent',
+          'no-parent'];
+        options.forEach(function(element) {
+          if (element !== value) {
+            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
+            $(`#${element}`).toggleClass('is-checked', false);
+          }
+        });
+        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
+        $(`#${value}`).toggleClass('is-checked', true);
+        this.currentBoard.setPresentParentTask(value);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardSubtaskSettingsPopup');
+
 const CreateBoard = BlazeComponent.extendComponent({
  template() {
    return 'createBoard';
@@ -189,11 +304,16 @@ const CreateBoard = BlazeComponent.extendComponent({
      'click .js-import': Popup.open('boardImportBoard'),
      submit: this.onSubmit,
      'click .js-import-board': Popup.open('chooseBoardSource'),
-      'click .js-board-template': Popup.open('searchElement'),
    }];
  },
 }).register('createBoardPopup');

+BlazeComponent.extendComponent({
+  template() {
+    return 'chooseBoardSource';
+  },
+}).register('chooseBoardSourcePopup');
+
 (class HeaderBarCreateBoard extends CreateBoard {
  onSubmit(evt) {
    super.onSubmit(evt);
@@ -243,3 +363,50 @@ BlazeComponent.extendComponent({
    }];
  },
 }).register('boardChangeWatchPopup');
+
+BlazeComponent.extendComponent({
+  integrations() {
+    const boardId = Session.get('currentBoard');
+    return Integrations.find({ boardId: `${boardId}` }).fetch();
+  },
+
+  integration(id) {
+    const boardId = Session.get('currentBoard');
+    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
+  },
+
+  events() {
+    return [{
+      'submit'(evt) {
+        evt.preventDefault();
+        const url = evt.target.url.value;
+        const boardId = Session.get('currentBoard');
+        let id = null;
+        let integration = null;
+        if (evt.target.id) {
+          id = evt.target.id.value;
+          integration = this.integration(id);
+          if (url) {
+            Integrations.update(integration._id, {
+              $set: {
+                url: `${url}`,
+              },
+            });
+          } else {
+            Integrations.remove(integration._id);
+          }
+        } else if (url) {
+          Integrations.insert({
+            userId: Meteor.userId(),
+            enabled: true,
+            type: 'outgoing-webhooks',
+            url: `${url}`,
+            boardId: `${boardId}`,
+            activities: ['all'],
+          });
+        }
+        Popup.close();
+      },
+    }];
+  },
+}).register('outgoingWebhooksPopup');
@@ -36,6 +36,3 @@ template(name="boardListHeaderBar")
    a.board-header-btn.js-open-archived-board
      i.fa.fa-archive
      span {{_ 'archives'}}
-    a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
-      i.fa.fa-clone
-      span {{_ 'templates'}}
@@ -1,20 +1,5 @@
 const subManager = new SubsManager();

-Template.boardListHeaderBar.events({
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
-  },
-});
-
-Template.boardListHeaderBar.helpers({
-  templatesBoardId() {
-    return Meteor.user().getTemplatesBoardId();
-  },
-  templatesBoardSlug() {
-    return Meteor.user().getTemplatesBoardSlug();
-  },
-});
-
 BlazeComponent.extendComponent({
  onCreated() {
    Meteor.subscribe('setting');
@@ -24,7 +9,6 @@ BlazeComponent.extendComponent({
    return Boards.find({
      archived: false,
      'members.userId': Meteor.userId(),
-      type: 'board',
    }, {
      sort: ['title'],
    });
@@ -1,8 +0,0 @@
-template(name="miniboard")
-  .minicard(
-    class="minicard-{{colorClass}}")
-    .minicard-title
-      .handle
-        .fa.fa-arrows
-      +viewer
-        = title
@@ -1,6 +1,6 @@
 template(name="cardDetails")
  section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas
-    .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
+    .card-details-header
      +inlinedForm(classNames="js-card-details-title")
        +editCardTitleForm
      else
@@ -19,14 +19,16 @@ template(name="cardDetails")
            a.js-parent-card(href=linkForCard) {{title}}
          // else
            {{_ 'top-level-card'}}
-        if isLinkedCard
-          h3.linked-card-location
-            +viewer
-              | {{getBoardTitle}} > {{getTitle}}
+        unless isSandstorm
+          if isLinkedCard
+            h3.linked-card-location
+              +viewer
+                | {{getBoardTitle}} > {{getTitle}}

    if getArchived
      if isLinkedBoard
-        p.warning {{_ 'board-archived'}}
+        unless isSandstorm
+          p.warning {{_ 'board-archived'}}
      else
        p.warning {{_ 'card-archived'}}

@@ -190,9 +192,11 @@ template(name="cardDetails")
    unless currentUser.isNoComments
      if isLoaded.get
        if isLinkedCard
-          +activities(card=this mode="linkedcard")
+          unless isSandstorm
+            +activities(card=this mode="linkedcard")
        else if isLinkedBoard
-          +activities(card=this mode="linkedboard")
+          unless isSandstorm
+            +activities(card=this mode="linkedboard")
        else
          +activities(card=this mode="card")

@@ -230,7 +234,6 @@ 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 {{_ 'setCardColorPopup-title'}}
    hr
    ul.pop-over-list
      li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -261,7 +264,7 @@ template(name="copyChecklistToManyCardsPopup")

 template(name="boardsAndLists")
  label {{_ 'boards'}}:
-  select.js-select-boards(autofocus)
+  select.js-select-boards
    each boards
      if $eq _id currentBoard._id
        option(value="{{_id}}" selected) {{_ 'current'}}
@@ -299,7 +302,7 @@ template(name="cardMorePopup")
      span {{_ 'link-card'}}
      = ' '
      i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus")
+      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}")
      button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}}
    span.clearfix
    br
@@ -332,15 +335,7 @@ template(name="cardMorePopup")
    span.date(title=card.createdAt) {{ moment createdAt 'LLL' }}
    a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}

-template(name="setCardColorPopup")
-  form.edit-label
-    .palette-colors: each colors
-      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'}}
+

 template(name="cardDeletePopup")
  p {{_ "card-delete-pop"}}
@@ -1,11 +1,6 @@
 const subManager = new SubsManager();
 const { calculateIndexData, enableClickOnTouch } = Utils;

-let cardColors;
-Meteor.startup(() => {
-  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
-});
-
 BlazeComponent.extendComponent({
  mixins() {
    return [Mixins.InfiniteScrolling, Mixins.PerfectScrollbar];
@@ -78,13 +73,14 @@ BlazeComponent.extendComponent({
    //Scroll top
    const cardViewStartTop = $cardView.offset().top;
    const cardContainerScrollTop = $cardContainer.scrollTop();
-
    let topOffset = false;
-    if(cardViewStartTop !== 100){
-      topOffset = cardViewStartTop - 100;
+    if(cardViewStartTop < 0){
+      topOffset = 0;
+    } else if(cardViewStartTop - cardContainerScrollTop > 100) {
+      topOffset = cardViewStartTop - cardContainerScrollTop - 100;
    }
    if(topOffset !== false) {
-      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
+      bodyBoardComponent.scrollTop(topOffset);
    }

  },
@@ -116,7 +112,6 @@ BlazeComponent.extendComponent({
  onRendered() {
    if (!Utils.isMiniScreen()) {
      Meteor.setTimeout(() => {
-        $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
        this.scrollParentContainer();
      }, 500);
    }
@@ -341,7 +336,6 @@ Template.cardDetailsActionsPopup.events({
  'click .js-move-card': Popup.open('moveCard'),
  'click .js-copy-card': Popup.open('copyCard'),
  'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
-  'click .js-set-card-color': Popup.open('setCardColor'),
  'click .js-move-card-to-top' (evt) {
    evt.preventDefault();
    const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
@@ -456,15 +450,32 @@ BlazeComponent.extendComponent({
  },
 }).register('boardsAndLists');

+
+function cloneCheckList(_id, checklist) {
+  'use strict';
+  const checklistId = checklist._id;
+  checklist.cardId = _id;
+  checklist._id = null;
+  const newChecklistId = Checklists.insert(checklist);
+  ChecklistItems.find({checklistId}).forEach(function(item) {
+    item._id = null;
+    item.checklistId = newChecklistId;
+    item.cardId = _id;
+    ChecklistItems.insert(item);
+  });
+}
+
 Template.copyCardPopup.events({
  'click .js-done'() {
    const card = Cards.findOne(Session.get('currentCard'));
+    const oldId = card._id;
+    card._id = null;
    const lSelect = $('.js-select-lists')[0];
-    listId = lSelect.options[lSelect.selectedIndex].value;
+    card.listId = lSelect.options[lSelect.selectedIndex].value;
    const slSelect = $('.js-select-swimlanes')[0];
-    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
    const bSelect = $('.js-select-boards')[0];
-    const boardId = bSelect.options[bSelect.selectedIndex].value;
+    card.boardId = bSelect.options[bSelect.selectedIndex].value;
    const textarea = $('#copy-card-title');
    const title = textarea.val().trim();
    // insert new card to the bottom of new list
@@ -473,13 +484,38 @@ Template.copyCardPopup.events({
    if (title) {
      card.title = title;
      card.coverId = '';
-      const _id = card.copy(boardId, swimlaneId, listId);
+      const _id = Cards.insert(card);
      // 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
      // card will disappear instantly.
      // See https://github.com/wekan/wekan/issues/80
      Filter.addException(_id);

+      // copy checklists
+      let cursor = Checklists.find({cardId: oldId});
+      cursor.forEach(function() {
+        cloneCheckList(_id, arguments[0]);
+      });
+
+      // copy subtasks
+      cursor = Cards.find({parentId: oldId});
+      cursor.forEach(function() {
+        'use strict';
+        const subtask = arguments[0];
+        subtask.parentId = _id;
+        subtask._id = null;
+        /* const newSubtaskId = */ Cards.insert(subtask);
+      });
+
+      // copy card comments
+      cursor = CardComments.find({cardId: oldId});
+      cursor.forEach(function () {
+        'use strict';
+        const comment = arguments[0];
+        comment.cardId = _id;
+        comment._id = null;
+        CardComments.insert(comment);
+      });
      Popup.close();
    }
  },
@@ -516,8 +552,9 @@ Template.copyChecklistToManyCardsPopup.events({
        Filter.addException(_id);

        // copy checklists
-        Checklists.find({cardId: oldId}).forEach((ch) => {
-          ch.copy(_id);
+        let cursor = Checklists.find({cardId: oldId});
+        cursor.forEach(function() {
+          cloneCheckList(_id, arguments[0]);
        });

        // copy subtasks
@@ -531,8 +568,13 @@ Template.copyChecklistToManyCardsPopup.events({
        });

        // copy card comments
-        CardComments.find({cardId: oldId}).forEach((cmt) => {
-          cmt.copy(_id);
+        cursor = CardComments.find({cardId: oldId});
+        cursor.forEach(function () {
+          'use strict';
+          const comment = arguments[0];
+          comment.cardId = _id;
+          comment._id = null;
+          CardComments.insert(comment);
        });
      }
      Popup.close();
@@ -540,40 +582,6 @@ Template.copyChecklistToManyCardsPopup.events({
  },
 });

-BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentCard = this.currentData();
-    this.currentColor = new ReactiveVar(this.currentCard.color);
-  },
-
-  colors() {
-    return cardColors.map((color) => ({ color, name: '' }));
-  },
-
-  isSelected(color) {
-    if (this.currentColor.get() === null) {
-      return color === 'white';
-    }
-    return this.currentColor.get() === color;
-  },
-
-  events() {
-    return [{
-      'click .js-palette-color'() {
-        this.currentColor.set(this.currentData().color);
-      },
-      'click .js-submit' () {
-        this.currentCard.setColor(this.currentColor.get());
-        Popup.close();
-      },
-      'click .js-remove-color'() {
-        this.currentCard.setColor(null);
-        Popup.close();
-      },
-    }];
-  },
-}).register('setCardColorPopup');
-
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentCard = this.currentData();
@@ -1,9 +1,9 @@
@import 'nib'

 .card-details
-  padding: 0
+  padding: 0 20px
  flex-shrink: 0
-  flex-basis: 510px
+  flex-basis: 470px
  will-change: flex-basis
  overflow-y: scroll
  overflow-x: hidden
@@ -14,16 +14,8 @@
  box-shadow: 0 0 7px 0 darken(white, 30%)
  transition: flex-basis 0.1s

-  .mCustomScrollBox
-    padding-left: 0
-
-  .ps-scrollbar-y-rail
-    pointer-event: all
-    position: absolute;
-
  .card-details-canvas
    width: 470px
-    padding-left: 20px;

  .card-details-header
    margin: 0 -20px 5px
@@ -140,84 +132,3 @@ input[type="submit"].attachment-add-link-submit

      .card-details-menu
        margin-right: 10px
-
-card-details-color(background, color...)
-  background: background !important
-  if color
-    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, #000) //Black text for better visibility
-
-.card-details-orange
-  card-details-color(#ff9f19, #000) //Black text for better visibility
-
-.card-details-red
-  card-details-color(#eb4646, #ffffff) //White text for better visibility
-
-.card-details-purple
-  card-details-color(#a632db, #ffffff) //White text for better visibility
-
-.card-details-blue
-  card-details-color(#0079bf, #ffffff) //White text for better visibility
-
-.card-details-pink
-  card-details-color(#ff78cb, #000) //Black text for better visibility
-
-.card-details-sky
-  card-details-color(#00c2e0, #ffffff) //White text for better visibility
-
-.card-details-black
-  card-details-color(#4d4d4d, #ffffff) //White text for better visibility
-
-.card-details-lime
-  card-details-color(#51e898, #000) //Black text for better visibility
-
-.card-details-silver
-  card-details-color(#c0c0c0, #000) //Black text for better visibility
-
-.card-details-peachpuff
-  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, #000) //Black text for better visibility
-
-.card-details-darkgreen
-  card-details-color(#006400, #ffffff) //White text for better visibility
-
-.card-details-slateblue
-  card-details-color(#6a5acd, #ffffff) //White text for better visibility
-
-.card-details-magenta
-  card-details-color(#ff00ff, #ffffff) //White text for better visibility
-
-.card-details-gold
-  card-details-color(#ffd700, #000) //Black text for better visibility
-
-.card-details-navy
-  card-details-color(#000080, #ffffff) //White text for better visibility
-
-.card-details-gray
-  card-details-color(#808080, #ffffff) //White text for better visibility
-
-.card-details-saddlebrown
-  card-details-color(#8b4513, #ffffff) //White text for better visibility
-
-.card-details-paleturquoise
-  card-details-color(#afeeee, #000) //Black text for better visibility
-
-.card-details-mistyrose
-  card-details-color(#ffe4e1, #000) //Black text for better visibility
-
-.card-details-indigo
-  card-details-color(#4b0082, #ffffff) //White text for better visibility
@@ -1,8 +1,7 @@
 template(name="minicard")
  .minicard(
    class="{{#if isLinkedCard}}linked-card{{/if}}"
-    class="{{#if isLinkedBoard}}linked-board{{/if}}"
-    class="minicard-{{colorClass}}")
+    class="{{#if isLinkedBoard}}linked-board{{/if}}")
    if cover
      .minicard-cover(style="background-image: url('{{cover.url}}');")
    if labels
@@ -10,8 +9,6 @@ template(name="minicard")
        each labels
          .minicard-label(class="card-label-{{color}}" title="{{name}}")
    .minicard-title
-      .handle
-        .fa.fa-arrows
      if $eq 'prefix-with-full-path' currentBoard.presentParentTask
        .parent-prefix
          | {{ parentString ' > ' }}
@@ -56,9 +53,8 @@ template(name="minicard")
      each customFieldsWD
        if definition.showOnCard
          .minicard-custom-field
-            if definition.showLabelOnMiniCard
-              .minicard-custom-field-item
-                = definition.name
+            .minicard-custom-field-item
+              = definition.name
            .minicard-custom-field-item
              +viewer
                = trueValue
@@ -94,19 +94,6 @@
  .minicard-custom-field-item
    max-width:50%;
    flex-grow:1;
-  .handle
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    right: 5px;
-    top: 5px;
-    display:none;
-    @media only screen and (max-width: 1199px) {
-      display:block;
-    }
-    .fa-arrows
-      font-size:20px;
-      color: #ccc;
  .minicard-title
    p:last-child
      margin-bottom: 0
@@ -202,86 +189,3 @@
      border-top-right-radius: 0
      z-index: 15
      box-shadow: 0 1px 2px rgba(0,0,0,.15)
-
-minicard-color(background, color...)
-  background-color: background
-  if color
-    color: color //overwrite text for better visibility
-  &:hover:not(.minicard-composer),
-  .is-selected &,
-  .draggable-hover-card &
-    background: darken(background, 3%)
-  .draggable-hover-card &
-    background: darken(background, 7%)
-
-.minicard-green
-  minicard-color(#3cb500, #ffffff) //White text for better visibility
-
-.minicard-yellow
-  minicard-color(#fad900)
-
-.minicard-orange
-  minicard-color(#ff9f19)
-
-.minicard-red
-  minicard-color(#eb4646, #ffffff) //White text for better visibility
-
-.minicard-purple
-  minicard-color(#a632db, #ffffff) //White text for better visibility
-
-.minicard-blue
-  minicard-color(#0079bf, #ffffff) //White text for better visibility
-
-.minicard-pink
-  minicard-color(#ff78cb)
-
-.minicard-sky
-  minicard-color(#00c2e0, #ffffff) //White text for better visibility
-
-.minicard-black
-  minicard-color(#4d4d4d, #ffffff) //White text for better visibility
-
-.minicard-lime
-  minicard-color(#51e898)
-
-.minicard-silver
-  minicard-color(#c0c0c0)
-
-.minicard-peachpuff
-  minicard-color(#ffdab9)
-
-.minicard-crimson
-  minicard-color(#dc143c, #ffffff) //White text for better visibility
-
-.minicard-plum
-  minicard-color(#dda0dd)
-
-.minicard-darkgreen
-  minicard-color(#006400, #ffffff) //White text for better visibility
-
-.minicard-slateblue
-  minicard-color(#6a5acd, #ffffff) //White text for better visibility
-
-.minicard-magenta
-  minicard-color(#ff00ff, #ffffff) //White text for better visibility
-
-.minicard-gold
-  minicard-color(#ffd700)
-
-.minicard-navy
-  minicard-color(#000080, #ffffff) //White text for better visibility
-
-.minicard-gray
-  minicard-color(#808080, #ffffff) //White text for better visibility
-
-.minicard-saddlebrown
-  minicard-color(#8b4513, #ffffff) //White text for better visibility
-
-.minicard-paleturquoise
-  minicard-color(#afeeee)
-
-.minicard-mistyrose
-  minicard-color(#ffe4e1)
-
-.minicard-indigo
-  minicard-color(#4b0082, #ffffff) //White text for better visibility
@@ -12,11 +12,11 @@ template(name="import")

 template(name="importTextarea")
  form
-    p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
+    p: label(for='import-textarea') {{_ instruction}}
    textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus)
      | {{jsonText}}
    if isSandstorm
-      h1.warning {{_ 'import-sandstorm-backup-warning'}}
+      h1.warning DANGER !!! THIS DESTROYS YOUR IMPORTED DATA, CAUSES BOARD NOT FOUND ERROR WHEN YOU OPEN THIS GRAIN AGAIN https://github.com/wekan/wekan/issues/1430
      p.warning {{_ 'import-sandstorm-warning'}}
    input.primary.wide(type="submit" value="{{_ 'import'}}")

@@ -26,13 +26,6 @@ BlazeComponent.extendComponent({

    const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
    const $cards = this.$('.js-minicards');
-
-    if(window.matchMedia('(max-width: 1199px)').matches) {
-      $( '.js-minicards' ).sortable({
-        handle: '.handle',
-      });
-    }
-
    $cards.sortable({
      connectWith: '.js-minicards:not(.js-list-full)',
      tolerance: 'pointer',
@@ -10,6 +10,7 @@
  // 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

@@ -43,23 +44,11 @@
      background: white
      margin: -3px 0 8px

-.list-header-card-count
-  height: 35px
-
-.list-header-add
-  flex: 0 0 auto
-  padding: 20px 12px 4px
-  position: relative
-  min-height: 20px
-
 .list-header
  flex: 0 0 auto
-  padding: 20px 12px 4px
+  margin: 20px 12px 4px
  position: relative
  min-height: 20px
-  background-color: #e4e4e4;
-  border-bottom: 6px solid #e4e4e4;
-

  &.ui-sortable-handle
    cursor: grab
@@ -79,18 +68,16 @@
    text-overflow: ellipsis
    word-wrap: break-word

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

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

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

@media screen and (max-width: 800px)
-  .list-header-menu
-    margin-right: 30px
-
  .mini-list
    flex: 0 0 60px
    height: 60px
@@ -214,85 +198,3 @@
 .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 (cardsWithLimit (idOrNull ../../_id))
+      each (cards (idOrNull ../../_id))
        a.minicard-wrapper.js-minicard(href=absoluteUrl
          class="{{#if cardIsSelected}}is-selected{{/if}}"
          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
@@ -12,16 +12,6 @@ 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")
@@ -44,19 +34,14 @@ template(name="addCardForm")

  .add-controls.clearfix
    button.primary.confirm(type="submit") {{_ 'add'}}
-    unless currentBoard.isTemplatesBoard
-      unless currentBoard.isTemplateBoard
-        span.quiet
-          | {{_ 'or'}}
-          a.js-link {{_ 'link'}}
-        span.quiet
-          | &nbsp;
-          | /
-          a.js-search {{_ 'search'}}
-        span.quiet
-          | &nbsp;
-          | /
-          a.js-card-template {{_ 'template'}}
+    unless isSandstorm
+      span.quiet
+        | {{_ 'or'}}
+        a.js-link {{_ 'link'}}
+      span.quiet
+        | &nbsp;
+        | /
+        a.js-search {{_ 'search'}}

 template(name="autocompleteLabelLine")
  .minicard-label(class="card-label-{{colorName}}" title=labelName)
@@ -66,9 +51,11 @@ template(name="linkCardPopup")
  label {{_ 'boards'}}:
  .link-board-wrapper
    select.js-select-boards
-      option(value="")
      each boards
-        option(value="{{_id}}") {{title}}
+        if $eq _id currentBoard._id
+          option(value="{{_id}}" selected) {{_ 'current'}}
+        else
+          option(value="{{_id}}") {{title}}
    input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}")

  label {{_ 'swimlanes'}}:
@@ -87,41 +74,22 @@ template(name="linkCardPopup")
      option(value="{{getId}}") {{getTitle}}

  .edit-controls.clearfix
-    input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
+    unless isSandstorm
+      input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")

-template(name="searchElementPopup")
-  form
-    label
-      | {{_ 'title'}}
-      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required)
-  unless isTemplateSearch
-    label {{_ 'boards'}}:
-    .link-board-wrapper
-      select.js-select-boards
-        option(value="")
-        each boards
+template(name="searchCardPopup")
+  label {{_ 'boards'}}:
+  .link-board-wrapper
+    select.js-select-boards
+      each boards
+        if $eq _id currentBoard._id
+          option(value="{{_id}}" selected) {{_ 'current'}}
+        else
          option(value="{{_id}}") {{title}}
  form.js-search-term-form
    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
  .list-body.js-perfect-scrollbar.search-card-results
    .minicards.clearfix.js-minicards
-      if isBoardTemplateSearch
-        each results
-          a.minicard-wrapper.js-minicard
-            +miniboard(this)
-      if isListTemplateSearch
-        each results
-          a.minicard-wrapper.js-minicard
-            +minilist(this)
-      if isSwimlaneTemplateSearch
-        each results
-          a.minicard-wrapper.js-minicard
-            +miniswimlane(this)
-      if isCardTemplateSearch
-        each results
-          a.minicard-wrapper.js-minicard
-            +minicard(this)
-      unless isTemplateSearch
-        each results
-          a.minicard-wrapper.js-minicard
-            +minicard(this)
+      each results
+        a.minicard-wrapper.js-minicard
+          +minicard(this)
@@ -1,34 +1,6 @@
 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];
  },
@@ -67,57 +39,26 @@ BlazeComponent.extendComponent({
    const labelIds = formComponent.labels.get();
    const customFields = formComponent.customFields.get();

-    const board = this.data().board();
-    let linkedId = '';
+    const boardId = this.data().board();
    let swimlaneId = '';
    const boardView = Meteor.user().profile.boardView;
-    let cardType = 'cardType-card';
-    if (title) {
-      if (board.isTemplatesBoard()) {
-        swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
-        const swimlane = Swimlanes.findOne(swimlaneId);
-        // If this is the card templates swimlane, insert a card template
-        if (swimlane.isCardTemplatesSwimlane())
-          cardType = 'template-card';
-        // If this is the board templates swimlane, insert a board template and a linked card
-        else if (swimlane.isBoardTemplatesSwimlane()) {
-          linkedId = Boards.insert({
-            title,
-            permission: 'private',
-            type: 'template-board',
-          });
-          Swimlanes.insert({
-            title: TAPi18n.__('default'),
-            boardId: linkedId,
-          });
-          cardType = 'cardType-linkedBoard';
-        }
-      } else if (boardView === 'board-view-swimlanes')
-        swimlaneId = this.parentComponent().parentComponent().data()._id;
-      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
-        swimlaneId = board.getDefaultSwimline()._id;
+    if (boardView === 'board-view-swimlanes')
+      swimlaneId = this.parentComponent().parentComponent().data()._id;
+    else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
+      swimlaneId = boardId.getDefaultSwimline()._id;

+    if (title) {
      const _id = Cards.insert({
        title,
        members,
        labelIds,
        customFields,
        listId: this.data()._id,
-        boardId: board._id,
+        boardId: boardId._id,
        sort: sortIndex,
        swimlaneId,
-        type: cardType,
-        linkedId,
+        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
      // card will disappear instantly.
@@ -149,9 +90,9 @@ BlazeComponent.extendComponent({
      const methodName = evt.shiftKey ? 'toggleRange' : 'toggle';
      MultiSelection[methodName](this.currentData()._id);

-      // If the card is already selected, we want to de-select it.
-      // XXX We should probably modify the minicard href attribute instead of
-      // overwriting the event in case the card is already selected.
+    // If the card is already selected, we want to de-select it.
+    // XXX We should probably modify the minicard href attribute instead of
+    // overwriting the event in case the card is already selected.
    } else if (Session.equals('currentCard', this.currentData()._id)) {
      evt.stopImmediatePropagation();
      evt.preventDefault();
@@ -171,58 +112,11 @@ BlazeComponent.extendComponent({

  idOrNull(swimlaneId) {
    const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes' ||
-        this.data().board().isTemplatesBoard())
+    if (currentUser.profile.boardView === 'board-view-swimlanes')
      return swimlaneId;
    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();
  },
@@ -258,14 +152,6 @@ BlazeComponent.extendComponent({
    this.labels = new ReactiveVar([]);
    this.members = new ReactiveVar([]);
    this.customFields = new ReactiveVar([]);
-
-    const currentBoardId = Session.get('currentBoard');
-    arr = [];
-    _.forEach(Boards.findOne(currentBoardId).customFields().fetch(), function(field){
-      if(field.automaticallyOnCard)
-        arr.push({_id: field._id, value: null});
-    });
-    this.customFields.set(arr);
  },

  reset() {
@@ -283,7 +169,7 @@ BlazeComponent.extendComponent({

  pressKey(evt) {
    // Pressing Enter should submit the card
-    if (evt.keyCode === 13 && !evt.shiftKey) {
+    if (evt.keyCode === 13) {
      evt.preventDefault();
      const $form = $(evt.currentTarget).closest('form');
      // XXX For some reason $form.submit() does not work (it's probably a bug
@@ -292,8 +178,8 @@ BlazeComponent.extendComponent({
      // work.
      $form.find('button[type=submit]').click();

-      // Pressing Tab should open the form of the next column, and Maj+Tab go
-      // in the reverse order
+    // Pressing Tab should open the form of the next column, and Maj+Tab go
+    // in the reverse order
    } else if (evt.keyCode === 9) {
      evt.preventDefault();
      const isReverse = evt.shiftKey;
@@ -315,8 +201,7 @@ BlazeComponent.extendComponent({
    return [{
      keydown: this.pressKey,
      'click .js-link': Popup.open('linkCard'),
-      'click .js-search': Popup.open('searchElement'),
-      'click .js-card-template': Popup.open('searchElement'),
+      'click .js-search': Popup.open('searchCard'),
    }];
  },

@@ -354,7 +239,7 @@ BlazeComponent.extendComponent({
          const currentBoard = Boards.findOne(Session.get('currentBoard'));
          callback($.map(currentBoard.labels, (label) => {
            if (label.name.indexOf(term) > -1 ||
-              label.color.indexOf(term) > -1) {
+                label.color.indexOf(term) > -1) {
              return label;
            }
            return null;
@@ -391,7 +276,17 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    this.selectedBoardId = new ReactiveVar('');
+    // Prefetch first non-current board id
+    const boardId = Boards.findOne({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+    }, {
+      sort: ['title'],
+    })._id;
+    // Subscribe to this board
+    subManager.subscribe('board', boardId);
+    this.selectedBoardId = new ReactiveVar(boardId);
    this.selectedSwimlaneId = new ReactiveVar('');
    this.selectedListId = new ReactiveVar('');

@@ -417,7 +312,6 @@ BlazeComponent.extendComponent({
      archived: false,
      'members.userId': Meteor.userId(),
      _id: {$ne: Session.get('currentBoard')},
-      type: 'board',
    }, {
      sort: ['title'],
    });
@@ -425,7 +319,7 @@ BlazeComponent.extendComponent({
  },

  swimlanes() {
-    if (!this.selectedBoardId.get()) {
+    if (!this.selectedBoardId) {
      return [];
    }
    const swimlanes = Swimlanes.find({boardId: this.selectedBoardId.get()});
@@ -435,7 +329,7 @@ BlazeComponent.extendComponent({
  },

  lists() {
-    if (!this.selectedBoardId.get()) {
+    if (!this.selectedBoardId) {
      return [];
    }
    const lists = Lists.find({boardId: this.selectedBoardId.get()});
@@ -456,7 +350,6 @@ BlazeComponent.extendComponent({
      archived: false,
      linkedId: {$nin: ownCardsIds},
      _id: {$nin: ownCardsIds},
-      type: {$nin: ['template-card']},
    });
  },

@@ -524,25 +417,12 @@ BlazeComponent.extendComponent({
  },

  onCreated() {
-    this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-card-template');
-    this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-list-template');
-    this.isSwimlaneTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-open-add-swimlane-menu');
-    this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-add-board');
-    this.isTemplateSearch = this.isCardTemplateSearch ||
-      this.isListTemplateSearch ||
-      this.isSwimlaneTemplateSearch ||
-      this.isBoardTemplateSearch;
-    let board = {};
-    if (this.isTemplateSearch) {
-      board = Boards.findOne(Meteor.user().profile.templatesBoardId);
-    } else {
-      // Prefetch first non-current board id
-      board = Boards.findOne({
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: {$nin: [Session.get('currentBoard'), Meteor.user().profile.templatesBoardId]},
-      });
-    }
+    // Prefetch first non-current board id
+    let board = Boards.findOne({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+    });
    if (!board) {
      Popup.close();
      return;
@@ -552,21 +432,20 @@ BlazeComponent.extendComponent({
    subManager.subscribe('board', boardId);
    this.selectedBoardId = new ReactiveVar(boardId);

-    if (!this.isBoardTemplateSearch) {
-      this.boardId = Session.get('currentBoard');
-      // In order to get current board info
-      subManager.subscribe('board', this.boardId);
-      this.swimlaneId = '';
-      // Swimlane where to insert card
-      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
-      if (Meteor.user().profile.boardView === 'board-view-swimlanes')
-        this.swimlaneId = Blaze.getData(swimlane[0])._id;
-      else
-        this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
-      // List where to insert card
-      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-      this.listId = Blaze.getData(list[0])._id;
-    }
+    this.boardId = Session.get('currentBoard');
+    // In order to get current board info
+    subManager.subscribe('board', this.boardId);
+    board = Boards.findOne(this.boardId);
+    // List where to insert card
+    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    this.listId = Blaze.getData(list[0])._id;
+    // Swimlane where to insert card
+    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
+    this.swimlaneId = '';
+    if (board.view === 'board-view-swimlanes')
+      this.swimlaneId = Blaze.getData(swimlane[0])._id;
+    else
+      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
    this.term = new ReactiveVar('');
  },

@@ -575,7 +454,6 @@ BlazeComponent.extendComponent({
      archived: false,
      'members.userId': Meteor.userId(),
      _id: {$ne: Session.get('currentBoard')},
-      type: 'board',
    }, {
      sort: ['title'],
    });
@@ -587,21 +465,7 @@ BlazeComponent.extendComponent({
      return [];
    }
    const board = Boards.findOne(this.selectedBoardId.get());
-    if (!this.isTemplateSearch || this.isCardTemplateSearch) {
-      return board.searchCards(this.term.get(), false);
-    } else if (this.isListTemplateSearch) {
-      return board.searchLists(this.term.get());
-    } else if (this.isSwimlaneTemplateSearch) {
-      return board.searchSwimlanes(this.term.get());
-    } else if (this.isBoardTemplateSearch) {
-      const boards = board.searchBoards(this.term.get());
-      boards.forEach((board) => {
-        subManager.subscribe('board', board.linkedId);
-      });
-      return boards;
-    } else {
-      return [];
-    }
+    return board.searchCards(this.term.get(), false);
  },

  events() {
@@ -615,49 +479,20 @@ BlazeComponent.extendComponent({
        this.term.set(evt.target.searchTerm.value);
      },
      'click .js-minicard'(evt) {
-        // 0. Common
-        const title = $('.js-element-title').val().trim();
-        if (!title)
-          return;
-        const element = Blaze.getData(evt.currentTarget);
-        element.title = title;
-        let _id = '';
-        if (!this.isTemplateSearch || this.isCardTemplateSearch) {
-          // Card insertion
-          // 1. Common
-          element.sort = Lists.findOne(this.listId).cards().count();
-          // 1.A From template
-          if (this.isTemplateSearch) {
-            element.type = 'cardType-card';
-            element.linkedId = '';
-            _id = element.copy(this.boardId, this.swimlaneId, this.listId);
-            // 1.B Linked card
-          } else {
-            delete element._id;
-            element.type = 'cardType-linkedCard';
-            element.linkedId = element.linkedId || element._id;
-            _id = Cards.insert(element);
-          }
-          Filter.addException(_id);
-          // List insertion
-        } else if (this.isListTemplateSearch) {
-          element.sort = Swimlanes.findOne(this.swimlaneId).lists().count();
-          element.type = 'list';
-          _id = element.copy(this.boardId, this.swimlaneId);
-        } else if (this.isSwimlaneTemplateSearch) {
-          element.sort = Boards.findOne(this.boardId).swimlanes().count();
-          element.type = 'swimlalne';
-          _id = element.copy(this.boardId);
-        } else if (this.isBoardTemplateSearch) {
-          board = Boards.findOne(element.linkedId);
-          board.sort = Boards.find({archived: false}).count();
-          board.type = 'board';
-          board.title = element.title;
-          delete board.slug;
-          _id = board.copy();
-        }
+        // LINK CARD
+        const card = Blaze.getData(evt.currentTarget);
+        const _id = Cards.insert({
+          title: card.title, //dummy
+          listId: this.listId,
+          swimlaneId: this.swimlaneId,
+          boardId: this.boardId,
+          sort: Lists.findOne(this.listId).cards().count(),
+          type: 'cardType-linkedCard',
+          linkedId: card.linkedId || card._id,
+        });
+        Filter.addException(_id);
        Popup.close();
      },
    }];
  },
-}).register('searchElementPopup');
+}).register('searchCardPopup');
@@ -1,7 +1,5 @@
 template(name="listHeader")
-  .list-header.js-list-header(
-    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
-    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
+  .list-header.js-list-header
    +inlinedForm
      +editListTitleForm
    else
@@ -51,9 +49,6 @@ 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'}}
@@ -116,13 +111,3 @@ 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,8 +1,3 @@
-let listsColors;
-Meteor.startup(() => {
-  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
-});
-
 BlazeComponent.extendComponent({
  canSeeAddCard() {
    const list = Template.currentData();
@@ -77,7 +72,6 @@ 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);
@@ -160,34 +154,3 @@ 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');
@@ -1,8 +0,0 @@
-template(name="minilist")
-  .minicard(
-    class="minicard-{{colorClass}}")
-    .minicard-title
-      .handle
-        .fa.fa-arrows
-      +viewer
-        = title
@@ -36,10 +36,7 @@ import sanitizeXss from 'xss';
 const at = HTML.CharRef({html: '&commat;', str: '@'});
 Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
  const view = this;
-  let content = Blaze.toHTML(view.templateContentBlock);
  const currentBoard = Boards.findOne(Session.get('currentBoard'));
-  if (!currentBoard)
-    return HTML.Raw(sanitizeXss(content));
  const knowedUsers = currentBoard.members.map((member) => {
    const u = Users.findOne(member.userId);
    if(u){
@@ -48,6 +45,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
    return member;
  });
  const mentionRegex = /\B@([\w.]*)/gi;
+  let content = Blaze.toHTML(view.templateContentBlock);

  let currentMention;
  while ((currentMention = mentionRegex.exec(content)) !== null) {
@@ -4,38 +4,39 @@ template(name="header")
    list all starred boards with a link to go there. This is inspired by the
    Reddit "subreddit" bar.
    The first link goes to the boards page.
-  if currentUser
-    #header-quick-access(class=currentBoard.colorClass)
-      if isMiniScreen
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
+  unless isSandstorm
+    if currentUser
+      #header-quick-access(class=currentBoard.colorClass)
+        if isMiniScreen
+          ul
+            li
+              a(href="{{pathFor 'home'}}")
+                span.fa.fa-home

-          if currentList
-            each currentBoard.lists
-              li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
-                a.js-select-list
+            if currentList
+              each currentBoard.lists
+                li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
+                  a.js-select-list
+                    = title
+          #header-new-board-icon
+        else
+          ul
+            li
+              a(href="{{pathFor 'home'}}")
+                span.fa.fa-home
+                | {{_ 'all-boards'}}
+            each currentUser.starredBoards
+              li.separator -
+              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+                a(href="{{pathFor 'board' id=_id slug=slug}}")
                  = title
-        #header-new-board-icon
-      else
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
-              | {{_ 'all-boards'}}
-          each currentUser.starredBoards
-            li.separator -
-            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
-              a(href="{{pathFor 'board' id=_id slug=slug}}")
-                = title
-          else
-            li.current {{_ 'quick-access-description'}}
+            else
+              li.current {{_ 'quick-access-description'}}

-      a#header-new-board-icon.js-create-board
-        i.fa.fa-plus(title="Create a new board")
+        a#header-new-board-icon.js-create-board
+          i.fa.fa-plus(title="Create a new board")

-      +headerUserBar
+        +headerUserBar

  #header(class=currentBoard.colorClass)
    //-
@@ -46,12 +47,14 @@ template(name="header")
      +Template.dynamic(template=headerBar)

      unless hideLogo
-
        //-
          On sandstorm, the logo shouldn't be clickable, because we only have one
          page/document on it, and we don't want to see the home page containing
          the list of all boards.
-        unless currentSetting.hideLogo
+        if isSandstorm
+          .wekan-logo
+            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+        else
          a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")

@@ -1,16 +1,11 @@
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
-Meteor.subscribe('setting');

 Template.header.helpers({
  wrappedHeader() {
    return !Session.get('currentBoard');
  },

-  currentSetting() {
-    return Settings.findOne();
-  },
-
  hideLogo() {
    return Utils.isMiniScreen() && Session.get('currentBoard');
  },
@@ -188,6 +188,8 @@
    width: 100%
    padding: 10px 0px
    z-index: 30
+    position: absolute
+    bottom: 0px

    ul
      width: calc(100% - 60px)
@@ -7,24 +7,21 @@ head
    where the application is deployed with a path prefix, but it seems to be
    difficult to do that cleanly with Blaze -- at least without adding extra
    packages.
-  link(rel="shortcut icon" href="/public/wekan-favicon.png")
-  link(rel="apple-touch-icon" href="/public/wekan-favicon.png")
-  link(rel="mask-icon" href="/public/wekan-150.svg")
-  link(rel="manifest" href="/public/wekan-manifest.json")
+  link(rel="shortcut icon" href="/wekan-favicon.png")
+  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-150.svg")
+  link(rel="manifest" href="/wekan-manifest.json")

 template(name="userFormsLayout")
  section.auth-layout
-    if currentSetting.hideLogo
-      h1
-        br
-        br
-    else
-      h1.at-form-landing-logo
-        img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+    h1.at-form-landing-logo
+      img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
    section.auth-dialog
      +Template.dynamic(template=content)
-      if currentSetting.displayAuthenticationMethod
-        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+      +connectionMethod
+      if isCas
+        .at-form
+          button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
      div.at-form-lang
        select.select-lang.js-userform-set-language
          each languages
@@ -36,9 +33,7 @@ template(name="userFormsLayout")
 template(name="defaultLayout")
  +header
  #content
-    | {{{afterBodyStart}}}
    +Template.dynamic(template=content)
-    | {{{beforeBodyEnd}}}
  if (Modal.isOpen)
    #modal
      .overlay
@@ -20,18 +20,6 @@ const validator = {
  },
 };

-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);

@@ -43,18 +31,6 @@ Template.userFormsLayout.onRendered(() => {
 });

 Template.userFormsLayout.helpers({
-  currentSetting() {
-    return Template.instance().currentSetting.get();
-  },
-
-  afterBodyStart() {
-    return currentSetting.customHTMLafterBodyStart;
-  },
-
-  beforeBodyEnd() {
-    return currentSetting.customHTMLbeforeBodyEnd;
-  },
-
  languages() {
    return _.map(TAPi18n.getLanguages(), (lang, code) => {
      const tag = code;
@@ -79,6 +55,17 @@ 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({
@@ -87,9 +74,49 @@ Template.userFormsLayout.events({
    T9n.setLanguage(i18nTagToT9n(i18nTag));
    evt.preventDefault();
  },
-  'click #at-btn'(event, instance) {
-    if (FlowRouter.getRouteName() === 'atSignIn') {
-      authentication(event, instance);
+  '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();
+        },
+      });
    }
  },
 });
@@ -99,62 +126,3 @@ 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);
-    }
-  });
-}
@@ -385,8 +385,8 @@ a

@media screen and (max-width: 800px)
  #content
-    margin: 1px 0px 0px 0px
-    height: calc(100% - 0px)
+    margin: 1px 0px 49px 0px
+    height: calc(100% - 96px)

    > .wrapper
      margin-top: 0px
@@ -36,33 +36,7 @@ template(name="boardActions")
      div.trigger-text 
        | {{_'r-card'}}
    div.trigger-button.js-add-arch-action.js-goto-rules
-      i.fa.fa-plus
-
-  div.trigger-item
-    div.trigger-content
-      div.trigger-text 
-        | {{_'r-add-swimlane'}}
-      div.trigger-dropdown
-        input(id="swimlane-name",type=text,placeholder="{{_'r-name'}}")
-    div.trigger-button.js-add-swimlane-action.js-goto-rules
-      i.fa.fa-plus
-
-  div.trigger-item
-    div.trigger-content
-      div.trigger-text 
-        | {{_'r-create-card'}}
-      div.trigger-dropdown
-        input(id="card-name",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text 
-        | {{_'r-in-list'}}
-      div.trigger-dropdown
-        input(id="list-name",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text 
-        | {{_'r-in-swimlane'}}
-      div.trigger-dropdown
-        input(id="swimlane-name2",type=text,placeholder="{{_'r-name'}}")
-    div.trigger-button.js-create-card-action.js-goto-rules
-      i.fa.fa-plus
+      i.fa.fa-plus  


   
@@ -5,52 +5,6 @@ BlazeComponent.extendComponent({

  events() {
    return [{
-      'click .js-create-card-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const cardName = this.find('#card-name').value;
-        const listName = this.find('#list-name').value;
-        const swimlaneName = this.find('#swimlane-name2').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'createCard',
-          swimlaneName,
-          cardName,
-          listName,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
-      },
-      'click .js-add-swimlane-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const swimlaneName = this.find('#swimlane-name').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'addSwimlane',
-          swimlaneName,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
-      },
      'click .js-add-spec-move-action' (event) {
        const ruleName = this.data().ruleName.get();
        const trigger = this.data().triggerVar.get();
@@ -35,21 +35,9 @@ template(name="cardActions")
    div.trigger-button.js-add-removeall-action.js-goto-rules
      i.fa.fa-plus

-  div.trigger-item
-    div.trigger-content
-      div.trigger-text
-        | {{{_'r-set-color'}}}
-        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,20 +1,6 @@
-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() {
@@ -126,63 +112,7 @@ 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.cardColorButtonValue.get();
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'setColor',
-          selectedColor,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-      },
    }];
  },

 }).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');
@@ -43,25 +43,6 @@ template(name="checklistActions")
    div.trigger-button.js-add-check-item-action.js-goto-rules
      i.fa.fa-plus

-  div.trigger-item
-      div.trigger-content
-        div.trigger-text 
-          | {{{_'r-add-checklist'}}}
-        div.trigger-dropdown
-          input(id="checklist-name-3",type=text,placeholder="{{{_'r-name'}}}")
-        div.trigger-text 
-          | {{{_'r-with-items'}}}
-        div.trigger-dropdown
-          input(id="checklist-items",type=text,placeholder="{{{_'r-items-list'}}}")    
-      div.trigger-button.js-add-checklist-items-action.js-goto-rules
-        i.fa.fa-plus  
-
-  div.trigger-item
-      div.trigger-content
-        div.trigger-text 
-          | {{{_'r-checklist-note'}}}
-
-

   
  
@@ -4,29 +4,6 @@ BlazeComponent.extendComponent({
  },
  events() {
    return [{
-      'click .js-add-checklist-items-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const checklistName = this.find('#checklist-name-3').value;
-        const checklistItems = this.find('#checklist-items').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'addChecklistWithItems',
-          checklistName,
-          checklistItems,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
-      },
      'click .js-add-checklist-action' (event) {
        const ruleName = this.data().ruleName.get();
        const trigger = this.data().triggerVar.get();
@@ -10,10 +10,7 @@
  	display: inline-block
  	float: left
  	margin: revert
-.hide-element
-  display:none !important
-.user-details
-  display:inline-block 
+
 .rules-btns-group
  position: absolute
  right: 0
@@ -123,15 +120,6 @@
            .trigger-text
              font-size: 16px
              display:inline-block
-            .trigger-inline-button
-              font-size: 16px
-              display: inline;
-              padding: 6px;
-              border: 1px solid #eee
-              border-radius: 4px
-              box-shadow: inset -1px -1px 3px rgba(0,0,0,.05) 
-              &:hover, &.is-active
-                box-shadow: 0 0 0 2px darken(white, 60%) inset
            .trigger-text.trigger-text-email
              margin-left: 5px;
              margin-top: 10px;
@@ -172,17 +160,6 @@
            box-shadow: 0 0 0 2px darken(white, 60%) inset
        .trigger-button.trigger-button-email
          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
  
@@ -9,13 +9,7 @@ BlazeComponent.extendComponent({
  setTrigger() {
    this.rulesCurrentTab.set('trigger');
  },
-  sanitizeObject(obj){
-    Object.keys(obj).forEach((key) => {
-      if(obj[key] === '' || obj[key] === undefined){
-        obj[key] = '*';
-      }}
-    );
-  },
+
  setRulesList() {
    this.rulesCurrentTab.set('rulesList');
  },
@@ -48,27 +42,8 @@ BlazeComponent.extendComponent({
      },
      'click .js-goto-action' (event) {
        event.preventDefault();
-        // Add user to the trigger
-        const username = $(event.currentTarget.offsetParent).find('.user-name').val();
-        let trigger = this.triggerVar.get();
-        trigger.userId = '*';
-        if(username !== undefined ){
-          const userFound = Users.findOne({username});
-          if(userFound !== undefined){
-            trigger.userId = userFound._id;
-            this.triggerVar.set(trigger);
-          }
-        }
-        // Sanitize trigger
-        trigger = this.triggerVar.get();
-        this.sanitizeObject(trigger);
-        this.triggerVar.set(trigger);
        this.setAction();
      },
-      'click .js-show-user-field' (event) {
-        event.preventDefault();
-        $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element');
-      },
      'click .js-goto-rules' (event) {
        event.preventDefault();
        this.setRulesList();
@@ -93,5 +68,3 @@ BlazeComponent.extendComponent({
  },

 }).register('rulesMain');
-
-
@@ -1,58 +1,43 @@
 template(name="boardTriggers")
-  div.trigger-item#trigger-two
+  div.trigger-item
    div.trigger-content
      div.trigger-text 
-        | {{_'r-when-a-card'}}
-      div.trigger-inline-button.js-open-card-title-popup 
-        i.fa.fa-filter
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="gen-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
      div.trigger-text 
-        | {{_'r-is'}}
+        | {{_'r-the-board'}}
+    div.trigger-button.js-add-gen-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
      div.trigger-text 
-        | {{_'r-added-to'}}
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="create-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
      div.trigger-text 
        | {{_'r-list'}}
      div.trigger-dropdown
-        input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}")
-      div.trigger-text 
-        | {{_'r-in-swimlane'}}
-      div.trigger-dropdown
-        input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") 
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
+        input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}")  
    div.trigger-button.js-add-create-trigger.js-goto-action
      i.fa.fa-plus

-  div.trigger-item#trigger-three
+  div.trigger-item
    div.trigger-content
      div.trigger-text 
-        | {{_'r-when-a-card'}}
-      div.trigger-inline-button.js-open-card-title-popup 
-        i.fa.fa-filter
-      div.trigger-text 
-        | {{_'r-is-moved'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
+        | {{_'r-when-a-card-is-moved'}}
    div.trigger-button.js-add-gen-moved-trigger.js-goto-action
      i.fa.fa-plus

-  div.trigger-item#trigger-four
+  div.trigger-item
    div.trigger-content
      div.trigger-text 
-        | {{_'r-when-a-card'}}
-      div.trigger-inline-button.js-open-card-title-popup 
-        i.fa.fa-filter
-      div.trigger-text 
-        | {{_'r-is'}}
+        | {{_'r-when-a-card-is'}}
      div.trigger-dropdown
        select(id="move-action")
          option(value="moved-to") {{_'r-moved-to'}}
@@ -60,55 +45,21 @@ template(name="boardTriggers")
      div.trigger-text 
        | {{_'r-list'}}
      div.trigger-dropdown
-        input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}")
-      div.trigger-text 
-        | {{_'r-in-swimlane'}}
-      div.trigger-dropdown
-        input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") 
-      div.trigger-button.trigger-button-person.js-show-user-field  
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
+        input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}")  
    div.trigger-button.js-add-moved-trigger.js-goto-action
      i.fa.fa-plus

-  div.trigger-item#trigger-five
+  div.trigger-item
    div.trigger-content
      div.trigger-text 
-        | {{_'r-when-a-card'}}
-      div.trigger-inline-button.js-open-card-title-popup 
-        i.fa.fa-filter
-      div.trigger-text 
-        | {{_'r-is'}}
+        | {{_'r-when-a-card-is'}}
      div.trigger-dropdown
        select(id="arch-action")
          option(value="archived") {{_'r-archived'}}
          option(value="unarchived") {{_'r-unarchived'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-arch-trigger.js-goto-action
      i.fa.fa-plus

-  div.trigger-item
-      div.trigger-content
-        div.trigger-text 
-          | {{{_'r-board-note'}}}
-
-template(name="boardCardTitlePopup")
-    form
-      label
-        | Card Title Filter
-        input.js-card-filter-name(type="text" value=title autofocus)
-      input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}")

   
  
@@ -1,45 +1,59 @@
 BlazeComponent.extendComponent({
  onCreated() {
-    this.provaVar = new ReactiveVar('');
-    this.currentPopupTriggerId = 'def';
-    this.cardTitleFilters = {};
-  },
-  setNameFilter(name){
-    this.cardTitleFilters[this.currentPopupTriggerId] =  name;
+
  },

  events() {
    return [{
-      'click .js-open-card-title-popup'(event){
-        const funct = Popup.open('boardCardTitle');
-        const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
-        //console.log('current popup');
-        //console.log(this.currentPopupTriggerId);
-        this.currentPopupTriggerId = divId;
-        funct.call(this, event);
+      'click .js-add-gen-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'createCard',
+            boardId,
+            'listName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeCard',
+            boardId,
+            desc,
+          });
+        }
+
      },
      'click .js-add-create-trigger' (event) {
        const desc = Utils.getTriggerActionDesc(event, this);
        const datas = this.data();
+        const actionSelected = this.find('#create-action').value;
        const listName = this.find('#create-list-name').value;
-        const swimlaneName = this.find('#create-swimlane-name').value;
        const boardId = Session.get('currentBoard');
-        const divId = $(event.currentTarget.parentNode).attr('id');
-        const cardTitle = this.cardTitleFilters[divId];
-        // move to generic funciont
-        datas.triggerVar.set({
-          activityType: 'createCard',
-          boardId,
-          cardTitle,
-          swimlaneName,
-          listName,
-          desc,
-        });
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'createCard',
+            boardId,
+            listName,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeCard',
+            boardId,
+            listName,
+            desc,
+          });
+        }
      },
      'click .js-add-moved-trigger' (event) {
        const datas = this.data();
        const desc = Utils.getTriggerActionDesc(event, this);
-        const swimlaneName = this.find('#create-swimlane-name').value;
+
        const actionSelected = this.find('#move-action').value;
        const listName = this.find('#move-list-name').value;
        const boardId = Session.get('currentBoard');
@@ -48,7 +62,6 @@ BlazeComponent.extendComponent({
            activityType: 'moveCard',
            boardId,
            listName,
-            swimlaneName,
            'oldListName': '*',
            desc,
          });
@@ -57,7 +70,6 @@ BlazeComponent.extendComponent({
          datas.triggerVar.set({
            activityType: 'moveCard',
            boardId,
-            swimlaneName,
            'listName': '*',
            'oldListName': listName,
            desc,
@@ -70,9 +82,8 @@ BlazeComponent.extendComponent({
        const boardId = Session.get('currentBoard');

        datas.triggerVar.set({
-          'activityType': 'moveCard',
+          activityType: 'moveCard',
          boardId,
-          'swimlaneName': '*',
          'listName':'*',
          'oldListName': '*',
          desc,
@@ -103,13 +114,3 @@ BlazeComponent.extendComponent({
  },

 }).register('boardTriggers');
-
-
-Template.boardCardTitlePopup.events({
-  submit(evt, tpl) {
-    const title = tpl.$('.js-card-filter-name').val().trim();
-    Popup.getOpenerComponent().setNameFilter(title);
-    evt.preventDefault();
-    Popup.close();
-  },
-});
@@ -1,114 +1,79 @@
 template(name="cardTriggers")
  div.trigger-item
    div.trigger-content
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-when-a-label-is'}}
      div.trigger-dropdown
        select(id="label-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-gen-label-trigger.js-goto-action
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-when-the-label-is'}}
      div.trigger-dropdown
        select(id="spec-label")
          each labels
-            option(value="#{_id}" style="background-color: #{name}")
-              = translatedname
-      div.trigger-text
+            option(value="#{_id}")
+              = name
+      div.trigger-text 
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="spec-label-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-spec-label-trigger.js-goto-action
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-when-a-member'}}
      div.trigger-dropdown
        select(id="gen-member-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-gen-member-trigger.js-goto-action
      i.fa.fa-plus


  div.trigger-item
    div.trigger-content
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-when-the-member'}}
      div.trigger-dropdown
-        input(id="spec-member",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text
+        input(id="spec-member",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="spec-member-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-spec-member-trigger.js-goto-action
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-when-a-attach'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="attach-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text
+      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-attachment-trigger.js-goto-action
      i.fa.fa-plus
@@ -6,10 +6,7 @@ BlazeComponent.extendComponent({
    const labels = Boards.findOne(Session.get('currentBoard')).labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
-        labels[i].name = labels[i].color;
-        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
-      } else {
-        labels[i].translatedname = labels[i].name;
+        labels[i].name = labels[i].color.toUpperCase();
      }
    }
    return labels;
@@ -9,13 +9,6 @@ template(name="checklistTriggers")
          option(value="removed") {{_'r-removed-from'}}
      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-gen-check-trigger.js-goto-action
      i.fa.fa-plus

@@ -34,13 +27,6 @@ template(name="checklistTriggers")
          option(value="removed") {{_'r-removed-from'}}
      div.trigger-text 
        | {{_'r-a-card'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-spec-check-trigger.js-goto-action
      i.fa.fa-plus

@@ -52,13 +38,6 @@ template(name="checklistTriggers")
        select(id="gen-comp-check-action")
          option(value="completed") {{_'r-completed'}}
          option(value="uncompleted") {{_'r-made-incomplete'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-gen-comp-trigger.js-goto-action
      i.fa.fa-plus

@@ -74,13 +53,6 @@ template(name="checklistTriggers")
        select(id="spec-comp-check-action")
          option(value="completed") {{_'r-completed'}}
          option(value="uncompleted") {{_'r-made-incomplete'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-spec-comp-trigger.js-goto-action
      i.fa.fa-plus

@@ -92,13 +64,6 @@ template(name="checklistTriggers")
        select(id="check-item-gen-action")
          option(value="checked") {{_'r-checked'}}
          option(value="unchecked") {{_'r-unchecked'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-gen-check-item-trigger.js-goto-action
      i.fa.fa-plus

@@ -114,12 +79,5 @@ template(name="checklistTriggers")
        select(id="check-item-spec-action")
          option(value="checked") {{_'r-checked'}}
          option(value="unchecked") {{_'r-unchecked'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'username'}}")
    div.trigger-button.js-add-spec-check-item-trigger.js-goto-action
      i.fa.fa-plus
@@ -2,8 +2,5 @@ template(name='connectionMethod')
  div.at-form-authentication
    label {{_ 'authentication-method'}}
    select.select-authentication
-      each authentications
-        if isSelected value
-          option(value="{{value}}" selected) {{_ value}}
-        else
-          option(value="{{value}}") {{_ value}}
+        each authentications
+            option(value="{{value}}") {{_ value}}
@@ -31,7 +31,4 @@ Template.connectionMethod.helpers({
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
-  isSelected(match) {
-    return Template.instance().data.authenticationMethod === match;
-  },
 });
@@ -17,7 +17,7 @@ template(name='statistics')
    table
      tbody
        tr
-          th Wekan {{_ 'info'}}
+          th {{_ 'Wekan_version'}}
          td {{statistics.version}}
        tr
          th {{_ 'Node_version'}}
@@ -134,41 +134,10 @@ template(name='announcementSettings')

 template(name='layoutSettings')
  ul#layout-setting.setting-detail
-    li.layout-form
-      .title {{_ 'hide-logo'}}
-      .form-group.flex
-        input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
-        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
        input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}")
-    li.layout-form
-      .title {{_ 'add-custom-html-after-body-start'}}
-      textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
-    li.layout-form
-      .title {{_ 'add-custom-html-before-body-end'}}
-      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}}
@@ -59,12 +59,6 @@ BlazeComponent.extendComponent({
  toggleTLS() {
    $('#mail-server-tls').toggleClass('is-checked');
  },
-  toggleHideLogo() {
-    $('#hide-logo').toggleClass('is-checked');
-  },
-  toggleDisplayAuthenticationMethod() {
-    $('#display-authentication-method').toggleClass('is-checked');
-  },
  switchMenu(event) {
    const target = $(event.target);
    if (!target.hasClass('active')) {
@@ -141,22 +135,11 @@ BlazeComponent.extendComponent({
    this.setLoading(true);
    $('li').removeClass('has-error');

-    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 {
+      const productName = $('#product-name').val().trim();
      Settings.update(Settings.findOne()._id, {
        $set: {
          productName,
-          hideLogo: hideLogoChange,
-          customHTMLafterBodyStart,
-          customHTMLbeforeBodyEnd,
-          displayAuthenticationMethod,
-          defaultAuthenticationMethod,
        },
      });
    } catch (e) {
@@ -165,20 +148,21 @@ BlazeComponent.extendComponent({
      this.setLoading(false);
    }

-    DocHead.setTitle(productName);
-
  },

  sendSMTPTestEmail() {
    Meteor.call('sendSMTPTestEmail', (err, ret) => {
-      if (!err && ret) {
+      if (!err && ret) { /* eslint-disable no-console */
        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 */
    });
  },

@@ -191,9 +175,7 @@ BlazeComponent.extendComponent({
      'click button.js-email-invite': this.inviteThroughEmail,
      'click button.js-save': this.saveMailServerInfo,
      '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');
@@ -266,29 +248,3 @@ 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;
-  },
-});
@@ -4,21 +4,22 @@ template(name="settingHeaderBar")

  .setting-header-btns.left
    unless isMiniScreen
-      if currentUser
-        a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
-          i.fa(class="fa-cog")
-          span {{_ 'settings'}}
+      unless isSandstorm
+        if currentUser
+          a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
+            i.fa(class="fa-cog")
+            span {{_ 'settings'}}

-        a.setting-header-btn.people(href="{{pathFor 'people'}}")
-          i.fa(class="fa-users")
-          span {{_ 'people'}}
+          a.setting-header-btn.people(href="{{pathFor 'people'}}")
+            i.fa(class="fa-users")
+            span {{_ 'people'}}

-        a.setting-header-btn.informations(href="{{pathFor 'information'}}")
-          i.fa(class="fa-info-circle")
-          span {{_ 'info'}}
+          a.setting-header-btn.informations(href="{{pathFor 'information'}}")
+            i.fa(class="fa-info-circle")
+            span {{_ 'info'}}

-      else
-        a.setting-header-btn.js-log-in(
-          title="{{_ 'log-in'}}")
-          i.fa.fa-sign-in
-          span {{_ 'log-in'}}
+        else
+          a.setting-header-btn.js-log-in(
+            title="{{_ 'log-in'}}")
+            i.fa.fa-sign-in
+            span {{_ 'log-in'}}
@@ -1,9 +1,9 @@
 template(name="sidebar")
  .board-sidebar.sidebar(class="{{#if isOpen}}is-open{{/if}}")
-    //a.sidebar-tongue.js-toggle-sidebar(
-    //  class="{{#if isTongueHidden}}is-hidden{{/if}}",
-    //  title="{{showTongueTitle}}")
-    //  i.fa.fa-navicon
+    a.sidebar-tongue.js-toggle-sidebar(
+      class="{{#if isTongueHidden}}is-hidden{{/if}}",
+      title="{{showTongueTitle}}")
+      i.fa.fa-angle-left
    .sidebar-shadow
      .sidebar-content.sidebar-shortcuts
        a.board-header-btn.js-shortcuts
@@ -11,7 +11,7 @@ template(name="sidebar")
          span {{_ 'keyboard-shortcuts' }}
      .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar
        a.hide-btn.js-hide-sidebar
-          i.fa.fa-navicon
+          i.fa.fa-angle-right
        unless isDefaultView
          h2
            a.fa.fa-chevron-left.js-back-home
@@ -34,9 +34,6 @@ template(name="membersWidget")
    h3
      i.fa.fa-user
      | {{_ 'members'}}
-      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
-        i.board-header-btn-icon.fa.fa-cog
-
    .board-widget-content
      each currentBoard.activeMembers
        +userAvatar(userId=this.userId showStatus=true)
@@ -56,130 +53,6 @@ template(name="membersWidget")
    button.js-member-invite-accept.primary {{_ 'accept'}}
    button.js-member-invite-decline {{_ 'decline'}}

-template(name="boardChangeColorPopup")
-  .board-backgrounds-list.clearfix
-    each backgroundColors
-      .board-background-select.js-select-background
-        span.background-box(class="board-color-{{this}}")
-          if isSelected
-            i.fa.fa-check
-
-template(name="boardSubtaskSettingsPopup")
-  form.board-subtask-settings
-    h3 {{_ 'show-parent-in-minicard'}}
-      a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
-        span {{_ 'prefix-with-full-path'}}
-      a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
-        span {{_ 'prefix-with-parent'}}
-      a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
-        span {{_ 'subtext-with-full-path'}}
-      a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
-        span {{_ 'subtext-with-parent'}}
-      a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
-        span {{_ 'no-parent'}}
-    div
-      hr
-
-    div.check-div
-      a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}")
-        span {{_ 'show-subtasks-field'}}
-
-    label
-      | {{_ 'deposit-subtasks-board'}}
-      select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}")
-          each boards
-            if isBoardSelected
-              option(value=_id selected="selected") {{title}}
-            else
-              option(value=_id) {{title}}
-          if isNullBoardSelected
-            option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}}
-          else
-            option(value='null') {{_ 'custom-field-dropdown-none'}}
-    div
-      hr
-
-    label
-      | {{_ 'deposit-subtasks-list'}}
-      select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}")
-          each lists
-            if isListSelected
-              option(value=_id selected="selected") {{title}}
-            else
-              option(value=_id) {{title}}
-
-template(name="chooseBoardSource")
-  ul.pop-over-list
-    li
-      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
-    li
-      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
-
-template(name="archiveBoardPopup")
-  p {{_ 'close-board-pop'}}
-  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
-
-template(name="outgoingWebhooksPopup")
-  each integrations
-    form.integration-form
-      if title
-        h4 {{title}}
-      else
-        h4 {{_ 'no-name'}}
-      label
-        | URL
-        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
-        input(type="hidden" value=_id name="id")
-      input.primary.wide(type="submit" value="{{_ 'save'}}")
-  form.integration-form
-    h4
-      | {{_ 'new-outgoing-webhook'}}
-    label
-      | URL
-      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
-
-template(name="boardMenuPopup")
-  ul.pop-over-list
-    li: a.js-custom-fields {{_ 'custom-fields'}}
-    li: a.js-open-archives {{_ 'archived-items'}}
-    if currentUser.isBoardAdmin
-      li: a.js-change-board-color {{_ 'board-change-color'}}
-    //-
-      XXX Language should be handled by sandstorm, but for now display a
-      language selection link in the board menu. This link is normally present
-      in the header bar that is not displayed on sandstorm.
-    if isSandstorm
-      li: a.js-change-language {{_ 'language'}}
-  unless isSandstorm
-    if currentUser.isBoardAdmin
-      hr
-      ul.pop-over-list
-        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-        unless currentBoard.isTemplatesBoard
-          li: a.js-archive-board {{_ 'archive-board'}}
-        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
-      hr
-      ul.pop-over-list
-        li: a.js-subtask-settings {{_ 'subtask-settings'}}
-
-  if isSandstorm
-    hr
-    ul.pop-over-list
-      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-      li: a.js-import-board {{_ 'import-board-c'}}
-      li: a.js-archive-board {{_ 'archive-board'}}
-      li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
-    hr
-    ul.pop-over-list
-      li: a.js-subtask-settings {{_ 'subtask-settings'}}
-
 template(name="labelsWidget")
  .board-widget.board-widget-labels
    h3
@@ -210,16 +83,17 @@ template(name="memberPopup")
    ul.pop-over-list
      li
        a.js-filter-member {{_ 'filter-cards'}}
-      if currentUser.isBoardAdmin
+      unless isSandstorm
+        if currentUser.isBoardAdmin
+          li
+            a.js-change-role
+              | {{_ 'change-permissions'}}
+              span.quiet (#{memberType})
        li
-          a.js-change-role
-            | {{_ 'change-permissions'}}
-            span.quiet (#{memberType})
-      li
-        if $eq currentUser._id userId
-          a.js-leave-member {{_ 'leave-board'}}
-        else if currentUser.isBoardAdmin
-          a.js-remove-member {{_ 'remove-from-board'}}
+          if $eq currentUser._id userId
+            a.js-leave-member {{_ 'leave-board'}}
+          else if currentUser.isBoardAdmin
+            a.js-remove-member {{_ 'remove-from-board'}}


 template(name="removeMemberPopup")
@@ -142,52 +142,6 @@ Template.memberPopup.helpers({
  },
 });

-Template.boardMenuPopup.events({
-  'click .js-rename-board': Popup.open('boardChangeTitle'),
-  'click .js-custom-fields'() {
-    Sidebar.setView('customFields');
-    Popup.close();
-  },
-  'click .js-open-archives'() {
-    Sidebar.setView('archives');
-    Popup.close();
-  },
-  'click .js-change-board-color': Popup.open('boardChangeColor'),
-  'click .js-change-language': Popup.open('changeLanguage'),
-  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    currentBoard.archive();
-    // XXX We should have some kind of notification on top of the page to
-    // confirm that the board was successfully archived.
-    FlowRouter.go('home');
-  }),
-  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    Popup.close();
-    Boards.remove(currentBoard._id);
-    FlowRouter.go('home');
-  }),
-  'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
-  'click .js-import-board': Popup.open('chooseBoardSource'),
-  'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
-});
-
-Template.boardMenuPopup.helpers({
-  exportUrl() {
-    const params = {
-      boardId: Session.get('currentBoard'),
-    };
-    const queryParams = {
-      authToken: Accounts._storedLoginToken(),
-    };
-    return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
-  },
-  exportFilename() {
-    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
-  },
-});
-
 Template.memberPopup.events({
  'click .js-filter-member'() {
    Filter.members.toggle(this.userId);
@@ -236,14 +190,7 @@ Template.membersWidget.helpers({

 Template.membersWidget.events({
  'click .js-member': Popup.open('member'),
-  'click .js-open-board-menu': Popup.open('boardMenu'),
  'click .js-manage-board-members': Popup.open('addMember'),
-  'click .js-import': Popup.open('boardImportBoard'),
-  submit: this.onSubmit,
-  'click .js-import-board': Popup.open('chooseBoardSource'),
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
-  },
  'click .sandstorm-powerbox-request-identity'() {
    window.sandstormRequestIdentity();
  },
@@ -262,59 +209,6 @@ Template.membersWidget.events({
  },
 });

-BlazeComponent.extendComponent({
-  integrations() {
-    const boardId = Session.get('currentBoard');
-    return Integrations.find({ boardId: `${boardId}` }).fetch();
-  },
-
-  integration(id) {
-    const boardId = Session.get('currentBoard');
-    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
-  },
-
-  events() {
-    return [{
-      'submit'(evt) {
-        evt.preventDefault();
-        const url = evt.target.url.value;
-        const boardId = Session.get('currentBoard');
-        let id = null;
-        let integration = null;
-        if (evt.target.id) {
-          id = evt.target.id.value;
-          integration = this.integration(id);
-          if (url) {
-            Integrations.update(integration._id, {
-              $set: {
-                url: `${url}`,
-              },
-            });
-          } else {
-            Integrations.remove(integration._id);
-          }
-        } else if (url) {
-          Integrations.insert({
-            userId: Meteor.userId(),
-            enabled: true,
-            type: 'outgoing-webhooks',
-            url: `${url}`,
-            boardId: `${boardId}`,
-            activities: ['all'],
-          });
-        }
-        Popup.close();
-      },
-    }];
-  },
-}).register('outgoingWebhooksPopup');
-
-BlazeComponent.extendComponent({
-  template() {
-    return 'chooseBoardSource';
-  },
-}).register('chooseBoardSourcePopup');
-
 Template.labelsWidget.events({
  'click .js-label': Popup.open('editLabel'),
  'click .js-add-label': Popup.open('createLabel'),
@@ -364,124 +258,6 @@ function draggableMembersLabelsWidgets() {
 Template.membersWidget.onRendered(draggableMembersLabelsWidgets);
 Template.labelsWidget.onRendered(draggableMembersLabelsWidgets);

-BlazeComponent.extendComponent({
-  backgroundColors() {
-    return Boards.simpleSchema()._schema.color.allowedValues;
-  },
-
-  isSelected() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return currentBoard.color === this.currentData().toString();
-  },
-
-  events() {
-    return [{
-      'click .js-select-background'(evt) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        const newColor = this.currentData().toString();
-        currentBoard.setColor(newColor);
-        evt.preventDefault();
-      },
-    }];
-  },
-}).register('boardChangeColorPopup');
-
-BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-  },
-
-  allowsSubtasks() {
-    return this.currentBoard.allowsSubtasks;
-  },
-
-  isBoardSelected() {
-    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
-  },
-
-  isNullBoardSelected() {
-    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
-  },
-
-  boards() {
-    return Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-    }, {
-      sort: ['title'],
-    });
-  },
-
-  lists() {
-    return Lists.find({
-      boardId: this.currentBoard._id,
-      archived: false,
-    }, {
-      sort: ['title'],
-    });
-  },
-
-  hasLists() {
-    return this.lists().count() > 0;
-  },
-
-  isListSelected() {
-    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
-  },
-
-  presentParentTask() {
-    let result = this.currentBoard.presentParentTask;
-    if ((result === null) || (result === undefined)) {
-      result = 'no-parent';
-    }
-    return result;
-  },
-
-  events() {
-    return [{
-      'click .js-field-has-subtasks'(evt) {
-        evt.preventDefault();
-        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
-        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
-        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
-        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
-        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
-      },
-      'change .js-field-deposit-board'(evt) {
-        let value = evt.target.value;
-        if (value === 'null') {
-          value = null;
-        }
-        this.currentBoard.setSubtasksDefaultBoardId(value);
-        evt.preventDefault();
-      },
-      'change .js-field-deposit-list'(evt) {
-        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
-        evt.preventDefault();
-      },
-      'click .js-field-show-parent-in-minicard'(evt) {
-        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
-        const options = [
-          'prefix-with-full-path',
-          'prefix-with-parent',
-          'subtext-with-full-path',
-          'subtext-with-parent',
-          'no-parent'];
-        options.forEach(function(element) {
-          if (element !== value) {
-            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
-            $(`#${element}`).toggleClass('is-checked', false);
-          }
-        });
-        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
-        $(`#${value}`).toggleClass('is-checked', true);
-        this.currentBoard.setPresentParentTask(value);
-        evt.preventDefault();
-      },
-    }];
-  },
-}).register('boardSubtaskSettingsPopup');
-
 BlazeComponent.extendComponent({
  onCreated() {
    this.error = new ReactiveVar('');
@@ -41,16 +41,6 @@ template(name="createCustomFieldPopup")
            .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}")

            span {{_ 'show-field-on-card'}}
-        a.flex.js-field-automatically-on-card(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
-            .materialCheckBox(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
-
-            span {{_ 'automatically-field-on-card'}}
-
-        a.flex.js-field-showLabel-on-card(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
-            .materialCheckBox(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
-
-            span {{_ 'showLabel-field-on-card'}}
-
        button.primary.wide.left(type="button")
            | {{_ 'save'}}
        if _id
@@ -83,22 +83,6 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        $target.find('.materialCheckBox').toggleClass('is-checked');
        $target.toggleClass('is-checked');
      },
-      'click .js-field-automatically-on-card'(evt) {
-        let $target = $(evt.target);
-        if(!$target.hasClass('js-field-automatically-on-card')){
-          $target = $target.parent();
-        }
-        $target.find('.materialCheckBox').toggleClass('is-checked');
-        $target.toggleClass('is-checked');
-      },
-      'click .js-field-showLabel-on-card'(evt) {
-        let $target = $(evt.target);
-        if(!$target.hasClass('js-field-showLabel-on-card')){
-          $target = $target.parent();
-        }
-        $target.find('.materialCheckBox').toggleClass('is-checked');
-        $target.toggleClass('is-checked');
-      },
      'click .primary'(evt) {
        evt.preventDefault();

@@ -108,8 +92,6 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
          type: this.type.get(),
          settings: this.getSettings(),
          showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
-          showLabelOnMiniCard: this.find('.js-field-showLabel-on-card.is-checked') !== null,
-          automaticallyOnCard: this.find('.js-field-automatically-on-card.is-checked') !== null,
        };

        // insert or update
@@ -1,8 +0,0 @@
-template(name="miniswimlane")
-  .minicard(
-    class="minicard-{{colorClass}}")
-    .minicard-title
-      .handle
-        .fa.fa-arrows
-      +viewer
-        = title
@@ -1,21 +1,14 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
-    if this.isTemplateContainer
-        +swimlaneFixedHeader(this)
+  .swimlane-header-wrap.js-swimlane-header
+    +inlinedForm
+      +editSwimlaneTitleForm
    else
-      +inlinedForm
-        +editSwimlaneTitleForm
-      else
-        +swimlaneFixedHeader(this)
-
-template(name="swimlaneFixedHeader")
-  .swimlane-header(
-    class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-    = 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
+      .swimlane-header(
+        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
+        = title
+      .swimlane-header-menu
+        unless currentUser.isCommentOnly
+          a.fa.fa-navicon.js-open-swimlane-menu

 template(name="editSwimlaneTitleForm")
  .list-composer
@@ -27,30 +20,4 @@ template(name="editSwimlaneTitleForm")
 template(name="swimlaneActionPopup")
  unless currentUser.isCommentOnly
    ul.pop-over-list
-       li: a.js-set-swimlane-color {{_ 'select-color'}}
-    unless this.isTemplateContainer
-      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'}}
-        unless currentBoard.isTemplatesBoard
-          unless currentBoard.isTemplateBoard
-            span.quiet
-              | {{_ 'or'}}
-              a.js-swimlane-template {{_ 'template'}}
-
-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'}}
+      li: a.js-close-swimlane {{_ 'archive-swimlane'}}
@@ -1,10 +1,3 @@
-const { calculateIndexData } = Utils;
-
-let swimlaneColors;
-Meteor.startup(() => {
-  swimlaneColors = Swimlanes.simpleSchema()._schema.color.allowedValues;
-});
-
 BlazeComponent.extendComponent({
  editTitle(evt) {
    evt.preventDefault();
@@ -18,85 +11,15 @@ 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);
-        const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane';
-
-        if (title) {
-          Swimlanes.insert({
-            title,
-            boardId: Session.get('currentBoard'),
-            sort: sortValue.base,
-            type: swimlaneType,
-          });
-
-          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();
-      },
-      'click .js-swimlane-template': Popup.open('searchElement'),
-    }];
-  },
-}).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,22 +1,21 @@
 template(name="swimlane")
-  .swimlane
-    +swimlaneHeader
  .swimlane.js-lists.js-swimlane
+    +swimlaneHeader
    if isMiniScreen
-      if currentListIsInThisSwimlane _id
+      if currentList
        +list(currentList)
-      unless currentList
-        each lists
+      else
+        each currentBoard.lists
          +miniList(this)
        if currentUser.isBoardMember
          +addListForm
    else
-      each lists
+      each currentBoard.lists
        +list(this)
        if currentCardIsInThisList _id ../_id
          +cardDetails(currentCard)
      if currentUser.isBoardMember
-        +addListForm
+        +addListAndSwimlaneForm

 template(name="listsGroup")
  .swimlane.list-group.js-lists
@@ -24,31 +23,52 @@ template(name="listsGroup")
      if currentList
        +list(currentList)
      else
-        each lists
+        each currentBoard.lists
          +miniList(this)
        if currentUser.isBoardMember
          +addListForm
    else
-      each lists
+      each currentBoard.lists
        +list(this)
        if currentCardIsInThisList _id null
          +cardDetails(currentCard)
      if currentUser.isBoardMember
        +addListForm

-template(name="addListForm")
+template(name="addListAndSwimlaneForm")
  .list.list-composer.js-list-composer
-    .list-header-add
+    .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'}}
-          unless currentBoard.isTemplatesBoard
-            unless currentBoard.isTemplateBoard
-              span.quiet
-                | {{_ 'or'}}
-                a.js-list-template {{_ 'template'}}
+          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
+      +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
@@ -1,25 +1,16 @@
 const { calculateIndex, enableClickOnTouch } = Utils;

-function currentListIsInThisSwimlane(swimlaneId) {
-  const currentList = Lists.findOne(Session.get('currentList'));
-  return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
-}
-
 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Cards.findOne(Session.get('currentCard'));
  const currentUser = Meteor.user();
-  if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes')
-    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-  else // Default view: board-view-lists
+  if (currentUser.profile.boardView === '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.
+  else if (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;
 }

 function initSortable(boardComponent, $listsDom) {
@@ -119,10 +110,6 @@ BlazeComponent.extendComponent({
    return currentCardIsInThisList(listId, swimlaneId);
  },

-  currentListIsInThisSwimlane(swimlaneId) {
-    return currentListIsInThisSwimlane(swimlaneId);
-  },
-
  events() {
    return [{
      // Click-and-drag action
@@ -162,12 +149,6 @@ BlazeComponent.extendComponent({
 }).register('swimlane');

 BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-    this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
-    this.currentSwimlane = this.currentData();
-  },
-
  // Proxy
  open() {
    this.childComponents('inlinedForm')[0].open();
@@ -184,19 +165,58 @@ BlazeComponent.extendComponent({
            title,
            boardId: Session.get('currentBoard'),
            sort: $('.list').length,
-            type: (this.isListTemplatesSwimlane)?'template-list':'list',
-            swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
          });

          titleInput.value = '';
          titleInput.focus();
        }
      },
-      'click .js-list-template': Popup.open('searchElement'),
    }];
  },
 }).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: calc(100% - 26px)
+  max-height: 100%

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

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

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

 .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
@@ -4,11 +4,10 @@ template(name="headerUserBar")
      .header-user-bar-avatar
        +userAvatar(userId=currentUser._id)
      unless isMiniScreen
-        unless isSandstorm
-          if currentUser.profile.fullname
-            = currentUser.profile.fullname
-          else
-            = currentUser.username
+        if currentUser.profile.fullname
+          = currentUser.profile.fullname
+        else
+          = currentUser.username

 template(name="memberMenuPopup")
  ul.pop-over-list
@@ -16,18 +15,13 @@ template(name="memberMenuPopup")
      li: a.js-edit-profile {{_ 'edit-profile'}}
      li: a.js-change-settings {{_ 'change-settings'}}
      li: a.js-change-avatar {{_ 'edit-avatar'}}
-      unless isSandstorm
-        li: a.js-change-password {{_ 'changePasswordPopup-title'}}
-        li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
+      li: a.js-change-password {{_ 'changePasswordPopup-title'}}
+      li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
    if currentUser.isAdmin
      li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
  hr
  ul.pop-over-list
-    li: a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}}
-  unless isSandstorm
-    hr
-    ul.pop-over-list
-      li: a.js-logout {{_ 'log-out'}}
+    li: a.js-logout {{_ 'log-out'}}

 template(name="editProfilePopup")
  form
@@ -3,15 +3,6 @@ Template.headerUserBar.events({
  'click .js-change-avatar': Popup.open('changeAvatar'),
 });

-Template.memberMenuPopup.helpers({
-  templatesBoardId() {
-    return Meteor.user().getTemplatesBoardId();
-  },
-  templatesBoardSlug() {
-    return Meteor.user().getTemplatesBoardSlug();
-  },
-});
-
 Template.memberMenuPopup.events({
  'click .js-edit-profile': Popup.open('editProfile'),
  'click .js-change-settings': Popup.open('changeSettings'),
@@ -4,9 +4,9 @@ window.Popup = new class {
    this.template = Template.popup;

    // We only want to display one popup at a time and we keep the view object
-    // in this `Popup.current` variable. If there is no popup currently opened
+    // in this `Popup._current` variable. If there is no popup currently opened
    // the value is `null`.
-    this.current = null;
+    this._current = null;

    // It's possible to open a sub-popup B from a popup A. In that case we keep
    // the data of popup A so we can return back to it. Every time we open a new
@@ -27,9 +27,11 @@ window.Popup = new class {
  open(name) {
    const self = this;
    const popupName = `${name}Popup`;
+
    function clickFromPopup(evt) {
      return $(evt.target).closest('.js-pop-over').length !== 0;
    }
+
    return function(evt) {
      // If a popup is already opened, clicking again on the opener element
      // should close it -- and interrupt the current `open` function.
@@ -55,6 +57,7 @@ window.Popup = new class {
        self._stack = [];
        openerElement = evt.currentTarget;
      }
+
      $(openerElement).addClass('is-active');
      evt.preventDefault();

@@ -136,7 +139,6 @@ window.Popup = new class {
      const openerElement = this._getTopStack().openerElement;
      $(openerElement).removeClass('is-active');

-
      this._stack = [];
    }
  }
@@ -198,7 +200,7 @@ escapeActions.forEach((actionName) => {
    () => Popup[actionName](),
    () => Popup.isOpen(),
    {
-      noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup',
+      noClickEscapeOn: '.js-pop-over',
      enabledOnClick: actionName === 'close',
    }
  );
@@ -145,26 +145,6 @@ Utils = {
    });
  },

-  manageCustomUI(){
-    Meteor.call('getCustomUI', (err, data) => {
-      if (err && err.error[0] === 'var-not-exist'){
-        Session.set('customUI', false); // siteId || address server not defined
-      }
-      if (!err){
-        Utils.setCustomUI(data);
-      }
-    });
-  },
-
-  setCustomUI(data){
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (currentBoard) {
-      DocHead.setTitle(`${currentBoard.title  } - ${  data.productName}`);
-    } else {
-      DocHead.setTitle(`${data.productName}`);
-    }
-  },
-
  setMatomo(data){
    window._paq = window._paq || [];
    window._paq.push(['setDoNotTrack', data.doNotTrack]);
@@ -218,20 +198,10 @@ Utils = {
      const element = tempInstance.$(triggerEls[i]);
      if (element.hasClass('trigger-text')) {
        finalString += element.text().toLowerCase();
-      } else if (element.hasClass('user-details')) {
-        let username = element.find('input').val();
-        if(username === undefined || username === ''){
-          username = '*';
-        }
-        finalString += `${element.find('.trigger-text').text().toLowerCase() } ${  username}`;
      } else if (element.find('select').length > 0) {
        finalString += element.find('select option:selected').text().toLowerCase();
      } else if (element.find('input').length > 0) {
-        let inputvalue = element.find('input').val();
-        if(inputvalue === undefined || inputvalue === ''){
-          inputvalue = '*';
-        }
-        finalString += inputvalue;
+        finalString += element.find('input').val();
      }
      // Add space
      if (i !== length - 1) {
@@ -14,7 +14,6 @@ FlowRouter.route('/', {
    Filter.reset();
    EscapeActions.executeAll();

-    Utils.manageCustomUI();
    Utils.manageMatomo();

    BlazeLayout.render('defaultLayout', {
@@ -41,7 +40,6 @@ FlowRouter.route('/b/:id/:slug', {
      EscapeActions.executeUpTo('popup-close');
    }

-    Utils.manageCustomUI();
    Utils.manageMatomo();

    BlazeLayout.render('defaultLayout', {
@@ -59,7 +57,6 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
    Session.set('currentBoard', params.boardId);
    Session.set('currentCard', params.cardId);

-    Utils.manageCustomUI();
    Utils.manageMatomo();

    BlazeLayout.render('defaultLayout', {
@@ -125,7 +122,6 @@ FlowRouter.route('/setting', {
    },
  ],
  action() {
-    Utils.manageCustomUI();
    BlazeLayout.render('defaultLayout', {
      headerBar: 'settingHeaderBar',
      content: 'setting',
@@ -203,21 +199,20 @@ _.each(redirections, (newPath, oldPath) => {
 // using the `kadira:dochead` package. Currently we only use it to display the
 // board title if we are in a board page (see #364) but we may want to support
 // some <meta> tags in the future.
-//const appTitle = Utils.manageCustomUI();
+const appTitle = 'Wekan';

 // XXX The `Meteor.startup` should not be necessary -- we don't need to wait for
 // the complete DOM to be ready to call `DocHead.setTitle`. But the problem is
 // that the global variable `Boards` is undefined when this file loads so we
 // wait a bit until hopefully all files are loaded. This will be fixed in a
 // clean way once Meteor will support ES6 modules -- hopefully in Meteor 1.3.
-//Meteor.isClient && Meteor.startup(() => {
-//  Tracker.autorun(() => {
-
-//    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-//    const titleStack = [appTitle];
-//    if (currentBoard) {
-//      titleStack.push(currentBoard.title);
-//    }
-//    DocHead.setTitle(titleStack.reverse().join(' - '));
-//  });
-//});
+Meteor.isClient && Meteor.startup(() => {
+  Tracker.autorun(() => {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const titleStack = [appTitle];
+    if (currentBoard) {
+      titleStack.push(currentBoard.title);
+    }
+    DocHead.setTitle(titleStack.reverse().join(' - '));
+  });
+});
@@ -0,0 +1,221 @@
+version: '2'
+
+# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+# 1) Edit settings
+# 2) docker-compose up -d
+
+services:
+
+  wekandb:
+    image: mongo:3.2.21
+    container_name: wekan-db
+    restart: always
+    command: mongod --smallfiles --oplogSize 128
+    networks:
+      - wekan-tier
+    expose:
+      - 27017
+    volumes:
+      - wekan-db:/data/db
+      - wekan-db-dump:/dump
+
+  wekan:
+    image: quay.io/wekan/wekan
+    container_name: wekan-app
+    restart: always
+    networks:
+      - wekan-tier
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - NODE_VERSION=${NODE_VERSION}
+        - METEOR_RELEASE=${METEOR_RELEASE}
+        - NPM_VERSION=${NPM_VERSION}
+        - ARCHITECTURE=${ARCHITECTURE}
+        - SRC_PATH=${SRC_PATH}
+        - METEOR_EDGE=${METEOR_EDGE}
+        - USE_EDGE=${USE_EDGE}
+    ports:
+      # Docker outsideport:insideport
+      - 80:8080
+    environment:
+      - MONGO_URL=mongodb://wekandb:27017/wekan
+      - ROOT_URL=http://localhost
+      # Wekan Export Board works when WITH_API=true.
+      # If you disable Wekan API with false, Export Board does not work.
+      - WITH_API=true
+      # 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=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- 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
+      - BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      #- 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: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      #- WEBHOOKS_ATTRIBUTES=
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # 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=
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
+      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+      # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+      # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      # LDAP_ENCRYPTION : If using LDAPS
+      # example : LDAP_ENCRYPTION=ssl
+      #- LDAP_ENCRYPTION=false
+      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+      #- LDAP_CA_CERT=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- LDAP_REJECT_UNAUTHORIZED=false
+      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      # example : LDAP_USER_SEARCH_FILTER=
+      #- LDAP_USER_SEARCH_FILTER=
+      # LDAP_USER_SEARCH_SCOPE : 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 : LDAP_USER_SEARCH_SCOPE=one
+      #- LDAP_USER_SEARCH_SCOPE=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+      #- LDAP_GROUP_FILTER_OBJECTCLASS=
+      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      # LDAP_GROUP_FILTER_GROUP_NAME :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_NAME=
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+      # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      # example : LDAP_UTF8_NAMES_SLUGIFY=false
+      #- LDAP_UTF8_NAMES_SLUGIFY=true
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username
+      # example : LDAP_USERNAME_FIELD=username
+      #- LDAP_USERNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      # LDAP_SYNC_USER_DATA :
+      # example : LDAP_SYNC_USER_DATA=true
+      #- LDAP_SYNC_USER_DATA=false
+      # LDAP_SYNC_USER_DATA_FIELDMAP :
+      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #- LDAP_SYNC_USER_DATA_FIELDMAP=
+      # LDAP_SYNC_GROUP_ROLES :
+      # example :
+      #- LDAP_SYNC_GROUP_ROLES=
+      # LDAP_DEFAULT_DOMAIN : 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
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+
+    depends_on:
+      - wekandb
+
+volumes:
+  wekan-db:
+    driver: local
+  wekan-db-dump:
+    driver: local
+
+networks:
+  wekan-tier:
+    driver: bridge
@@ -0,0 +1,244 @@
+version: '2'
+
+# Docker: Wekan <=> MongoDB <=> ToroDB => PostgreSQL read-only mirroring
+# for reporting with SQL, and accessing with any programming language,
+# reporting package and Office suite that can connect to PostgreSQL.
+# https://github.com/wekan/wekan-postgresql
+
+services:
+  torodb-stampede:
+    image: torodb/stampede:1.0.0-SNAPSHOT
+    networks:
+      - wekan-tier
+    links:
+      - postgres
+      - mongodb
+    environment:
+      - POSTGRES_PASSWORD
+      - TORODB_SETUP=true
+      - TORODB_SYNC_SOURCE=mongodb:27017
+      - TORODB_BACKEND_HOST=postgres
+      - TORODB_BACKEND_PORT=5432
+      - TORODB_BACKEND_DATABASE=wekan
+      - TORODB_BACKEND_USER=wekan
+      - TORODB_BACKEND_PASSWORD=wekan
+      - DEBUG
+  postgres:
+    image: postgres:9.6
+    networks:
+      - wekan-tier
+    environment:
+      - POSTGRES_PASSWORD
+    ports:
+      - "15432:5432"
+  mongodb:
+    image: mongo:3.2
+    networks:
+      - wekan-tier
+    ports:
+      - "28017:27017"
+    entrypoint:
+      - /bin/bash
+      - "-c"
+      - mongo --nodb --eval '
+            var db; 
+            while (!db) { 
+                try { 
+                  db = new Mongo("mongodb:27017").getDB("local"); 
+                } catch(ex) {} 
+                sleep(3000); 
+            }; 
+            rs.initiate({_id:"rs1",members:[{_id:0,host:"mongodb:27017"}]});
+        ' 1>/dev/null 2>&1 & 
+        mongod --replSet rs1
+  wekan:
+    image: quay.io/wekan/wekan
+    container_name: wekan-app
+    restart: always
+    networks:
+      - wekan-tier
+    ports:
+      - 80:8080
+    environment:
+      - MONGO_URL=mongodb://mongodb:27017/wekan
+      - ROOT_URL=http://localhost
+      #---------------------------------------------------------------
+      # == WEKAN API ==
+      # Wekan Export Board works when WITH_API='true'.
+      # If you disable Wekan API, Export Board does not work.
+      - WITH_API=true
+      # 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=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- 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
+      - BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      #- 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: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      #- WEBHOOKS_ATTRIBUTES=
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # 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=
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
+      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+      # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+      # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      # LDAP_ENCRYPTION : If using LDAPS
+      # example : LDAP_ENCRYPTION=ssl
+      #- LDAP_ENCRYPTION=false
+      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+      #- LDAP_CA_CERT=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- LDAP_REJECT_UNAUTHORIZED=false
+      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      # example : LDAP_USER_SEARCH_FILTER=
+      #- LDAP_USER_SEARCH_FILTER=
+      # LDAP_USER_SEARCH_SCOPE : 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 : LDAP_USER_SEARCH_SCOPE=one
+      #- LDAP_USER_SEARCH_SCOPE=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+      #- LDAP_GROUP_FILTER_OBJECTCLASS=
+      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      # LDAP_GROUP_FILTER_GROUP_NAME :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_NAME=
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+      # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      # example : LDAP_UTF8_NAMES_SLUGIFY=false
+      #- LDAP_UTF8_NAMES_SLUGIFY=true
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username
+      # example : LDAP_USERNAME_FIELD=username
+      #- LDAP_USERNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      # LDAP_SYNC_USER_DATA :
+      # example : LDAP_SYNC_USER_DATA=true
+      #- LDAP_SYNC_USER_DATA=false
+      # LDAP_SYNC_USER_DATA_FIELDMAP :
+      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #- LDAP_SYNC_USER_DATA_FIELDMAP=
+      # LDAP_SYNC_GROUP_ROLES :
+      # example :
+      #- LDAP_SYNC_GROUP_ROLES=
+      # LDAP_DEFAULT_DOMAIN : 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
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+
+
+    depends_on:
+      - mongodb
+
+volumes:
+  mongodb:
+    driver: local
+  mongodb-dump:
+    driver: local
+
+networks:
+  wekan-tier:
+    driver: bridge
@@ -1,101 +1,13 @@
 version: '2'

 # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
-#---------------------------------------------------------------------------------------------------------
-# ==== CREATING USERS AND LOGGING IN TO WEKAN ====
-# https://github.com/wekan/wekan/wiki/Adding-users
-#---------------------------------------------------------------------------------------------------------
-# ==== FORGOT PASSWORD ====
-# https://github.com/wekan/wekan/wiki/Forgot-Password
-#---------------------------------------------------------------------------------------------------------
-# ==== Upgrading Wekan to new version =====
-# 1) Stop Wekan:
-#      docker-compose stop
-# 2) Download new version:
-#      docker-compose pull wekan
-# 3) If you have more networks for VPN etc as described at bottom of
-#    this config, download for them too:
-#      docker-compose pull wekan2
-# 4) Start Wekan:
-#      docker-compose start
-#----------------------------------------------------------------------------------
-# ==== OPTIONAL: DEDICATED DOCKER USER ====
-# 1) Optionally create a dedicated user for Wekan, for example:
-#      sudo useradd -d /home/wekan -m -s /bin/bash wekan
-# 2) Add this user to the docker group, then logout+login or reboot:
-#      sudo usermod -aG docker wekan
-# 3) Then login as user wekan.
-# 4) Create this file /home/wekan/docker-compose.yml with your modifications.
-#----------------------------------------------------------------------------------
-# ==== RUN DOCKER AS SERVICE ====
-# 1a) Running Docker as service, on Systemd like Debian 9, Ubuntu 16.04, CentOS 7:
-#      sudo systemctl enable docker
-#      sudo systemctl start docker
-# 1b) Running Docker as service, on init.d like Debian 8, Ubuntu 14.04, CentOS 6:
-#      sudo update-rc.d docker defaults
-#      sudo service docker start
-# ----------------------------------------------------------------------------------
-# ==== USAGE OF THIS docker-compose.yml ====
-# 1) For seeing does Wekan work, try this and check with your webbroser:
-#      docker-compose up
-# 2) Stop Wekan and start Wekan in background:
-#     docker-compose stop
-#     docker-compose up -d
-# 3) See running Docker containers:
-#     docker ps
-# 4) Stop Docker containers:
-#     docker-compose stop
-# ----------------------------------------------------------------------------------
-# ===== INSIDE DOCKER CONTAINERS, AND BACKUP/RESTORE ====
-# https://github.com/wekan/wekan/wiki/Backup
-# If really necessary, repair MongoDB: https://github.com/wekan/wekan-mongodb/issues/6#issuecomment-424004116
-# 1) Going inside containers:
-#    a) Wekan app, does not contain data
-#         docker exec -it wekan-app bash
-#    b) MongoDB, contains all data
-#         docker exec -it wekan-db bash
-# 2) Copying database to outside of container:
-#      docker exec -it wekan-db bash
-#      cd /data
-#      mongodump
-#      exit
-#      docker cp wekan-db:/data/dump .
-# 3) Restoring database
-#      # 1) Stop wekan
-#             docker stop wekan-app
-#      # 2) Go inside database container
-#             docker exec -it wekan-db bash
-#      # 3) and data directory
-#             cd /data
-#      # 4) Remove previos dump
-#             rm -rf dump
-#      # 5) Exit db container
-#             exit
-#      # 6) Copy dump to inside docker container
-#             docker cp dump wekan-db:/data/
-#      # 7) Go inside database container
-#             docker exec -it wekan-db bash
-#      # 8) and data directory
-#             cd /data
-#      # 9) Restore
-#             mongorestore --drop
-#      # 10) Exit db container
-#             exit
-#      # 11) Start wekan
-#             docker start wekan-app
-#-------------------------------------------------------------------------
+# 1) Edit settings
+# 2) docker-compose up -d

 services:

  wekandb:
-    #-------------------------------------------------------------------------------------
-    # ==== MONGODB AND METEOR VERSION ====
-    # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
-    # image: mongo:4.0.4
-    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
-    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
    image: mongo:3.2.21
-    #-------------------------------------------------------------------------------------
    container_name: wekan-db
    restart: always
    command: mongod --smallfiles --oplogSize 128
@@ -108,464 +20,185 @@ services:
      - wekan-db-dump:/dump

  wekan:
-    #-------------------------------------------------------------------------------------
-    # ==== MONGODB AND METEOR VERSION ====
-    # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch,
-    #    using https://quay.io/wekan/wekan automatic builds
-    # image: quay.io/wekan/wekan:meteor-1.8
-    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
-    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
    image: quay.io/wekan/wekan
-    # c) Using specific Meteor 1.6.x version tag:
-    # image: quay.io/wekan/wekan:v1.95
-    # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan
-    # image: wekanteam/wekan:meteor-1.8
-    # image: wekanteam/wekan:v1.95
-    #-------------------------------------------------------------------------------------
    container_name: wekan-app
    restart: always
    networks:
      - wekan-tier
-    #-------------------------------------------------------------------------------------
-    # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ====
-    # ==== and use commands: docker-compose up -d --build
-    #build:
-    #  context: .
-    #  dockerfile: Dockerfile
-    #  args:
-    #    - NODE_VERSION=${NODE_VERSION}
-    #    - METEOR_RELEASE=${METEOR_RELEASE}
-    #    - NPM_VERSION=${NPM_VERSION}
-    #    - ARCHITECTURE=${ARCHITECTURE}
-    #    - SRC_PATH=${SRC_PATH}
-    #    - METEOR_EDGE=${METEOR_EDGE}
-    #    - USE_EDGE=${USE_EDGE}
-    #-------------------------------------------------------------------------------------
    ports:
-      # Docker outsideport:insideport. Do not add anything extra here.
-      # For example, if you want to have wekan on port 3001,
-      # use 3001:8080 . Do not add any extra address etc here, that way it does not work.
-      # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network
+      # Docker outsideport:insideport
      - 80:8080
    environment:
      - MONGO_URL=mongodb://wekandb:27017/wekan
-      #---------------------------------------------------------------
-      # ==== ROOT_URL SETTING ====
-      # Change ROOT_URL to your real Wekan URL, for example:
-      # If you have Caddy/Nginx/Apache providing SSL
-      #  - https://example.com
-      #  - https://boards.example.com
-      # This can be problematic with avatars https://github.com/wekan/wekan/issues/1776
-      #  - https://example.com/wekan
-      # If without https, can be only wekan node, no need for Caddy/Nginx/Apache if you don't need them
-      #  - http://example.com
-      #  - http://boards.example.com
-      #  - http://192.168.1.100    <=== using at local LAN
-      - ROOT_URL=http://localhost  #   <=== using only at same laptop/desktop where Wekan is installed
-      #---------------------------------------------------------------
-      # ==== EMAIL SETTINGS ====
-      # Email settings are required in both MAIL_URL and Admin Panel,
-      #   see https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
-      #   For SSL in email, change smtp:// to smtps://
-      # NOTE: Special characters need to be url-encoded in MAIL_URL.
-      #       You can encode those characters for example at: https://www.urlencoder.org
-      - MAIL_URL=smtp://user:pass@mailserver.example.com:25/
-      - MAIL_FROM='Example Wekan Support <support@example.com>'
-      #---------------------------------------------------------------
-      # ==== OPTIONAL: MONGO OPLOG SETTINGS =====
-      # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587
-      # We've fixed our CPU usage problem today with an environment
-      # change around Wekan. I wasn't aware during implementation
-      # that if you're using more than 1 instance of Wekan
-      # (or any MeteorJS based tool) you're supposed to set
-      # MONGO_OPLOG_URL as an environment variable.
-      # Without setting it, Meteor will perform a pull-and-diff
-      # update of it's dataset. With it, Meteor will update from
-      # the OPLOG. See here
-      #   https://blog.meteor.com/tuning-meteor-mongo-livedata-for-scalability-13fe9deb8908
-      # After setting
-      # MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
-      # the CPU usage for all Wekan instances dropped to an average
-      # of less than 10% with only occasional spikes to high usage
-      # (I guess when someone is doing a lot of work)
-      # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
-      #---------------------------------------------------------------
-      # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
-      # https://github.com/edemaine/kadira-compose
-      # https://github.com/meteor/meteor-apm-agent
-      # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
-      #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
-      #- APM_APP_ID=
-      #- APM_APP_SECRET=
-      #---------------------------------------------------------------
-      # ==== OPTIONAL: LOGS AND STATS ====
-      # https://github.com/wekan/wekan/wiki/Logs
-      #
-      # Daily export of Wekan changes as JSON to Logstash and ElasticSearch / Kibana (ELK)
-      # https://github.com/wekan/wekan-logstash
-      #
-      # Statistics Python script for Wekan Dashboard
-      # https://github.com/wekan/wekan-stats
-      #
-      # Console, file, and zulip logger on database changes https://github.com/wekan/wekan/pull/1010
-      # with fix to replace console.log by winston logger https://github.com/wekan/wekan/pull/1033
-      # but there could be bug https://github.com/wekan/wekan/issues/1094
-      #
-      # There is Feature Request: Logging date and time of all activity with summary reports,
-      # and requesting reason for changing card to other column https://github.com/wekan/wekan/issues/1598
-      #---------------------------------------------------------------
-      # ==== WEKAN API AND EXPORT BOARD ====
+      - ROOT_URL=http://localhost
      # Wekan Export Board works when WITH_API=true.
-      # https://github.com/wekan/wekan/wiki/REST-API
-      # 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.
-      #- 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.
-      #- MATOMO_ADDRESS=https://example.com/matomo
+      # example: - MATOMO_ADDRESS=https://example.com/matomo
+      #- MATOMO_ADDRESS=
      # The value of the site ID given in Matomo server for Wekan
-      #- MATOMO_SITE_ID=1
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
      # The option do not track which enables users to not be tracked by matomo
-      #- MATOMO_DO_NOT_TRACK=true
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
      # The option that allows matomo to retrieve the username:
-      #- MATOMO_WITH_USERNAME=true
-      #-----------------------------------------------------------------
-      # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
+      # example: MATOMO_WITH_USERNAME=true
+      #- 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
      - BROWSER_POLICY_ENABLED=true
      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
-      #- TRUSTED_URL=https://intra.example.com
-      #-----------------------------------------------------------------
-      # ==== OUTGOING WEBHOOKS ====
+      #- 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 .
-      #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
-      #-----------------------------------------------------------------
-      # ==== 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
+      # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      #- WEBHOOKS_ATTRIBUTES=
      # Enable the OAuth2 connection
-      #- OAUTH2_ENABLED=true
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-      # 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=
-      #-----------------------------------------------------------------
-      # ==== LDAP ====
-      # https://github.com/wekan/wekan/wiki/LDAP
-      # For Snap settings see https://github.com/wekan/wekan-snap/wiki/Supported-settings-keys
-      # Most settings work both on Snap and Docker below.
-      # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
-      #
-      # DEFAULT_AUTHENTICATION_METHOD : The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
-      # example : DEFAULT_AUTHENTICATION_METHOD=ldap
-      #- DEFAULT_AUTHENTICATION_METHOD=
-      #
+      # 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=
      # LDAP_ENABLE : Enable or not the connection by the LDAP
      # example : LDAP_ENABLE=true
      #- LDAP_ENABLE=false
-      #
      # LDAP_PORT : The port of the LDAP server
      # example : LDAP_PORT=389
      #- LDAP_PORT=389
-      #
      # LDAP_HOST : The host server for the LDAP server
      # example : LDAP_HOST=localhost
      #- LDAP_HOST=
-      #
      # LDAP_BASEDN : The base DN for the LDAP Tree
      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
      #- LDAP_BASEDN=
-      #
      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
      # example : LDAP_LOGIN_FALLBACK=true
      #- LDAP_LOGIN_FALLBACK=false
-      #
      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
      # example : LDAP_RECONNECT=false
      #- LDAP_RECONNECT=true
-      #
      # LDAP_TIMEOUT : Overall timeout, in milliseconds
      # example : LDAP_TIMEOUT=12345
      #- LDAP_TIMEOUT=10000
-      #
      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
      # example : LDAP_IDLE_TIMEOUT=12345
      #- LDAP_IDLE_TIMEOUT=10000
-      #
      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
      # example : LDAP_CONNECT_TIMEOUT=12345
      #- LDAP_CONNECT_TIMEOUT=10000
-      #
      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
      # example : LDAP_AUTHENTIFICATION=true
      #- LDAP_AUTHENTIFICATION=false
-      #
      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
      #- LDAP_AUTHENTIFICATION_USERDN=
-      #
      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
      # example : AUTHENTIFICATION_PASSWORD=admin
      #- LDAP_AUTHENTIFICATION_PASSWORD=
-      #
      # LDAP_LOG_ENABLED : Enable logs for the module
      # example : LDAP_LOG_ENABLED=true
      #- LDAP_LOG_ENABLED=false
-      #
      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
      # example : LDAP_BACKGROUND_SYNC=true
      #- LDAP_BACKGROUND_SYNC=false
-      #
      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
-      #
      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
      # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
-      #
      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
      # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
-      #
      # LDAP_ENCRYPTION : If using LDAPS
      # example : LDAP_ENCRYPTION=ssl
      #- LDAP_ENCRYPTION=false
-      #
      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
      # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
      #- LDAP_CA_CERT=
-      #
      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
      # example : LDAP_REJECT_UNAUTHORIZED=true
      #- LDAP_REJECT_UNAUTHORIZED=false
-      #
      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      # example : LDAP_USER_SEARCH_FILTER=
      #- LDAP_USER_SEARCH_FILTER=
-      #
      # LDAP_USER_SEARCH_SCOPE : 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 : LDAP_USER_SEARCH_SCOPE=one
      #- LDAP_USER_SEARCH_SCOPE=
-      #
      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
      # example : LDAP_USER_SEARCH_FIELD=uid
      #- LDAP_USER_SEARCH_FIELD=
-      #
      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
      # example : LDAP_SEARCH_PAGE_SIZE=12345
      #- LDAP_SEARCH_PAGE_SIZE=0
-      #
      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
      # example : LDAP_SEARCH_SIZE_LIMIT=12345
      #- LDAP_SEARCH_SIZE_LIMIT=0
-      #
      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
      # example : LDAP_GROUP_FILTER_ENABLE=true
      #- LDAP_GROUP_FILTER_ENABLE=false
-      #
      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
      # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
      #- LDAP_GROUP_FILTER_OBJECTCLASS=
-      #
      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
      # example :
      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
-      #
      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
      # example :
      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
-      #
      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
      # example :
      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
-      #
      # LDAP_GROUP_FILTER_GROUP_NAME :
      # example :
      #- LDAP_GROUP_FILTER_GROUP_NAME=
-      #
      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
      # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
-      #
      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
      # example : LDAP_UTF8_NAMES_SLUGIFY=false
      #- LDAP_UTF8_NAMES_SLUGIFY=true
-      #
      # LDAP_USERNAME_FIELD : Which field contains the ldap username
      # example : LDAP_USERNAME_FIELD=username
      #- LDAP_USERNAME_FIELD=
-      #
-      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
-      # example : LDAP_FULLNAME_FIELD=fullname
-      #- LDAP_FULLNAME_FIELD=
-      #
      # 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
      #- LDAP_SYNC_USER_DATA=false
-      #
      # LDAP_SYNC_USER_DATA_FIELDMAP :
      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
      #- LDAP_SYNC_USER_DATA_FIELDMAP=
-      #
      # LDAP_SYNC_GROUP_ROLES :
      # example :
      #- LDAP_SYNC_GROUP_ROLES=
-      #
      # LDAP_DEFAULT_DOMAIN : 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
      # example :
      #- LDAP_DEFAULT_DOMAIN=
-      #---------------------------------------------------------------------
-      # ==== LOGOUT TIMER, probably does not work yet ====
-      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
-      # example : LOGOUT_WITH_TIMER=true
-      #- LOGOUT_WITH_TIMER=
-      #
-      # LOGOUT_IN : The number of days
-      # example : LOGOUT_IN=1
-      #- LOGOUT_IN=
-      #
-      # LOGOUT_ON_HOURS : The number of hours
-      # example : LOGOUT_ON_HOURS=9
-      #- LOGOUT_ON_HOURS=
-      #
-      # LOGOUT_ON_MINUTES : The number of minutes
-      # example : LOGOUT_ON_MINUTES=55
-      #- LOGOUT_ON_MINUTES=
-      #-------------------------------------------------------------------

    depends_on:
      - wekandb

-#---------------------------------------------------------------------------------
-# ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
-#  When using Wekan both at office LAN and remote VPN:
-#    1) Have above Wekan docker container config with LAN IP address
-#    2) Copy all of above wekan container config below, look above of this part above and all config below it,
-#       before above depends_on: part:
-#
-#         wekan:
-#            #-------------------------------------------------------------------------------------
-#            # ==== MONGODB AND METEOR VERSION ====
-#            # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, .....
-#
-#
-#       and change name to different name like wekan2 or wekanvpn, and change ROOT_URL to server VPN IP
-#       address.
-#    3) This way both Wekan containers can use same MongoDB database
-#       and see the same Wekan boards.
-#    4) You could also add 3rd Wekan container for 3rd network etc.
-# EXAMPLE:
-#  wekan2:
-#    ....COPY CONFIG FROM ABOVE TO HERE...
-#    environment:
-#      - ROOT_URL='http://10.10.10.10'
-#      ...COPY CONFIG FROM ABOVE TO HERE...
-#---------------------------------------------------------------------------------
-
-# OPTIONAL NGINX CONFIG FOR REVERSE PROXY
-#  nginx:
-#    image: nginx
-#    container_name: nginx
-#    restart: always
-#    networks:
-#      - wekan-tier
-#    depends_on:
-#      - wekan
-#    ports:
-#      - 80:80
-#      - 443:443
-#    volumes:
-#      - ./nginx/ssl:/etc/nginx/ssl/
-#      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-
-
 volumes:
  wekan-db:
    driver: local
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Find text from all subdirectories
-# and ignore all temporary directories:
-# - node-modules = installed node modules
-# - .build = Wekan bundle that is combined from source. Do not edit these, these are deleted and recreated.
-# - .meteor = Meteor version, packages etc at .meteor/local
-# - .git = git history
-
-# If less or more that 1 parameter, show usage.
-if (( $# != 1 )); then
-    echo 'Usage: ./find.sh text-to-find'
-    exit 0
-fi
-
-find . | grep -v node_modules | grep -v .build | grep -v .meteor | grep -v .git | xargs grep --no-messages $1 | less
@@ -1,47 +1,38 @@
 {
-    "accept": "قبول",
-    "act-activity-notify": "اشعارات النشاط",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__لوح__",
+    "accept": "اقبلboard",
+    "act-activity-notify": "[Wekan] اشعار عن نشاط",
+    "act-addAttachment": "ربط __attachment__ الى __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": "علق على __comment__ : __card__",
+    "act-createBoard": "احدث __board__",
+    "act-createCard": "اضاف __card__ الى __list__",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "اضاف __list__ الى __board__",
+    "act-addBoardMember": "اضاف __member__ الى __board__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "إستورد __board__",
+    "act-importCard": "إستورد __card__",
+    "act-importList": "إستورد __list__",
+    "act-joinMember": "اضاف __member__ الى __card__",
+    "act-moveCard": "حوّل __card__ من __oldList__ إلى __list__",
+    "act-removeBoardMember": "أزال __member__ من __board__",
+    "act-restoredCard": "أعاد __card__ إلى __board__",
+    "act-unjoinMember": "أزال __member__ من __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "الإجراءات",
    "activities": "الأنشطة",
    "activity": "النشاط",
    "activity-added": "تمت إضافة %s ل %s",
-    "activity-archived": "%s انتقل الى الارشيف",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "إرفاق %s ل %s",
    "activity-created": "أنشأ %s",
-    "activity-customfield-created": "%s احدت حقل مخصص",
+    "activity-customfield-created": "created custom field %s",
    "activity-excluded": "استبعاد %s عن %s",
    "activity-imported": "imported %s into %s from %s",
    "activity-imported-board": "imported %s from %s",
@@ -51,19 +42,19 @@
    "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-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": "أضاف قائمة تحقق إلى %s",
-    "activity-checklist-removed": "ازالة قائمة التحقق من %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted": "لم يتم انجاز قائمة التحقق %s من %s",
-    "activity-checklist-item-added": "تم اضافة عنصر قائمة التحقق الى '%s' في %s",
-    "activity-checklist-item-removed": "تم ازالة عنصر قائمة التحقق الى '%s' في %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-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "إضافة مرفق",
    "add-board": "إضافة لوحة",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other بطاقة",
    "and-n-other-card_plural": "And __count__ other بطاقات",
    "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": "الالواح في الأرشيف",
+    "app-is-offline": "يتمّ تحميل ويكان، يرجى الانتظار. سيؤدي تحديث الصفحة إلى فقدان البيانات. إذا لم يتم تحميل ويكان، يرجى التحقق من أن خادم ويكان لم يتوقف. ",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "استعادة اللوحة",
-    "no-archived-boards": "لا توجد لوحات في الأرشيف.",
-    "archives": "أرشيف",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "تعيين عضو",
    "attached": "أُرفق)",
    "attachment": "مرفق",
@@ -121,25 +110,25 @@
    "boardChangeTitlePopup-title": "إعادة تسمية اللوحة",
    "boardChangeVisibilityPopup-title": "تعديل وضوح الرؤية",
    "boardChangeWatchPopup-title": "تغيير المتابعة",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "قائمة اللوحة",
    "boards": "لوحات",
-    "board-view": "عرض اللوحات",
-    "board-view-cal": "التقويم",
-    "board-view-swimlanes": "خطوط السباحة",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
    "board-view-lists": "القائمات",
    "bucket-example": "مثل « todo list » على سبيل المثال",
    "cancel": "إلغاء",
-    "card-archived": "البطاقة منقولة الى الارشيف",
-    "board-archived": "اللوحات منقولة الى الارشيف",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "%s تعليقات لهذه البطاقة",
    "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
    "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
-    "card-delete-suggest-archive": "يمكنك نقل بطاقة إلى الأرشيف لإزالتها من اللوحة والمحافظة على النشاط.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "مستحق",
    "card-due-on": "مستحق في",
-    "card-spent": "امضى وقتا",
+    "card-spent": "Spent Time",
    "card-edit-attachments": "تعديل المرفقات",
-    "card-edit-custom-fields": "تعديل الحقل المعدل",
+    "card-edit-custom-fields": "Edit custom fields",
    "card-edit-labels": "تعديل العلامات",
    "card-edit-members": "تعديل الأعضاء",
    "card-labels-title": "تعديل علامات البطاقة.",
@@ -147,19 +136,18 @@
    "card-start": "بداية",
    "card-start-on": "يبدأ في",
    "cardAttachmentsPopup-title": "إرفاق من",
-    "cardCustomField-datePopup-title": "تغير التاريخ",
-    "cardCustomFieldsPopup-title": "تعديل الحقل المعدل",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
    "cardDeletePopup-title": "حذف البطاقة ?",
    "cardDetailsActionsPopup-title": "إجراءات على البطاقة",
    "cardLabelsPopup-title": "علامات",
    "cardMembersPopup-title": "أعضاء",
    "cardMorePopup-title": "المزيد",
-    "cardTemplatePopup-title": "Create template",
    "cards": "بطاقات",
    "cards-count": "بطاقات",
-    "casSignIn": "تسجيل الدخول مع  CAS",
-    "cardType-card": "بطاقة",
-    "cardType-linkedCard": "البطاقة المرتبطة",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
    "cardType-linkedBoard": "Linked Board",
    "change": "Change",
    "change-avatar": "تعديل الصورة الشخصية",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "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": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "black",
    "color-blue": "blue",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "green",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "red",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "yellow",
-    "unset-color": "Unset",
    "comment": "تعليق",
    "comment-placeholder": "أكتب تعليق",
    "comment-only": "التعليق فقط",
@@ -215,8 +187,8 @@
    "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": "ربط البطاقة",
-    "searchElementPopup-title": "بحث",
+    "linkCardPopup-title": "Link Card",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "نسخ البطاقة",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -311,20 +283,18 @@
    "import-board": "استيراد لوحة",
    "import-board-c": "استيراد لوحة",
    "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-board-title-wekan": "استيراد لوحة من ويكان",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "من تريلو",
-    "from-wekan": "From previous export",
+    "from-wekan": "من ويكان",
    "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-board-instruction-wekan": "في لوحة ويكان الخاصة بك، انتقل إلى 'القائمة'، ثم 'تصدير اللوحة'، ونسخ النص في الملف الذي تم تنزيله.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "import-map-members": "رسم خريطة الأعضاء",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "حدّد عضو ويكان",
    "info": "الإصدار",
    "initials": "أولية",
    "invalid-date": "تاريخ غير صالح",
@@ -343,21 +313,19 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "مغادرة اللوحة ؟",
    "link-card": "ربط هذه البطاقة",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "نقل بطاقات هذه القائمة",
    "list-select-cards": "تحديد بطاقات هذه القائمة",
-    "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": "رابط إلى هذه القائمة",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "القائمات",
-    "swimlanes": "خطوط السباحة",
+    "swimlanes": "Swimlanes",
    "log-out": "تسجيل الخروج",
    "log-in": "تسجيل الدخول",
    "loginPopup-title": "تسجيل الدخول",
@@ -375,9 +343,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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "لا توجد نتائج",
    "normal": "عادي",
    "normal-desc": "يمكن مشاهدة و تعديل  البطاقات. لا يمكن تغيير إعدادات الضبط.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "تم رفع الصورة الشخصية",
    "username": "اسم المستخدم",
    "view-it": "شاهدها",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "مُشاهد",
    "watching": "مشاهدة",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "المبادئ",
    "welcome-list2": "متقدم",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "ماذا تريد أن تنجز?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "invitation-code": "رمز الدعوة",
    "email-invite-register-subject": "__inviter__ أرسل دعوة لك",
-    "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": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "رمز الدعوة غير موجود",
    "error-notAuthorized": "أنتَ لا تملك الصلاحيات لرؤية هذه الصفحة.",
    "outgoing-webhooks": "الويبهوك الصادرة",
    "outgoingWebhooksPopup-title": "الويبهوك الصادرة",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "ويبهوك جديدة ",
    "no-name": "(غير معروف)",
+    "Wekan_version": "إصدار ويكان",
    "Node_version": "إصدار النود",
    "OS_Arch": "معمارية نظام التشغيل",
    "OS_Cpus": "استهلاك وحدة المعالجة المركزية لنظام التشغيل",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "الذاكرة الكلية لنظام التشغيل",
    "OS_Type": "نوع نظام التشغيل",
    "OS_Uptime": "مدة تشغيل نظام التشغيل",
-    "days": "days",
    "hours": "الساعات",
    "minutes": "الدقائق",
    "seconds": "الثواني",
    "show-field-on-card": "Show this 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": "الحسابات",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "نقل الى الارشيف",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Приемам",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__    ",
+    "act-activity-notify": "[Wekan] Известия за дейности",
+    "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": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Действия",
    "activities": "Действия",
    "activity": "Дейности",
    "activity-added": "добави %s към %s",
-    "activity-archived": "%s е преместена в Архива",
+    "activity-archived": "премести %s в Кошчето",
    "activity-attached": "прикачи %s към %s",
    "activity-created": "създаде %s",
    "activity-customfield-created": "създаде собствено поле %s",
@@ -56,15 +47,15 @@
    "activity-unchecked-item": "размаркира %s от списък със задачи %s на %s",
    "activity-checklist-added": "добави списък със задачи към %s",
    "activity-checklist-removed": "премахна списък със задачи от %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
+    "activity-checklist-completed": "завърши списък със задачи %s на %s",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "добави точка към '%s' в/във %s",
-    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Добави",
-    "activity-checked-item-card": "отбеляза %s в чеклист %s",
-    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
+    "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",
    "add-attachment": "Добави прикачен файл",
    "add-board": "Добави Табло",
    "add-card": "Добави карта",
@@ -87,22 +78,20 @@
    "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": "Табла в Архива",
+    "app-is-offline": "Wekan зарежда, моля изчакайте! Презареждането на страницата може да доведе до загуба на данни. Ако Wekan не се зареди, моля проверете дали сървърът му работи.",
+    "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": "Архив",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "Няма Табла в Кошчето.",
+    "archives": "Кошче",
    "assign-member": "Възложи на член от екипа",
    "attached": "прикачен",
    "attachment": "Прикаченн файл",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Промени името на Таблото",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Промени наблюдаването",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Меню на Таблото",
    "boards": "Табла",
    "board-view": "Board View",
    "board-view-cal": "Календар",
@@ -129,12 +118,12 @@
    "board-view-lists": "Списъци",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancel",
-    "card-archived": "Тази карта е преместена в Архива.",
-    "board-archived": "Това табло е преместено в Архива.",
+    "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-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Готова за",
    "card-due-on": "Готова за",
    "card-spent": "Изработено време",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Етикети",
    "cardMembersPopup-title": "Членове",
    "cardMorePopup-title": "Още",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Карти",
    "cards-count": "Карти",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Клипборда или с драг & дроп",
    "close": "Затвори",
    "close-board": "Затвори Таблото",
-    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "черно",
    "color-blue": "синьо",
-    "color-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": "Само коментар",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?",
    "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
    "linkCardPopup-title": "Свържи картата",
-    "searchElementPopup-title": "Търсене",
+    "searchCardPopup-title": "Търсене на карта",
    "copyCardPopup-title": "Копирай картата",
    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Импортирай табло от Wekan",
    "import-sandstorm-warning": "Импортирането ще изтрие всичката налична информация в таблото и ще я замени с нова.",
    "from-trello": "От Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "От Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Избери Wekan член",
    "info": "Версия",
    "initials": "Инициали",
    "invalid-date": "Невалидна дата",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Премести всички карти от този списък в Архива",
-    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
+    "list-archive-cards": "Премести всички карти от този списък в Кошчето",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Премести всички карти в този списък",
    "list-select-cards": "Избери всички карти в този списък",
-    "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": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
+    "list-delete-suggest-archive": "Можете да преместите списък в Кошчето, за да го премахнете от Таблото и запазите активността.",
    "lists": "Списъци",
    "swimlanes": "Коридори",
    "log-out": "Изход",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "Моите табла",
    "name": "Име",
-    "no-archived-cards": "Няма карти в Архива.",
-    "no-archived-lists": "Няма списъци в Архива.",
-    "no-archived-swimlanes": "Няма коридори в Архива.",
+    "no-archived-cards": "Няма карти в Кошчето.",
+    "no-archived-lists": "Няма списъци в Кошчето.",
+    "no-archived-swimlanes": "Няма коридори в Кошчето.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Качихте аватар",
    "username": "Потребителско име",
    "view-it": "View it",
-    "warn-list-archived": "внимание: тази карта е в списък в Архива",
+    "warn-list-archived": "внимание: тази карта е в списък, който е в Кошчето",
    "watch": "Наблюдавай",
    "watching": "Наблюдава",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "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.",
@@ -479,7 +444,7 @@
    "disable-self-registration": "Disable Self-Registration",
    "invite": "Покани",
    "invite-people": "Покани хора",
-    "to-boards": "в табло/а",
+    "to-boards": "To board(s)",
    "email-addresses": "Имейл адреси",
    "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
    "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
@@ -493,16 +458,16 @@
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP тестов имейл, изпратен от Wekan",
    "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)",
+    "Wekan_version": "Версия на Wekan",
    "Node_version": "Версия на Node",
    "OS_Arch": "Архитектура на ОС",
    "OS_Cpus": "Брой CPU ядра",
@@ -513,13 +478,10 @@
    "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": "Профили",
@@ -534,19 +496,15 @@
    "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": "Поискан от",
+    "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.",
    "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": "Изтрий таблото",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
    "default-subtasks-board": "Подзадачи за табло __board__",
    "default": "по подразбиране",
-    "queue": "Опашка",
+    "queue": "Queue",
    "subtask-settings": "Настройки на Подзадачите",
    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
    "show-subtasks-field": "Картата може да има подзадачи",
@@ -561,40 +519,38 @@
    "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": "изтри прикачения файл",
+    "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",
    "r-rule": "Правило",
-    "r-add-trigger": "Добави спусък",
-    "r-add-action": "Добави действие",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "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-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
    "r-moved-to": "Moved to",
    "r-moved-from": "Moved from",
-    "r-archived": "Преместено в Архива",
-    "r-unarchived": "Възстановено от Архива",
-    "r-a-card": "карта",
+    "r-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
+    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
-    "r-name": "име",
+    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -604,19 +560,18 @@
    "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-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Премести в Кошчето",
+    "r-unarchive": "Restore from Recycle Bin",
+    "r-card": "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",
@@ -637,13 +592,10 @@
    "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-archive": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -652,16 +604,8 @@
    "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-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
    "r-when-a-card-is-moved": "When a card is moved to another list",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Asantiñ",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Oberoù",
    "activities": "Oberiantizoù",
    "activity": "Oberiantiz",
    "activity-added": "%s ouzhpennet da %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "%s liammet ouzh %s",
    "activity-created": "%s krouet",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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": "Ouzhpenn",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "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": "Archive",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "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": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Izili",
    "cardMorePopup-title": "Muioc’h",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Kartennoù",
    "cards-count": "Kartennoù",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "du",
    "color-blue": "glas",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "gwer",
-    "color-indigo": "indigo",
    "color-lime": "melen sitroñs",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "orañjez",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "roz",
-    "color-plum": "plum",
    "color-purple": "mouk",
    "color-red": "ruz",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "pers",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "melen",
-    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Lists",
    "swimlanes": "Swimlanes",
    "log-out": "Log Out",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Ouzhpenn",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,47 +1,38 @@
 {
    "accept": "Accepta",
-    "act-activity-notify": "Notificació d'activitat",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__tauler__",
-    "act-withCardTitle": "[__tauler__] __fitxa__",
+    "act-activity-notify": "[Wekan] Notificació d'activitat",
+    "act-addAttachment": "adjuntat __attachment__ a __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "afegida la checklist _checklist__ a __card__",
+    "act-addChecklistItem": "afegit __checklistItem__ a la checklist __checklist__ on __card__",
+    "act-addComment": "comentat a __card__: __comment__",
+    "act-createBoard": "creat __board__",
+    "act-createCard": "afegit/da __card__ a __list__",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "afegit/da __list__ a __board__",
+    "act-addBoardMember": "afegit/da __member__ a __board__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "__board__ importat",
+    "act-importCard": "__card__ importat",
+    "act-importList": "__list__ importat",
+    "act-joinMember": "afegit/da __member__ a __card__",
+    "act-moveCard": "mou __card__ de __oldList__ a __list__",
+    "act-removeBoardMember": "elimina __member__ de __board__",
+    "act-restoredCard": "recupera __card__ a __board__",
+    "act-unjoinMember": "elimina __member__ de __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
+    "act-withCardTitle": "[__board__] __card__",
    "actions": "Accions",
    "activities": "Activitats",
    "activity": "Activitat",
    "activity-added": "ha afegit %s a %s",
-    "activity-archived": "%s mogut al Arxiu",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "ha adjuntat %s a %s",
    "activity-created": "ha creat %s",
-    "activity-customfield-created": "camp personalitzat creat %s",
+    "activity-customfield-created": "created custom field %s",
    "activity-excluded": "ha exclòs %s de %s",
    "activity-imported": "importat %s dins %s des de %s",
    "activity-imported-board": "importat %s des de %s",
@@ -56,22 +47,22 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "Checklist afegida a %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Afegeix",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Afegeix adjunt",
    "add-board": "Afegeix Tauler",
-    "add-card": "Afegeix Fitxa",
+    "add-card": "Afegeix fitxa",
    "add-swimlane": "Afegix Carril de Natació",
-    "add-subtask": "Afegir Subtasca",
+    "add-subtask": "Add Subtask",
    "add-checklist": "Afegeix checklist",
-    "add-checklist-item": "Afegeix un ítem al checklist",
+    "add-checklist-item": "Afegeix un ítem",
    "add-cover": "Afegeix coberta",
    "add-label": "Afegeix etiqueta",
    "add-list": "Afegeix llista",
@@ -79,67 +70,65 @@
    "added": "Afegit",
    "addMemberPopup-title": "Membres",
    "admin": "Administrador",
-    "admin-desc": "Pots veure i editar fitxes, eliminar usuaris, i canviar la configuració del tauler.",
-    "admin-announcement": "Alertes",
-    "admin-announcement-active": "Activar alertes del Sistema",
-    "admin-announcement-title": "Alertes d'administració",
+    "admin-desc": "Pots veure i editar fitxes, eliminar membres, i canviar la configuració del tauler",
+    "admin-announcement": "Bàndol",
+    "admin-announcement-active": "Activar bàndol del Sistema",
+    "admin-announcement-title": "Bàndol de l'administració",
    "all-boards": "Tots els taulers",
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "Aplica",
-    "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": "Moure al arxiu",
-    "archive-all": "Moure tot al arxiu",
-    "archive-board": "Moure Tauler al Arxiu",
-    "archive-card": "Moure Fitxa al Arxiu",
-    "archive-list": "Moure Llista al Arxiu",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Moure selecció al Arxiu",
-    "archiveBoardPopup-title": "Moure el Tauler al Arxiu?",
-    "archived-items": "Desa",
-    "archived-boards": "Taulers al Arxiu",
+    "app-is-offline": "Wekan s'està carregant, esperau si us plau. Refrescar la pàgina causarà la pérdua de les dades. Si Wekan no carrega, verificau que el servei de Wekan no estigui aturat",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restaura Tauler",
-    "no-archived-boards": "No hi han Taulers al Arxiu.",
-    "archives": "Desa",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assignar membre",
    "attached": "adjuntat",
    "attachment": "Adjunt",
    "attachment-delete-pop": "L'esborrat d'un arxiu adjunt és permanent. No es pot desfer.",
    "attachmentDeletePopup-title": "Esborrar adjunt?",
    "attachments": "Adjunts",
-    "auto-watch": "Segueix automàticament el taulers quan són creats",
+    "auto-watch": "Automàticament segueix el taulers quan són creats",
    "avatar-too-big": "L'avatar es massa gran (70KM max)",
    "back": "Enrere",
    "board-change-color": "Canvia el color",
    "board-nb-stars": "%s estrelles",
    "board-not-found": "No s'ha trobat el tauler",
-    "board-private-info": "Aquest tauler serà <strong> privat.",
-    "board-public-info": "Aquest tauler serà <strong> públic.",
-    "boardChangeColorPopup-title": "Canvia fons del tauler",
+    "board-private-info": "Aquest tauler serà <strong> privat </ strong>.",
+    "board-public-info": "Aquest tauler serà <strong> públic </ strong>.",
+    "boardChangeColorPopup-title": "Canvia fons",
    "boardChangeTitlePopup-title": "Canvia el nom tauler",
    "boardChangeVisibilityPopup-title": "Canvia visibilitat",
    "boardChangeWatchPopup-title": "Canvia seguiment",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Menú del tauler",
    "boards": "Taulers",
    "board-view": "Visió del tauler",
-    "board-view-cal": "Calendari",
+    "board-view-cal": "Calendar",
    "board-view-swimlanes": "Carrils de Natació",
    "board-view-lists": "Llistes",
    "bucket-example": "Igual que “Bucket List”,  per exemple",
    "cancel": "Cancel·la",
-    "card-archived": "Aquesta fitxa ha estat moguda al Arxiu.",
-    "board-archived": "Aquest tauler s'ha mogut al arxiu",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "Aquesta fitxa té %s comentaris.",
    "card-delete-notice": "L'esborrat és permanent. Perdreu totes les accions associades a aquesta fitxa.",
    "card-delete-pop": "Totes les accions s'eliminaran de l'activitat i no podreu tornar a obrir la fitxa. No es pot desfer.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Finalitza",
    "card-due-on": "Finalitza a",
    "card-spent": "Temps Dedicat",
    "card-edit-attachments": "Edita arxius adjunts",
-    "card-edit-custom-fields": "Editar camps personalitzats",
+    "card-edit-custom-fields": "Edit custom fields",
    "card-edit-labels": "Edita etiquetes",
    "card-edit-members": "Edita membres",
    "card-labels-title": "Canvia les etiquetes de la fitxa",
@@ -147,18 +136,17 @@
    "card-start": "Comença",
    "card-start-on": "Comença a",
    "cardAttachmentsPopup-title": "Adjunta des de",
-    "cardCustomField-datePopup-title": "Canviar data",
-    "cardCustomFieldsPopup-title": "Editar camps personalitzats",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
    "cardDeletePopup-title": "Esborrar fitxa?",
    "cardDetailsActionsPopup-title": "Accions de fitxes",
    "cardLabelsPopup-title": "Etiquetes",
    "cardMembersPopup-title": "Membres",
    "cardMorePopup-title": "Més",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Fitxes",
    "cards-count": "Fitxes",
    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Fitxa",
+    "cardType-card": "Card",
    "cardType-linkedCard": "Linked Card",
    "cardType-linkedBoard": "Linked Board",
    "change": "Canvia",
@@ -171,52 +159,36 @@
    "changePasswordPopup-title": "Canvia la contrasenya",
    "changePermissionsPopup-title": "Canvia permisos",
    "changeSettingsPopup-title": "Canvia configuració",
-    "subtasks": "Subtasca",
+    "subtasks": "Subtasks",
    "checklists": "Checklists",
    "click-to-star": "Fes clic per destacar aquest tauler.",
    "click-to-unstar": "Fes clic per deixar de destacar aquest tauler.",
    "clipboard": "Portaretalls o estirar i amollar",
    "close": "Tanca",
    "close-board": "Tanca tauler",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "negre",
    "color-blue": "blau",
-    "color-crimson": "carmesí",
-    "color-darkgreen": "verd fosc",
-    "color-gold": "daurat",
-    "color-gray": "gris",
    "color-green": "verd",
-    "color-indigo": "índigo",
    "color-lime": "llima",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "marina",
    "color-orange": "taronja",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "rosa",
-    "color-plum": "pruna",
    "color-purple": "púrpura",
    "color-red": "vermell",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "plata",
    "color-sky": "cel",
-    "color-slateblue": "slateblue",
-    "color-white": "blanc",
    "color-yellow": "groc",
-    "unset-color": "Unset",
    "comment": "Comentari",
    "comment-placeholder": "Escriu un comentari",
    "comment-only": "Només comentaris",
    "comment-only-desc": "Només pots fer comentaris a les fitxes",
-    "no-comments": "Sense comentaris",
+    "no-comments": "No comments",
    "no-comments-desc": "Can not see comments and activities.",
    "computer": "Ordinador",
-    "confirm-subtask-delete-dialog": "Esteu segur que voleu eliminar la subtasca?",
+    "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": "Copia l'enllaç de la ftixa al porta-retalls",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Cerca",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "Copia la fitxa",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Títols de fitxa i Descripcions de destí en aquest format JSON",
@@ -225,20 +197,20 @@
    "createBoardPopup-title": "Crea tauler",
    "chooseBoardSourcePopup-title": "Importa Tauler",
    "createLabelPopup-title": "Crea etiqueta",
-    "createCustomField": "Crear camp",
-    "createCustomFieldPopup-title": "Crear camp",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
    "current": "Actual",
    "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": "Data",
    "custom-field-dropdown": "Dropdown List",
    "custom-field-dropdown-none": "(none)",
-    "custom-field-dropdown-options": "Llista d'opcions",
+    "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": "Camps Personalitzats",
+    "custom-fields": "Custom Fields",
    "date": "Data",
    "decline": "Declina",
    "default-avatar": "Avatar per defecte",
@@ -258,7 +230,7 @@
    "soft-wip-limit": "Soft WIP Limit",
    "editCardStartDatePopup-title": "Canvia data d'inici",
    "editCardDueDatePopup-title": "Canvia data de finalització",
-    "editCustomFieldPopup-title": "Modificar camp",
+    "editCustomFieldPopup-title": "Edit Field",
    "editCardSpentTimePopup-title": "Canvia temps dedicat",
    "editLabelPopup-title": "Canvia etiqueta",
    "editNotificationPopup-title": "Edita la notificació",
@@ -299,7 +271,7 @@
    "filter-on": "Filtra per",
    "filter-on-desc": "Estau filtrant fitxes en aquest tauler. Feu clic aquí per editar el filtre.",
    "filter-to-selection": "Filtra selecció",
-    "advanced-filter-label": "Filtre avançat",
+    "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": "Nom complet",
    "header-logo-title": "Torna a la teva pàgina de taulers",
@@ -307,24 +279,22 @@
    "headerBarCreateBoardPopup-title": "Crea tauler",
    "home": "Inici",
    "import": "importa",
-    "link": "Enllaç",
+    "link": "Link",
    "import-board": "Importa tauler",
    "import-board-c": "Importa tauler",
    "import-board-title-trello": "Importa tauler des de 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": "I",
    "import-sandstorm-warning": "Estau segur que voleu esborrar aquesta checklist?",
    "from-trello": "Des de Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "Des de Wekan",
    "import-board-instruction-trello": "En el teu tauler Trello, ves a 'Menú', 'Més'.' Imprimir i Exportar', 'Exportar JSON', i copia el text resultant.",
-    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Aferra codi JSON vàlid aquí",
    "import-map-members": "Mapeja el membres",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "El tauler importat conté membres. Assigna els membres que vulguis importar a usuaris Wekan",
    "import-show-user-mapping": "Revisa l'assignació de membres",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Selecciona un usuari",
+    "import-user-select": "Selecciona l'usuari Wekan que vulguis associar a aquest membre",
+    "importMapMembersAddPopup-title": "Selecciona un membre de Wekan",
    "info": "Versió",
    "initials": "Inicials",
    "invalid-date": "Data invàlida",
@@ -343,19 +313,17 @@
    "leave-board-pop": "De debò voleu abandonar __boardTitle__? Se us eliminarà de totes les fitxes d'aquest tauler.",
    "leaveBoardPopup-title": "Abandonar Tauler?",
    "link-card": "Enllaç a aquesta fitxa",
-    "list-archive-cards": "Moure totes les fitxes en aquesta llista al Arxiu",
-    "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Mou totes les fitxes d'aquesta llista",
    "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
-    "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",
    "list-delete-pop": "Totes les accions seran esborrades de la llista d'activitats i no serà possible recuperar la llista",
-    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Llistes",
    "swimlanes": "Carrils de Natació",
    "log-out": "Finalitza la  sessió",
@@ -375,9 +343,9 @@
    "muted-info": "No seràs notificat dels canvis en aquest tauler",
    "my-boards": "Els meus taulers",
    "name": "Nom",
-    "no-archived-cards": "No hi ha fitxes a l'arxiu.",
-    "no-archived-lists": "No hi ha llistes al arxiu.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "No cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Sense resultats",
    "normal": "Normal",
    "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.",
@@ -413,7 +381,7 @@
    "restore": "Restaura",
    "save": "Desa",
    "search": "Cerca",
-    "rules": "Regles",
+    "rules": "Rules",
    "search-cards": "Cerca títols de fitxa i descripcions en aquest tauler",
    "search-example": "Text que cercar?",
    "select-color": "Selecciona color",
@@ -448,7 +416,7 @@
    "title": "Títol",
    "tracking": "En seguiment",
    "tracking-info": "Seràs notificat per cada canvi a aquelles fitxes de les que n'eres creador o membre",
-    "type": "Tipus",
+    "type": "Type",
    "unassign-member": "Desassignar membre",
    "unsaved-description": "Tens una descripció sense desar.",
    "unwatch": "Suprimeix observació",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar actualitzat",
    "username": "Nom d'Usuari",
    "view-it": "Vist",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Observa",
    "watching": "En observació",
    "watching-info": "Seràs notificat de cada canvi en aquest tauler",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Objectiu 1",
    "welcome-list1": "Bàsics",
    "welcome-list2": "Avançades",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Què vols fer?",
    "wipLimitErrorPopup-title": "Límit de Treball en Progrès invàlid",
    "wipLimitErrorPopup-dialog-pt1": "El nombre de tasques en esta llista és superior al límit de Treball en Progrès que heu definit.",
@@ -486,23 +451,23 @@
    "smtp-tls-description": "Activa suport TLS pel servidor SMTP",
    "smtp-host": "Servidor SMTP",
    "smtp-port": "Port SMTP",
-    "smtp-username": "Nom d'usuari",
+    "smtp-username": "Nom d'Usuari",
    "smtp-password": "Contrasenya",
    "smtp-tls": "Suport TLS",
    "send-from": "De",
    "send-smtp-test": "Envia't un correu electrònic de prova",
    "invitation-code": "Codi d'invitació",
    "email-invite-register-subject": "__inviter__ t'ha convidat",
-    "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": " __user__,\n\n __inviter__  us ha convidat a col·laborar a Wekan.\n\n Clicau l'enllaç següent per acceptar l'invitació:\n __url__\n\n El vostre codi d'invitació és: __icode__\n\n Gràcies",
+    "email-smtp-test-subject": "Correu de Prova SMTP de Wekan",
    "email-smtp-test-text": "Has enviat un missatge satisfactòriament",
    "error-invitation-code-not-exist": "El codi d'invitació no existeix",
    "error-notAuthorized": "No estau autoritzats per veure aquesta pàgina",
    "outgoing-webhooks": "Webhooks sortints",
    "outgoingWebhooksPopup-title": "Webhooks sortints",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "Nou Webook sortint",
    "no-name": "Importa tauler des de Wekan",
+    "Wekan_version": "Versió Wekan",
    "Node_version": "Versió Node",
    "OS_Arch": "Arquitectura SO",
    "OS_Cpus": "Plataforma SO",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Memòria total",
    "OS_Type": "Tipus de SO",
    "OS_Uptime": "Temps d'activitat",
-    "days": "days",
    "hours": "hores",
    "minutes": "minuts",
    "seconds": "segons",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Si",
    "no": "No",
    "accounts": "Comptes",
@@ -534,12 +496,8 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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",
+    "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.",
    "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?",
@@ -570,31 +528,29 @@
    "r-rule": "Rule",
    "r-add-trigger": "Add trigger",
    "r-add-action": "Add action",
-    "r-board-rules": "Regles del tauler",
+    "r-board-rules": "Board rules",
    "r-add-rule": "Add rule",
    "r-view-rule": "View rule",
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
-    "r-no-rules": "No hi han regles",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-no-rules": "No rules",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "Moure al arxiu",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Afegeix",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Přijmout",
-    "act-activity-notify": "Notifikace aktivit",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Notifikace aktivit",
+    "act-addAttachment": "přiložen __attachment__ do __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "přidán checklist __checklist__ do __card__",
+    "act-addChecklistItem": "přidán __checklistItem__ do checklistu __checklist__ v __card__",
+    "act-addComment": "komentář k __card__: __comment__",
+    "act-createBoard": "přidání __board__",
+    "act-createCard": "přidání __card__ do __list__",
+    "act-createCustomField": "vytvořeno vlastní pole __customField__",
+    "act-createList": "přidání __list__ do __board__",
+    "act-addBoardMember": "přidání __member__ do __board__",
+    "act-archivedBoard": "__board__ bylo přesunuto do koše",
+    "act-archivedCard": "__card__ bylo přesunuto do koše",
+    "act-archivedList": "__list__ bylo přesunuto do koše",
+    "act-archivedSwimlane": "__swimlane__ bylo přesunuto do koše",
+    "act-importBoard": "import __board__",
+    "act-importCard": "import __card__",
+    "act-importList": "import __list__",
+    "act-joinMember": "přidání __member__ do __card__",
+    "act-moveCard": "přesun __card__ z __oldList__ do __list__",
+    "act-removeBoardMember": "odstranění __member__ z __board__",
+    "act-restoredCard": "obnovení __card__ do __board__",
+    "act-unjoinMember": "odstranění __member__ z __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Akce",
    "activities": "Aktivity",
    "activity": "Aktivita",
    "activity-added": "%s přidáno k %s",
-    "activity-archived": "%s bylo přesunuto do archivu",
+    "activity-archived": "%s bylo přesunuto do koše",
    "activity-attached": "přiloženo %s k %s",
    "activity-created": "%s vytvořeno",
    "activity-customfield-created": "vytvořeno vlastní pole %s",
@@ -51,20 +42,20 @@
    "activity-removed": "odstraněn %s z %s",
    "activity-sent": "%s posláno na %s",
    "activity-unjoined": "odpojen %s",
-    "activity-subtask-added": "podúkol přidán do %s",
-    "activity-checked-item": "dokončen %s v seznamu %s z %s",
-    "activity-unchecked-item": "nedokončen %s v seznamu %s z %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": "přidán checklist do %s",
    "activity-checklist-removed": "odstraněn checklist z %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted": "nedokončen seznam %s z %s",
+    "activity-checklist-completed": "completed the checklist %s of %s",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "přidána položka checklist do '%s' v %s",
-    "activity-checklist-item-removed": "odstraněna položka seznamu do '%s' v %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Přidat",
-    "activity-checked-item-card": "dokončen %s v seznamu %s",
-    "activity-unchecked-item-card": "nedokončen %s v seznamu %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted-card": "nedokončený seznam %s",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "dokončen checklist %s",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Přidat přílohu",
    "add-board": "Přidat tablo",
    "add-card": "Přidat kartu",
@@ -74,7 +65,7 @@
    "add-checklist-item": "Přidat položku do zaškrtávacího seznamu",
    "add-cover": "Přidat obal",
    "add-label": "Přidat štítek",
-    "add-list": "Přidat sloupec",
+    "add-list": "Přidat list",
    "add-members": "Přidat členy",
    "added": "Přidán",
    "addMemberPopup-title": "Členové",
@@ -87,22 +78,20 @@
    "and-n-other-card": "A __count__ další karta(y)",
    "and-n-other-card_plural": "A __count__ dalších karet",
    "apply": "Použít",
-    "app-is-offline": "Načítá se, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se načítání nedaří, zkontrolujte prosím server.",
-    "archive": "Přesunout do archivu",
-    "archive-all": "Přesunout vše do archivu",
-    "archive-board": "Přesunout tablo do archivu",
-    "archive-card": "Přesunout kartu do archivu",
-    "archive-list": "Přesunout seznam do archivu",
-    "archive-swimlane": "Přesunout swimlane do archivu",
-    "archive-selection": "Přesunout výběr do archivu",
-    "archiveBoardPopup-title": "Přesunout tablo do archivu?",
-    "archived-items": "Archiv",
-    "archived-boards": "Tabla v archivu",
+    "app-is-offline": "Wekan se načítá, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se Wekan nenačte, zkontrolujte prosím, jestli se server s Wekanem nezastavil.",
+    "archive": "Přesunout do koše",
+    "archive-all": "Přesunout všechno do koše",
+    "archive-board": "Přesunout tablo do koše",
+    "archive-card": "Přesunout kartu do koše",
+    "archive-list": "Přesunout seznam do koše",
+    "archive-swimlane": "Přesunout swimlane do koše",
+    "archive-selection": "Přesunout výběr do koše",
+    "archiveBoardPopup-title": "Chcete přesunout tablo do koše?",
+    "archived-items": "Koš",
+    "archived-boards": "Tabla v koši",
    "restore-board": "Obnovit tablo",
-    "no-archived-boards": "V archivu nejsou žádná tabla.",
-    "archives": "Archiv",
-    "template": "Šablona",
-    "templates": "Šablony",
+    "no-archived-boards": "Žádná tabla v koši",
+    "archives": "Koš",
    "assign-member": "Přiřadit člena",
    "attached": "přiloženo",
    "attachment": "Příloha",
@@ -121,20 +110,20 @@
    "boardChangeTitlePopup-title": "Přejmenovat tablo",
    "boardChangeVisibilityPopup-title": "Upravit viditelnost",
    "boardChangeWatchPopup-title": "Změnit sledování",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Menu tabla",
    "boards": "Tabla",
    "board-view": "Náhled tabla",
    "board-view-cal": "Kalendář",
    "board-view-swimlanes": "Swimlanes",
-    "board-view-lists": "Sloupce",
-    "bucket-example": "Například \"O čem sním\"",
+    "board-view-lists": "Seznamy",
+    "bucket-example": "Například \"Než mě odvedou\"",
    "cancel": "Zrušit",
-    "card-archived": "Karta byla přesunuta do archivu.",
-    "board-archived": "Toto tablo je přesunuto do archivu.",
+    "card-archived": "Karta byla přesunuta do koše.",
+    "board-archived": "Toto tablo je přesunuto do koše",
    "card-comments-title": "Tato karta má %s komentářů.",
    "card-delete-notice": "Smazání je trvalé. Přijdete o všechny akce asociované s touto kartou.",
-    "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
-    "card-delete-suggest-archive": "Můžete přesunout kartu do archivu pro odstranění z tabla a zachovat aktivitu.",
+    "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu znovu otevřít. Toto nelze vrátit zpět.",
+    "card-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
    "card-due": "Termín",
    "card-due-on": "Do",
    "card-spent": "Strávený čas",
@@ -154,13 +143,12 @@
    "cardLabelsPopup-title": "Štítky",
    "cardMembersPopup-title": "Členové",
    "cardMorePopup-title": "Více",
-    "cardTemplatePopup-title": "Vytvořit šablonu",
    "cards": "Karty",
    "cards-count": "Karty",
-    "casSignIn": "Přihlásit pomocí CAS",
+    "casSignIn": "Sign In with CAS",
    "cardType-card": "Karta",
-    "cardType-linkedCard": "Propojená karta",
-    "cardType-linkedBoard": "Propojené tablo",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
    "change": "Změnit",
    "change-avatar": "Změnit avatar",
    "change-password": "Změnit heslo",
@@ -171,52 +159,36 @@
    "changePasswordPopup-title": "Změnit heslo",
    "changePermissionsPopup-title": "Změnit oprávnění",
    "changeSettingsPopup-title": "Změnit nastavení",
-    "subtasks": "Podúkol",
+    "subtasks": "Subtasks",
    "checklists": "Checklisty",
    "click-to-star": "Kliknutím přidat hvězdičku tomuto tablu.",
    "click-to-unstar": "Kliknutím odebrat hvězdičku tomuto tablu.",
    "clipboard": "Schránka nebo potáhnout a pustit",
    "close": "Zavřít",
    "close-board": "Zavřít tablo",
-    "close-board-pop": "Budete moci obnovit tablo kliknutím na tlačítko \"Archiv\" v hlavním menu.",
+    "close-board-pop": "Kliknutím na tlačítko \"Recyklovat\" budete moci obnovit tablo z koše.",
    "color-black": "černá",
    "color-blue": "modrá",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "zlatá",
-    "color-gray": "šedá",
    "color-green": "zelená",
-    "color-indigo": "indigo",
    "color-lime": "světlezelená",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "tmavě modrá",
    "color-orange": "oranžová",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "růžová",
-    "color-plum": "plum",
    "color-purple": "fialová",
    "color-red": "červená",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "stříbrná",
    "color-sky": "nebeská",
-    "color-slateblue": "slateblue",
-    "color-white": "bílá",
    "color-yellow": "žlutá",
-    "unset-color": "Nenastaveno",
    "comment": "Komentář",
    "comment-placeholder": "Text komentáře",
    "comment-only": "Pouze komentáře",
    "comment-only-desc": "Může přidávat komentáře pouze do karet.",
    "no-comments": "Žádné komentáře",
-    "no-comments-desc": "Nemůže vidět komentáře a aktivity",
+    "no-comments-desc": "Can not see comments and activities.",
    "computer": "Počítač",
    "confirm-subtask-delete-dialog": "Opravdu chcete smazat tento podúkol?",
    "confirm-checklist-delete-dialog": "Opravdu chcete smazat tento checklist?",
    "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti",
-    "linkCardPopup-title": "Propojit kartu",
-    "searchElementPopup-title": "Hledat",
+    "linkCardPopup-title": "Link Card",
+    "searchCardPopup-title": "Hledat Kartu",
    "copyCardPopup-title": "Kopírovat kartu",
    "copyChecklistToManyCardsPopup-title": "Kopírovat checklist do více karet",
    "copyChecklistToManyCardsPopup-instructions": "Názvy a popisy cílové karty v tomto formátu JSON",
@@ -283,7 +255,7 @@
    "error-board-notAMember": "K provedení změny musíš být členem tohoto tabla",
    "error-json-malformed": "Tvůj text není validní JSON",
    "error-json-schema": "Tato JSON data neobsahují správné informace v platném formátu",
-    "error-list-doesNotExist": "Tento sloupec ;neexistuje",
+    "error-list-doesNotExist": "Tento seznam neexistuje",
    "error-user-doesNotExist": "Tento uživatel neexistuje",
    "error-user-notAllowSelf": "Nemůžeš pozvat sám sebe",
    "error-user-notCreated": "Tento uživatel není vytvořen",
@@ -307,24 +279,22 @@
    "headerBarCreateBoardPopup-title": "Vytvořit tablo",
    "home": "Domů",
    "import": "Import",
-    "link": "Propojit",
+    "link": "Link",
    "import-board": "Importovat tablo",
    "import-board-c": "Importovat tablo",
    "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Importovat tablo z předchozího exportu",
-    "import-sandstorm-backup-warning": "Nemažte data, která importujete z původního exportovaného tabla nebo Trello předtím, nežli zkontrolujete, jestli lze tuto část zavřít a znovu otevřít nebo jestli se Vám nezobrazuje chyba tabla, což znamená ztrátu dat.",
+    "import-board-title-wekan": "Importovat tablo z Wekanu",
    "import-sandstorm-warning": "Importované tablo spaže všechny existující data v tablu a nahradí je importovaným tablem.",
    "from-trello": "Z Trella",
-    "from-wekan": "Z předchozího exportu",
+    "from-wekan": "Z Wekanu",
    "import-board-instruction-trello": "Na svém Trello tablu, otevři 'Menu', pak 'More', 'Print and Export', 'Export JSON', a zkopíruj výsledný text",
-    "import-board-instruction-wekan": "Ve vašem tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
-    "import-board-instruction-about-errors": "Někdy import funguje i přestože dostáváte chyby při importování tabla, které se zobrazí na stránce Všechna tabla.",
+    "import-board-instruction-wekan": "Ve vašem Wekan tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
    "import-json-placeholder": "Sem vlož validní JSON data",
    "import-map-members": "Mapovat členy",
-    "import-members-map": "Toto importované tablo obsahuje několik osob. Prosím namapujte osoby z importu na místní uživatelské účty.",
+    "import-members-map": "Toto importované tablo obsahuje několik členů. Namapuj členy z importu na uživatelské účty Wekan.",
    "import-show-user-mapping": "Zkontrolovat namapování členů",
-    "import-user-select": "Vyberte existující uživatelský účet, kterého chcete použít pro tuto osobu",
-    "importMapMembersAddPopup-title": "Zvolte osobu",
+    "import-user-select": "Vyber uživatele Wekan, kterého chceš použít pro tohoto člena",
+    "importMapMembersAddPopup-title": "Vybrat Wekan uživatele",
    "info": "Verze",
    "initials": "Iniciály",
    "invalid-date": "Neplatné datum",
@@ -343,20 +313,18 @@
    "leave-board-pop": "Opravdu chcete opustit tablo __boardTitle__? Odstraníte se tím i ze všech karet v tomto tablu.",
    "leaveBoardPopup-title": "Opustit tablo?",
    "link-card": "Odkázat na tuto kartu",
-    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do archivu.",
-    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v Archivu a jejich opětovné obnovení, klikni v \"Menu\" > \"Archiv\".",
-    "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",
+    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do koše",
+    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v koši a jejich opětovné obnovení, klikni v \"Menu\" > \"Archivované položky\".",
+    "list-move-cards": "Přesunout všechny karty v tomto seznamu",
+    "list-select-cards": "Vybrat všechny karty v tomto seznamu",
    "listActionPopup-title": "Vypsat akce",
    "swimlaneActionPopup-title": "Akce swimlane",
-    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Importovat Trello kartu",
    "listMorePopup-title": "Více",
-    "link-list": "Odkaz na tento sloupec",
-    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné sloupec obnovit. Toto nelze vrátit zpět.",
-    "list-delete-suggest-archive": "Seznam můžete přesunout do archivu, abyste jej odstranili z tabla a zachovali si svou aktivitu.",
-    "lists": "Sloupce",
+    "link-list": "Odkaz na tento seznam",
+    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
+    "list-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
+    "lists": "Seznamy",
    "swimlanes": "Swimlanes",
    "log-out": "Odhlásit",
    "log-in": "Přihlásit",
@@ -375,15 +343,15 @@
    "muted-info": "Nikdy nedostanete oznámení o změně v tomto tablu.",
    "my-boards": "Moje tabla",
    "name": "Jméno",
-    "no-archived-cards": "V archivu nejsou žádné karty.",
-    "no-archived-lists": "V archivu nejsou žádné seznamy.",
-    "no-archived-swimlanes": "V archivu nejsou žádné swimlanes.",
+    "no-archived-cards": "Žádné karty v koši",
+    "no-archived-lists": "Žádné seznamy v koši",
+    "no-archived-swimlanes": "Žádné swimlane v koši",
    "no-results": "Žádné výsledky",
    "normal": "Normální",
    "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
    "not-accepted-yet": "Pozvánka ještě nebyla přijmuta",
    "notify-participate": "Dostane aktualizace do všech karet, ve kterých se účastní jako tvůrce nebo člen",
-    "notify-watch": "Dostane aktualitace to všech tabel, sloupců nebo karet, které sledujete",
+    "notify-watch": "Dostane aktualitace to všech tabel, seznamů nebo karet, které sledujete",
    "optional": "volitelný",
    "or": "nebo",
    "page-maybe-private": "Tato stránka může být soukromá. Můžete ji zobrazit po <a href='%s'>přihlášení</a>.",
@@ -403,7 +371,7 @@
    "remove-cover": "Odstranit obal",
    "remove-from-board": "Odstranit z tabla",
    "remove-label": "Odstranit štítek",
-    "listDeletePopup-title": "Smazat sloupec?",
+    "listDeletePopup-title": "Smazat seznam?",
    "remove-member": "Odebrat uživatele",
    "remove-member-from-card": "Odstranit z karty",
    "remove-member-pop": "Odstranit __name__ (__username__) z __boardTitle__? Uživatel bude odebrán ze všech karet na tomto tablu. Na tuto skutečnost bude upozorněn.",
@@ -417,7 +385,7 @@
    "search-cards": "Hledat nadpisy a popisy karet v tomto tablu",
    "search-example": "Hledaný text",
    "select-color": "Vybrat barvu",
-    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů ve sloupci.",
+    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů v seznamu.",
    "setWipLimitPopup-title": "Nastavit WIP Limit",
    "shortcut-assign-self": "Přiřadit sebe k aktuální kartě",
    "shortcut-autocomplete-emoji": "Automatické dokončování emoji",
@@ -428,13 +396,13 @@
    "shortcut-show-shortcuts": "Otevřít tento seznam odkazů",
    "shortcut-toggle-filterbar": "Přepnout lištu filtrování",
    "shortcut-toggle-sidebar": "Přepnout lištu tabla",
-    "show-cards-minimum-count": "Zobrazit počet karet pokud sloupec obsahuje více než ",
+    "show-cards-minimum-count": "Zobrazit počet karet pokud seznam obsahuje více než ",
    "sidebar-open": "Otevřít boční panel",
    "sidebar-close": "Zavřít boční panel",
    "signupPopup-title": "Vytvořit účet",
-    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno nahoře.",
+    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno navrchu seznamu.",
    "starred-boards": "Tabla s hvězdičkou",
-    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena nahoře.",
+    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena navrchu seznamu.",
    "subscribe": "Odebírat",
    "team": "Tým",
    "this-board": "toto tablo",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar nahrán",
    "username": "Uživatelské jméno",
    "view-it": "Zobrazit",
-    "warn-list-archived": "varování: tato karta je v seznamu v Archivu",
+    "warn-list-archived": "varování: tuto kartu obsahuje seznam v koši",
    "watch": "Sledovat",
    "watching": "Sledující",
    "watching-info": "Bude vám oznámena každá změna v tomto tablu",
@@ -465,13 +433,10 @@
    "welcome-swimlane": "Milník 1",
    "welcome-list1": "Základní",
    "welcome-list2": "Pokročilé",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Co chcete dělat?",
    "wipLimitErrorPopup-title": "Neplatný WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto sloupci je vyšší než definovaný WIP limit.",
-    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento sloupec, nebo nastavte vyšší WIP limit.",
+    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto seznamu je vyšší než definovaný WIP limit.",
+    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento seznam, nebo nastavte vyšší WIP limit.",
    "admin-panel": "Administrátorský panel",
    "settings": "Nastavení",
    "people": "Lidé",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Poslat si zkušební email.",
    "invitation-code": "Kód pozvánky",
    "email-invite-register-subject": "__inviter__ odeslal pozvánku",
-    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval do kanban boardu ke spolupráci.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
-    "email-smtp-test-subject": "E-mail testující SMTP",
+    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval ke spolupráci ve Wekanu.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
+    "email-smtp-test-subject": "SMTP Testovací email z Wekanu",
    "email-smtp-test-text": "Email byl úspěšně odeslán",
    "error-invitation-code-not-exist": "Kód pozvánky neexistuje.",
    "error-notAuthorized": "Nejste autorizován k prohlížení této stránky.",
    "outgoing-webhooks": "Odchozí Webhooky",
    "outgoingWebhooksPopup-title": "Odchozí Webhooky",
-    "boardCardTitlePopup-title": "Filtr názvů karet",
    "new-outgoing-webhook": "Nové odchozí Webhooky",
    "no-name": "(Neznámé)",
+    "Wekan_version": "Wekan verze",
    "Node_version": "Node verze",
    "OS_Arch": "OS Architektura",
    "OS_Cpus": "OS Počet CPU",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Celková paměť",
    "OS_Type": "Typ OS",
    "OS_Uptime": "OS Doba běhu systému",
-    "days": "dní",
    "hours": "hodin",
    "minutes": "minut",
    "seconds": "sekund",
    "show-field-on-card": "Ukázat toto pole na kartě",
-    "automatically-field-on-card": "Automaticky vytvořit pole na všech kartách",
-    "showLabel-field-on-card": "Ukázat štítek pole na minikartě",
    "yes": "Ano",
    "no": "Ne",
    "accounts": "Účty",
@@ -534,147 +496,122 @@
    "card-end-on": "Končí v",
    "editCardReceivedDatePopup-title": "Změnit datum přijetí",
    "editCardEndDatePopup-title": "Změnit datum konce",
-    "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.",
-    "delete-board-confirm-popup": "Všechny sloupce, štítky a aktivity budou smazány a obsah tabla nebude možné obnovit. Toto nelze vrátit zpět.",
+    "board-delete-notice": "Smazání je trvalé. Přijdete o všechny seznamy, karty a akce asociované s tímto tablem.",
+    "delete-board-confirm-popup": "Všechny sezamy, štítky a aktivity budou a obsah tabla nebude možné obnovit. Toto nelze vrátit zpět.",
    "boardDeletePopup-title": "Smazat tablo?",
    "delete-board": "Smazat tablo",
    "default-subtasks-board": "Podúkoly pro tablo __board__",
    "default": "Výchozí",
-    "queue": "Fronta",
+    "queue": "Queue",
    "subtask-settings": "Nastavení podúkolů",
    "boardSubtaskSettingsPopup-title": "Nastavení podúkolů tabla",
    "show-subtasks-field": "Karty mohou mít podúkoly",
    "deposit-subtasks-board": "Deposit subtasks to this board:",
    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
-    "show-parent-in-minicard": "Ukázat předka na minikartě",
-    "prefix-with-full-path": "Prefix s celou cestou",
-    "prefix-with-parent": "Prefix s předkem",
-    "subtext-with-full-path": "Podtext s celou cestou",
-    "subtext-with-parent": "Podtext s předkem",
-    "change-card-parent": "Změnit rodiče karty",
-    "parent-card": "Rodičovská karta",
+    "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": "Change card's parent",
+    "parent-card": "Parent card",
    "source-board": "Zdrojové tablo",
-    "no-parent": "Nezobrazovat rodiče",
+    "no-parent": "Don't show 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": "přidán štítek '%s'",
-    "activity-removed-label-card": "odstraněn štítek '%s'",
-    "activity-delete-attach-card": "odstraněna příloha",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
    "r-rule": "Pravidlo",
-    "r-add-trigger": "Přidat spoštěč",
+    "r-add-trigger": "Add trigger",
    "r-add-action": "Přidat akci",
    "r-board-rules": "Pravidla Tabla",
    "r-add-rule": "Přidat pravidlo",
    "r-view-rule": "Zobrazit pravidlo",
    "r-delete-rule": "Smazat pravidlo",
-    "r-new-rule-name": "Nový název pravidla",
+    "r-new-rule-name": "New rule title",
    "r-no-rules": "Žádná pravidla",
-    "r-when-a-card": "Pokud karta",
-    "r-is": "je",
-    "r-is-moved": "je přesunuto",
-    "r-added-to": "přidáno do",
+    "r-when-a-card-is": "Pokud je karta",
+    "r-added-to": "Přidáno do",
    "r-removed-from": "Odstraněno z",
-    "r-the-board": "tablo",
-    "r-list": "sloupce",
-    "set-filter": "Nastavit filtr",
+    "r-the-board": "the board",
+    "r-list": "seznam",
    "r-moved-to": "Přesunuto do",
    "r-moved-from": "Přesunuto z",
-    "r-archived": "Přesunuto do archivu",
-    "r-unarchived": "Obnoveno z archivu",
-    "r-a-card": "karta",
-    "r-when-a-label-is": "Pokud nějaký štítek je",
-    "r-when-the-label-is": "Pokud tento štítek je",
-    "r-list-name": "název seznamu",
-    "r-when-a-member": "Pokud nějaký člen je",
-    "r-when-the-member": "Pokud tento člen je",
-    "r-name": "jméno",
-    "r-when-a-attach": "Pokud je nějaká příloha",
-    "r-when-a-checklist": "Když zaškrtávací seznam je",
-    "r-when-the-checklist": "Když zaškrtávací seznam",
+    "r-archived": "Přesunuto do koše",
+    "r-unarchived": "Obnoveno z koše",
+    "r-a-card": "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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
    "r-completed": "Dokončeno",
-    "r-made-incomplete": "Vytvořeno nehotové",
-    "r-when-a-item": "Když položka zaškrtávacího seznamu je",
-    "r-when-the-item": "Když položka zaškrtávacího seznamu",
-    "r-checked": "Zaškrtnuto",
-    "r-unchecked": "Odškrtnuto",
-    "r-move-card-to": "Přesunout kartu do",
-    "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",
+    "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": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Přesunout do koše",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "karta",
    "r-add": "Přidat",
    "r-remove": "Odstranit",
-    "r-label": "štítek",
-    "r-member": "člen",
-    "r-remove-all": "Odstranit všechny členy z této karty",
-    "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",
-    "r-items-check": "položky zaškrtávacího seznamu",
-    "r-check": "Označit",
-    "r-uncheck": "Odznačit",
-    "r-item": "Položka",
-    "r-of-checklist": "ze zaškrtávacího seznamu",
-    "r-send-email": "Odeslat e-mail",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "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": "komu",
    "r-subject": "předmět",
-    "r-rule-details": "Podrobnosti pravidla",
-    "r-d-move-to-top-gen": "Přesunout kartu na začátek toho sloupce",
-    "r-d-move-to-top-spec": "Přesunout kartu na začátek sloupce",
-    "r-d-move-to-bottom-gen": "Přesunout kartu na konec sloupce",
-    "r-d-move-to-bottom-spec": "Přesunout kartu na konec sloupce",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Přesunout kartu na začátek seznamu",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Přesunout kartu na konec seznamu",
    "r-d-send-email": "Odeslat email",
    "r-d-send-email-to": "komu",
    "r-d-send-email-subject": "předmět",
    "r-d-send-email-message": "zpráva",
-    "r-d-archive": "Přesunout kartu do archivu",
-    "r-d-unarchive": "Obnovit kartu z archivu",
+    "r-d-archive": "Přesunout kartu do koše",
+    "r-d-unarchive": "Obnovit kartu z koše",
    "r-d-add-label": "Přidat štítek",
    "r-d-remove-label": "Odstranit štítek",
-    "r-create-card": "Vytvořit novou kartu",
-    "r-in-list": "v seznamu",
-    "r-in-swimlane": "ve swimlane",
    "r-d-add-member": "Přidat člena",
    "r-d-remove-member": "Odstranit člena",
-    "r-d-remove-all-member": "Odstranit všechny členy",
-    "r-d-check-all": "Označit všechny položky na seznamu",
-    "r-d-uncheck-all": "Odznačit všechny položky na seznamu",
-    "r-d-check-one": "Označit položku",
-    "r-d-uncheck-one": "Odznačit položku",
-    "r-d-check-of-list": "ze zaškrtávacího seznamu",
-    "r-d-add-checklist": "Přidat zaškrtávací seznam",
-    "r-d-remove-checklist": "Odstranit zaškrtávací seznam",
-    "r-by": "by",
-    "r-add-checklist": "Přidat zaškrtávací seznam",
-    "r-with-items": "s položkami",
-    "r-items-list": "položka1,položka2,položka3",
-    "r-add-swimlane": "Přidat swimlane",
-    "r-swimlane-name": "Název swimlane",
-    "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": "Když je karta přesunuta do jiného sloupce",
+    "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": "Přidat checklist",
+    "r-d-remove-checklist": "Odstranit checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
    "cas": "CAS",
-    "authentication-method": "Metoda autentizace",
-    "authentication-type": "Typ autentizace",
-    "custom-product-name": "Vlastní název produktu",
-    "layout": "Uspořádání",
-    "hide-logo": "Skrýt logo",
-    "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",
-    "display-authentication-method": "Zobraz způsob ověřování",
-    "default-authentication-method": "Zobraz způsob ověřování"
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout"
 }
@@ -1,680 +0,0 @@
-{
-    "accept": "Accepter",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
-    "act-withCardTitle": "[__board__] __card__",
-    "actions": "Actions",
-    "activities": "Activities",
-    "activity": "Activity",
-    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
-    "activity-attached": "attached %s to %s",
-    "activity-created": "created %s",
-    "activity-customfield-created": "created custom field %s",
-    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "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",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
-    "add-attachment": "Add Attachment",
-    "add-board": "Add Board",
-    "add-card": "Add Card",
-    "add-swimlane": "Add Swimlane",
-    "add-subtask": "Add Subtask",
-    "add-checklist": "Add Checklist",
-    "add-checklist-item": "Add an item to checklist",
-    "add-cover": "Add Cover",
-    "add-label": "Add Label",
-    "add-list": "Add List",
-    "add-members": "Add Members",
-    "added": "Added",
-    "addMemberPopup-title": "Members",
-    "admin": "Admin",
-    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
-    "admin-announcement": "Announcement",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
-    "all-boards": "All boards",
-    "and-n-other-card": "And __count__ other card",
-    "and-n-other-card_plural": "And __count__ other cards",
-    "apply": "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": "Archive",
-    "archived-boards": "Boards in Archive",
-    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
-    "assign-member": "Assign member",
-    "attached": "attached",
-    "attachment": "Attachment",
-    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
-    "attachmentDeletePopup-title": "Delete Attachment?",
-    "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",
-    "board-nb-stars": "%s stars",
-    "board-not-found": "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": "Rename Board",
-    "boardChangeVisibilityPopup-title": "Change Visibility",
-    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
-    "boards": "Boards",
-    "board-view": "Board View",
-    "board-view-cal": "Calendar",
-    "board-view-swimlanes": "Swimlanes",
-    "board-view-lists": "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-comments-title": "This card has %s comment.",
-    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
-    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
-    "card-due": "Due",
-    "card-due-on": "Due on",
-    "card-spent": "Spent Time",
-    "card-edit-attachments": "Edit attachments",
-    "card-edit-custom-fields": "Edit custom fields",
-    "card-edit-labels": "Edit labels",
-    "card-edit-members": "Edit members",
-    "card-labels-title": "Change the labels for the card.",
-    "card-members-title": "Add or remove members of the board from the card.",
-    "card-start": "Start",
-    "card-start-on": "Starts on",
-    "cardAttachmentsPopup-title": "Attach From",
-    "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
-    "cardDeletePopup-title": "Delete Card?",
-    "cardDetailsActionsPopup-title": "Card Actions",
-    "cardLabelsPopup-title": "Labels",
-    "cardMembersPopup-title": "Members",
-    "cardMorePopup-title": "More",
-    "cardTemplatePopup-title": "Create template",
-    "cards": "Cards",
-    "cards-count": "Cards",
-    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Card",
-    "cardType-linkedCard": "Linked Card",
-    "cardType-linkedBoard": "Linked Board",
-    "change": "Change",
-    "change-avatar": "Change Avatar",
-    "change-password": "Change Password",
-    "change-permissions": "Change permissions",
-    "change-settings": "Change Settings",
-    "changeAvatarPopup-title": "Change Avatar",
-    "changeLanguagePopup-title": "Change Language",
-    "changePasswordPopup-title": "Change Password",
-    "changePermissionsPopup-title": "Change Permissions",
-    "changeSettingsPopup-title": "Change Settings",
-    "subtasks": "Subtasks",
-    "checklists": "Checklists",
-    "click-to-star": "Click to star this board.",
-    "click-to-unstar": "Click to unstar this board.",
-    "clipboard": "Clipboard or drag & drop",
-    "close": "Close",
-    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
-    "color-black": "black",
-    "color-blue": "blue",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
-    "color-green": "green",
-    "color-indigo": "indigo",
-    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
-    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
-    "color-pink": "pink",
-    "color-plum": "plum",
-    "color-purple": "purple",
-    "color-red": "red",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
-    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
-    "color-yellow": "yellow",
-    "unset-color": "Unset",
-    "comment": "Comment",
-    "comment-placeholder": "Write Comment",
-    "comment-only": "Comment only",
-    "comment-only-desc": "Can comment on cards only.",
-    "no-comments": "No comments",
-    "no-comments-desc": "Can not see comments and activities.",
-    "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",
-    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
-    "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\"} ]",
-    "create": "Create",
-    "createBoardPopup-title": "Create Board",
-    "chooseBoardSourcePopup-title": "Import board",
-    "createLabelPopup-title": "Create Label",
-    "createCustomField": "Create Field",
-    "createCustomFieldPopup-title": "Create Field",
-    "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-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",
-    "date": "Date",
-    "decline": "Decline",
-    "default-avatar": "Default avatar",
-    "delete": "Delete",
-    "deleteCustomFieldPopup-title": "Delete Custom Field?",
-    "deleteLabelPopup-title": "Delete Label?",
-    "description": "Description",
-    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
-    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
-    "discard": "Discard",
-    "done": "Done",
-    "download": "Download",
-    "edit": "Edit",
-    "edit-avatar": "Change Avatar",
-    "edit-profile": "Edit Profile",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
-    "editCardStartDatePopup-title": "Change start date",
-    "editCardDueDatePopup-title": "Change due date",
-    "editCustomFieldPopup-title": "Edit Field",
-    "editCardSpentTimePopup-title": "Change spent time",
-    "editLabelPopup-title": "Change Label",
-    "editNotificationPopup-title": "Edit Notification",
-    "editProfilePopup-title": "Edit Profile",
-    "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",
-    "email-fail-text": "Error trying to send email",
-    "email-invalid": "Invalid email",
-    "email-invite": "Invite via Email",
-    "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 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": "Enable WIP Limit",
-    "error-board-doesNotExist": "This board does not exist",
-    "error-board-notAdmin": "You need to be admin of this board to do that",
-    "error-board-notAMember": "You need to be a member of this board to do that",
-    "error-json-malformed": "Your text is not valid JSON",
-    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-    "error-list-doesNotExist": "This list does not exist",
-    "error-user-doesNotExist": "This user does not exist",
-    "error-user-notAllowSelf": "You can not invite yourself",
-    "error-user-notCreated": "This user is not created",
-    "error-username-taken": "This username is already taken",
-    "error-email-taken": "Email has already been taken",
-    "export-board": "Export board",
-    "filter": "Filter",
-    "filter-cards": "Filter Cards",
-    "filter-clear": "Clear filter",
-    "filter-no-label": "No label",
-    "filter-no-member": "No member",
-    "filter-no-custom-fields": "No Custom Fields",
-    "filter-on": "Filter is on",
-    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
-    "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",
-    "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",
-    "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-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": "Paste your valid JSON data here",
-    "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": "Version",
-    "initials": "Initials",
-    "invalid-date": "Invalid date",
-    "invalid-time": "Invalid time",
-    "invalid-user": "Invalid user",
-    "joined": "joined",
-    "just-invited": "You are just invited to this board",
-    "keyboard-shortcuts": "Keyboard shortcuts",
-    "label-create": "Create Label",
-    "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",
-    "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": "Link to this 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-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",
-    "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.",
-    "lists": "Lists",
-    "swimlanes": "Swimlanes",
-    "log-out": "Log Out",
-    "log-in": "Log In",
-    "loginPopup-title": "Log In",
-    "memberMenuPopup-title": "Member Settings",
-    "members": "Members",
-    "menu": "Menu",
-    "move-selection": "Move selection",
-    "moveCardPopup-title": "Move Card",
-    "moveCardToBottom-title": "Move to Bottom",
-    "moveCardToTop-title": "Move to Top",
-    "moveSelectionPopup-title": "Move selection",
-    "multi-selection": "Multi-Selection",
-    "multi-selection-on": "Multi-Selection is on",
-    "muted": "Muted",
-    "muted-info": "You will never be notified of any changes in this board",
-    "my-boards": "My Boards",
-    "name": "Name",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
-    "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": "Receive updates to any cards you participate as creater or member",
-    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
-    "optional": "optional",
-    "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",
-    "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": "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": "Delete List ?",
-    "remove-member": "Remove Member",
-    "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-board": "Rename Board",
-    "restore": "Restore",
-    "save": "Save",
-    "search": "Search",
-    "rules": "Rules",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
-    "select-color": "Select Color",
-    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
-    "setWipLimitPopup-title": "Set WIP Limit",
-    "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emoji": "Autocomplete emoji",
-    "shortcut-autocomplete-members": "Autocomplete members",
-    "shortcut-clear-filters": "Clear all filters",
-    "shortcut-close-dialog": "Close Dialog",
-    "shortcut-filter-my-cards": "Filter my cards",
-    "shortcut-show-shortcuts": "Bring up this shortcuts list",
-    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
-    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
-    "show-cards-minimum-count": "Show cards count if list contains more than",
-    "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",
-    "starred-boards-description": "Starred boards show up at the top of your boards list.",
-    "subscribe": "Subscribe",
-    "team": "Team",
-    "this-board": "this board",
-    "this-card": "this card",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spent time cards",
-    "time": "Time",
-    "title": "Title",
-    "tracking": "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": "Unwatch",
-    "upload": "Upload",
-    "upload-avatar": "Upload an avatar",
-    "uploaded-avatar": "Uploaded an avatar",
-    "username": "Username",
-    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
-    "watch": "Watch",
-    "watching": "Watching",
-    "watching-info": "You will be notified of any change in this board",
-    "welcome-board": "Welcome Board",
-    "welcome-swimlane": "Milestone 1",
-    "welcome-list1": "Basics",
-    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
-    "what-to-do": "What do you want to do?",
-    "wipLimitErrorPopup-title": "Invalid WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
-    "admin-panel": "Admin Panel",
-    "settings": "Settings",
-    "people": "People",
-    "registration": "Registration",
-    "disable-self-registration": "Disable Self-Registration",
-    "invite": "Invite",
-    "invite-people": "Invite People",
-    "to-boards": "To board(s)",
-    "email-addresses": "Email Addresses",
-    "smtp-host-description": "The address of the SMTP server that handles your emails.",
-    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
-    "smtp-tls-description": "Enable TLS support for SMTP server",
-    "smtp-host": "SMTP Host",
-    "smtp-port": "SMTP Port",
-    "smtp-username": "Username",
-    "smtp-password": "Password",
-    "smtp-tls": "TLS support",
-    "send-from": "From",
-    "send-smtp-test": "Send a test email to yourself",
-    "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": "You have successfully sent an email",
-    "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 version",
-    "OS_Arch": "OS Arch",
-    "OS_Cpus": "OS CPU Count",
-    "OS_Freemem": "OS Free Memory",
-    "OS_Loadavg": "OS Load Average",
-    "OS_Platform": "OS Platform",
-    "OS_Release": "OS Release",
-    "OS_Totalmem": "OS Total Memory",
-    "OS_Type": "OS Type",
-    "OS_Uptime": "OS Uptime",
-    "days": "days",
-    "hours": "hours",
-    "minutes": "minutes",
-    "seconds": "seconds",
-    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
-    "yes": "Yes",
-    "no": "No",
-    "accounts": "Accounts",
-    "accounts-allowEmailChange": "Allow Email Change",
-    "accounts-allowUserNameChange": "Allow Username Change",
-    "createdAt": "Created at",
-    "verified": "Verified",
-    "active": "Active",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date",
-    "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.",
-    "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",
-    "default-subtasks-board": "Subtasks for __board__ board",
-    "default": "Default",
-    "queue": "Queue",
-    "subtask-settings": "Subtasks Settings",
-    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
-    "show-subtasks-field": "Cards can have subtasks",
-    "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": "Change card's parent",
-    "parent-card": "Parent card",
-    "source-board": "Source board",
-    "no-parent": "Don't show 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",
-    "r-rule": "Rule",
-    "r-add-trigger": "Add trigger",
-    "r-add-action": "Add action",
-    "r-board-rules": "Board rules",
-    "r-add-rule": "Add rule",
-    "r-view-rule": "View rule",
-    "r-delete-rule": "Delete rule",
-    "r-new-rule-name": "New rule title",
-    "r-no-rules": "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",
-    "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-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-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": "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-add": "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": "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": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
-    "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": "Add checklist",
-    "r-d-remove-checklist": "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-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"
-}
@@ -1,44 +1,35 @@
 {
    "accept": "Akzeptieren",
-    "act-activity-notify": "Aktivitätsbenachrichtigung",
-    "act-addAttachment": "hat Anhang __attachment__  zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ angehängt",
-    "act-deleteAttachment": "löschte Anhang __attachment__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-addSubtask": "hat Teilaufgabe __subtask__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board angehängt",
-    "act-addLabel": "hat Label __label__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ angehängt",
-    "act-removeLabel": "entfernte Label __label__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-addChecklist": "hat Checkliste __checklist__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ angehängt",
-    "act-addChecklistItem": "hat Checklistenposition  __checklistItem__ zu Checkliste __checkList__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ angehängt",
-    "act-removeChecklist": "entfernt Checkliste __checklist__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-removeChecklistItem": "entfernt Checklistenposition __checklistItem__ von Checkliste __checkList__ zur Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-checkedItem": "hakte __checklistItem__  von der Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ ab",
-    "act-uncheckedItem": "unabgehakt __checklistItem__ von der Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-completeChecklist": "vervollständigte Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-uncompleteChecklist": "unvollendete Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-addComment": "kommentierte eine Karte  __card__: __comment__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-createBoard": "hat Board __board__ erstellt",
-    "act-createCard": "erstellte Karte __card__ auf Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-createCustomField": "erstellte ein benutzerdefiniertes Feld __customField__ für Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-createList": "hat Liste __list__ zu Board __board__ hinzugefügt",
-    "act-addBoardMember": "hat Mitglied __member__ zu Board __board__ hinzugefügt",
-    "act-archivedBoard": "Board __board__ ins Archiv verschoben",
-    "act-archivedCard": "Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ von Board __board__ ins Archiv verschoben",
-    "act-archivedList": "Liste __list__ bei Swimlane __swimlane__ von Board __board__ ins Archiv verschoben",
-    "act-archivedSwimlane": "Swimlane __swimlane__ von Board __board__ ins Archiv verschoben",
-    "act-importBoard": "importiert Board __board__",
-    "act-importCard": "importiert Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ in Board __board__ ",
-    "act-importList": "importiert Liste __list__ bei Swimlane __swimlane__ in Board __board__ ",
-    "act-joinMember": "fügt Mitglied __member__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ hinzu",
-    "act-moveCard": "verschiebe Karte __card__ von Liste __oldList__ von Swimlane  __oldSwimlane__ von Board __oldBoard__ nach Liste __list__ in Swimlane __swimlane__ zu Board __board__",
-    "act-removeBoardMember": "entfernte Mitglied __member__ vom Board __board__",
-    "act-restoredCard": "wiederherstellte Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-unjoinMember": "entfernte Mitglied __member__ von Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Aktivitätsbenachrichtigung",
+    "act-addAttachment": "hat __attachment__ an __card__ angehängt",
+    "act-addSubtask": "hat die Teilaufgabe __checklist__ zu __card__ hinzugefügt",
+    "act-addChecklist": "hat die Checkliste __checklist__ zu __card__ hinzugefügt",
+    "act-addChecklistItem": "hat __checklistItem__ zur Checkliste __checklist__ in __card__ hinzugefügt",
+    "act-addComment": "hat __card__ kommentiert: __comment__",
+    "act-createBoard": "hat __board__ erstellt",
+    "act-createCard": "hat __card__ zu __list__ hinzugefügt",
+    "act-createCustomField": "benutzerdefiniertes Feld __customField__ angelegt",
+    "act-createList": "hat __list__ zu __board__ hinzugefügt",
+    "act-addBoardMember": "hat __member__ zu __board__ hinzugefügt",
+    "act-archivedBoard": "__board__ in den Papierkorb verschoben",
+    "act-archivedCard": "__card__ in den Papierkorb verschoben",
+    "act-archivedList": "__list__ in den Papierkorb verschoben",
+    "act-archivedSwimlane": "__swimlane__ in den Papierkorb verschoben",
+    "act-importBoard": "hat __board__ importiert",
+    "act-importCard": "hat __card__ importiert",
+    "act-importList": "hat __list__ importiert",
+    "act-joinMember": "hat __member__ zu __card__ hinzugefügt",
+    "act-moveCard": "hat __card__ von __oldList__ nach __list__ verschoben",
+    "act-removeBoardMember": "hat __member__ von __board__ entfernt",
+    "act-restoredCard": "hat __card__ in __board__ wiederhergestellt",
+    "act-unjoinMember": "hat __member__ von __card__ entfernt",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Aktionen",
    "activities": "Aktivitäten",
    "activity": "Aktivität",
    "activity-added": "hat %s zu %s hinzugefügt",
-    "activity-archived": "hat %s ins Archiv verschoben",
+    "activity-archived": "hat %s in den Papierkorb verschoben",
    "activity-attached": "hat %s an %s angehängt",
    "activity-created": "hat %s erstellt",
    "activity-customfield-created": "hat das benutzerdefinierte Feld %s erstellt",
@@ -52,18 +43,18 @@
    "activity-sent": "hat %s an %s gesendet",
    "activity-unjoined": "hat %s verlassen",
    "activity-subtask-added": "Teilaufgabe zu %s hinzugefügt",
-    "activity-checked-item": "markierte %s in Checkliste %s von %s",
-    "activity-unchecked-item": "hat %s in Checkliste %s von %s abgewählt",
+    "activity-checked-item": "markierte %s in Checkliste %svon %s",
+    "activity-unchecked-item": "demarkierte %s in Checkliste %s von %s",
    "activity-checklist-added": "hat eine Checkliste zu %s hinzugefügt",
    "activity-checklist-removed": "entfernte eine Checkliste von %s",
-    "activity-checklist-completed": "vervollständigte Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
+    "activity-checklist-completed": "vervollständigte die Checkliste %s von %s",
    "activity-checklist-uncompleted": "unvervollständigte die Checkliste %s von %s",
-    "activity-checklist-item-added": "hat ein Checklistenelement zu '%s' in %s hinzugefügt",
-    "activity-checklist-item-removed": "hat ein Checklistenelement von '%s' in %s entfernt",
+    "activity-checklist-item-added": "hat eine Checklistenposition zu '%s' in %s hinzugefügt",
+    "activity-checklist-item-removed": "entfernte eine Checklistenposition von '%s' in %s",
    "add": "Hinzufügen",
    "activity-checked-item-card": "markiere %s in Checkliste %s",
-    "activity-unchecked-item-card": "hat %s in Checkliste %s abgewählt",
-    "activity-checklist-completed-card": "vervollständigte Checkliste __checklist__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
+    "activity-unchecked-item-card": "demarkiere %s in Checkliste %s",
+    "activity-checklist-completed-card": "vervollständigte die Checkliste %s",
    "activity-checklist-uncompleted-card": "unvervollständigte die Checkliste %s",
    "add-attachment": "Datei anhängen",
    "add-board": "neues Board",
@@ -71,7 +62,7 @@
    "add-swimlane": "Swimlane hinzufügen",
    "add-subtask": "Teilaufgabe hinzufügen",
    "add-checklist": "Checkliste hinzufügen",
-    "add-checklist-item": "Element zu Checkliste hinzufügen",
+    "add-checklist-item": "Position zu einer Checkliste hinzufügen",
    "add-cover": "Cover hinzufügen",
    "add-label": "Label hinzufügen",
    "add-list": "Liste hinzufügen",
@@ -87,22 +78,20 @@
    "and-n-other-card": "und eine andere Karte",
    "and-n-other-card_plural": "und __count__ andere Karten",
    "apply": "Übernehmen",
-    "app-is-offline": "Laden, bitte warten. Das Aktualisieren der Seite führt zu Datenverlust. Wenn das Laden nicht funktioniert, überprüfen Sie bitte, ob der Server nicht angehalten wurde.",
-    "archive": "Ins Archiv verschieben",
-    "archive-all": "Alles ins Archiv verschieben",
-    "archive-board": "Board ins Archiv verschieben",
-    "archive-card": "Karte ins Archiv verschieben",
-    "archive-list": "Liste ins Archiv verschieben",
-    "archive-swimlane": "Swimlane ins Archiv verschieben",
-    "archive-selection": "Auswahl ins Archiv verschieben",
-    "archiveBoardPopup-title": "Board ins Archiv verschieben?",
-    "archived-items": "Archiv",
-    "archived-boards": "Boards im Archiv",
+    "app-is-offline": "Wekan lädt gerade, bitte warten Sie. Wenn Sie die Seite neu laden, gehen nicht übertragene Änderungen verloren. Sollte Wekan nicht geladen werden, überprüfen Sie bitte, ob der Server noch läuft.",
+    "archive": "In den Papierkorb verschieben",
+    "archive-all": "Alles in den Papierkorb verschieben",
+    "archive-board": "Board in den Papierkorb verschieben",
+    "archive-card": "Karte in den Papierkorb verschieben",
+    "archive-list": "Liste in den Papierkorb verschieben",
+    "archive-swimlane": "Swimlane in den Papierkorb verschieben",
+    "archive-selection": "Auswahl in den Papierkorb verschieben",
+    "archiveBoardPopup-title": "Board in den Papierkorb verschieben?",
+    "archived-items": "Papierkorb",
+    "archived-boards": "Boards im Papierkorb",
    "restore-board": "Board wiederherstellen",
-    "no-archived-boards": "Keine Boards im Archiv.",
-    "archives": "Archiv",
-    "template": "Vorlage",
-    "templates": "Vorlagen",
+    "no-archived-boards": "Keine Boards im Papierkorb.",
+    "archives": "Papierkorb",
    "assign-member": "Mitglied zuweisen",
    "attached": "angehängt",
    "attachment": "Anhang",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Board umbenennen",
    "boardChangeVisibilityPopup-title": "Sichtbarkeit ändern",
    "boardChangeWatchPopup-title": "Beobachtung ändern",
-    "boardMenuPopup-title": "Boardeinstellungen",
+    "boardMenuPopup-title": "Boardmenü",
    "boards": "Boards",
    "board-view": "Boardansicht",
    "board-view-cal": "Kalender",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listen",
    "bucket-example": "z.B. \"Löffelliste\"",
    "cancel": "Abbrechen",
-    "card-archived": "Diese Karte wurde ins Archiv verschoben",
-    "board-archived": "Dieses Board wurde ins Archiv verschoben.",
+    "card-archived": "Diese Karte wurde in den Papierkorb verschoben",
+    "board-archived": "Dieses Board wurde in den Papierkorb verschoben.",
    "card-comments-title": "Diese Karte hat %s Kommentar(e).",
    "card-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Alle Aktionen, die dieser Karte zugeordnet sind, werden ebenfalls gelöscht.",
    "card-delete-pop": "Alle Aktionen werden aus dem Aktivitätsfeed entfernt und die Karte kann nicht wiedereröffnet werden. Die Aktion kann nicht rückgängig gemacht werden.",
-    "card-delete-suggest-archive": "Sie können eine Karte ins Archiv verschieben, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
+    "card-delete-suggest-archive": "Sie können eine Karte in den Papierkorb verschieben, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
    "card-due": "Fällig",
    "card-due-on": "Fällig am",
    "card-spent": "Aufgewendete Zeit",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Mitglieder",
    "cardMorePopup-title": "Mehr",
-    "cardTemplatePopup-title": "Vorlage erstellen",
    "cards": "Karten",
    "cards-count": "Karten",
    "casSignIn": "Mit CAS anmelden",
@@ -178,33 +166,17 @@
    "clipboard": "Zwischenablage oder Drag & Drop",
    "close": "Schließen",
    "close-board": "Board schließen",
-    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Archiv\" in der Kopfzeile der Startseite anklicken.",
+    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Papierkorb\" in der Kopfzeile der Startseite anklicken.",
    "color-black": "schwarz",
    "color-blue": "blau",
-    "color-crimson": "Karminrot",
-    "color-darkgreen": "Dunkelgrün",
-    "color-gold": "Gold",
-    "color-gray": "Grau",
    "color-green": "grün",
-    "color-indigo": "Indigo",
    "color-lime": "hellgrün",
-    "color-magenta": "Magentarot",
-    "color-mistyrose": "Altrosa",
-    "color-navy": "Marineblau",
    "color-orange": "orange",
-    "color-paleturquoise": "Blasses Türkis",
-    "color-peachpuff": "Pfirsich",
    "color-pink": "pink",
-    "color-plum": "Pflaume",
    "color-purple": "lila",
    "color-red": "rot",
-    "color-saddlebrown": "Sattelbraun",
-    "color-silver": "Silber",
    "color-sky": "himmelblau",
-    "color-slateblue": "Schieferblau",
-    "color-white": "Weiß",
    "color-yellow": "gelb",
-    "unset-color": "Nicht festgelegt",
    "comment": "Kommentar",
    "comment-placeholder": "Kommentar schreiben",
    "comment-only": "Nur Kommentare",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Wollen Sie die Checkliste wirklich löschen?",
    "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage",
    "linkCardPopup-title": "Karte verknüpfen",
-    "searchElementPopup-title": "Suche",
+    "searchCardPopup-title": "Karte suchen",
    "copyCardPopup-title": "Karte kopieren",
    "copyChecklistToManyCardsPopup-title": "Checklistenvorlage in mehrere Karten kopieren",
    "copyChecklistToManyCardsPopup-instructions": "Titel und Beschreibungen der Zielkarten im folgenden JSON-Format",
@@ -311,20 +283,18 @@
    "import-board": "Board importieren",
    "import-board-c": "Board importieren",
    "import-board-title-trello": "Board von Trello importieren",
-    "import-board-title-wekan": "Board aus vorherigem Export importieren",
-    "import-sandstorm-backup-warning": "Löschen Sie keine Daten, die Sie aus einem ursprünglich exportierten oder Trelloboard importieren, bevor Sie geprüft haben, ob alles funktioniert. Andernfalls kann es zu Datenverlust kommen, falls es zu einem \"Board nicht gefunden\"-Fehler kommt.",
+    "import-board-title-wekan": "Board von Wekan importieren",
    "import-sandstorm-warning": "Das importierte Board wird alle bereits existierenden Daten löschen und mit den importierten Daten überschreiben.",
    "from-trello": "Von Trello",
-    "from-wekan": "Aus vorherigem Export",
+    "from-wekan": "Von Wekan",
    "import-board-instruction-trello": "Gehen Sie in ihrem Trello-Board auf 'Menü', dann 'Mehr', 'Drucken und Exportieren', 'JSON-Export' und kopieren Sie den dort angezeigten Text",
-    "import-board-instruction-wekan": "Gehen Sie in Ihrem Board auf 'Menü', danach auf 'Board exportieren' und kopieren Sie den Text aus der heruntergeladenen Datei.",
-    "import-board-instruction-about-errors": "Treten beim importieren eines Board Fehler auf, so kann der Import dennoch erfolgreich abgeschlossen sein und das Board ist auf der Seite \"Alle Boards\" zusehen.",
+    "import-board-instruction-wekan": "Gehen Sie in Ihrem Wekan board auf 'Menü', und dann auf 'Board exportieren'. Kopieren Sie anschließend den Text aus der heruntergeladenen Datei.",
    "import-json-placeholder": "Fügen Sie die korrekten JSON-Daten hier ein",
    "import-map-members": "Mitglieder zuordnen",
-    "import-members-map": "Das importierte Board hat einige Mitglieder. Bitte ordnen sie die Mitglieder, die Sie importieren wollen, Ihren Benutzern zu.",
+    "import-members-map": "Das importierte Board hat Mitglieder. Bitte ordnen Sie jene, die importiert werden sollen, vorhandenen Wekan-Nutzern zu",
    "import-show-user-mapping": "Mitgliederzuordnung überprüfen",
-    "import-user-select": "Wählen Sie den bestehenden Benutzer aus, den Sie für dieses Mitglied verwenden wollen.",
-    "importMapMembersAddPopup-title": "Mitglied auswählen",
+    "import-user-select": "Wählen Sie den Wekan-Nutzer aus, der dieses Mitglied sein soll",
+    "importMapMembersAddPopup-title": "Wekan-Nutzer auswählen",
    "info": "Version",
    "initials": "Initialen",
    "invalid-date": "Ungültiges Datum",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Sind Sie sicher, dass Sie __boardTitle__ verlassen möchten? Sie werden von allen Karten in diesem Board entfernt.",
    "leaveBoardPopup-title": "Board verlassen?",
    "link-card": "Link zu dieser Karte",
-    "list-archive-cards": "Alle Karten dieser Liste ins Archiv verschieben",
-    "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-archive-cards": "Alle Karten dieser Liste in den Papierkorb verschieben",
+    "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Papierkorb\".",
    "list-move-cards": "Alle Karten in dieser Liste verschieben",
    "list-select-cards": "Alle Karten in dieser Liste auswählen",
-    "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",
    "list-delete-pop": "Alle Aktionen werden aus dem Verlauf gelöscht und die Liste kann nicht wiederhergestellt werden.",
-    "list-delete-suggest-archive": "Listen können ins Archiv verschoben werden, um sie aus dem Board zu entfernen und die Aktivitäten zu behalten.",
+    "list-delete-suggest-archive": "Listen können in den Papierkorb verschoben werden, um sie aus dem Board zu entfernen und die Aktivitäten zu behalten.",
    "lists": "Listen",
    "swimlanes": "Swimlanes",
    "log-out": "Ausloggen",
@@ -375,9 +343,9 @@
    "muted-info": "Sie werden nicht über Änderungen auf diesem Board benachrichtigt",
    "my-boards": "Meine Boards",
    "name": "Name",
-    "no-archived-cards": "Keine Karten im Archiv.",
-    "no-archived-lists": "Keine Listen im Archiv.",
-    "no-archived-swimlanes": "Keine Swimlanes im Archiv.",
+    "no-archived-cards": "Keine Karten im Papierkorb.",
+    "no-archived-lists": "Keine Listen im Papierkorb.",
+    "no-archived-swimlanes": "Keine Swimlanes im Papierkorb.",
    "no-results": "Keine Ergebnisse",
    "normal": "Normal",
    "normal-desc": "Kann Karten anzeigen und bearbeiten, aber keine Einstellungen ändern.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Profilbild hochgeladen",
    "username": "Benutzername",
    "view-it": "Ansehen",
-    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer Liste im Archiv",
+    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer Liste im Papierkorb!",
    "watch": "Beobachten",
    "watching": "Beobachten",
    "watching-info": "Sie werden über alle Änderungen in diesem Board benachrichtigt",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Meilenstein 1",
    "welcome-list1": "Grundlagen",
    "welcome-list2": "Fortgeschritten",
-    "card-templates-swimlane": "Kartenvorlagen",
-    "list-templates-swimlane": "Listenvorlagen",
-    "board-templates-swimlane": "Boardvorlagen",
    "what-to-do": "Was wollen Sie tun?",
    "wipLimitErrorPopup-title": "Ungültiges WIP-Limit",
    "wipLimitErrorPopup-dialog-pt1": "Die Anzahl von Aufgaben in dieser Liste ist größer als das von Ihnen definierte WIP-Limit.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Test-E-Mail an sich selbst schicken",
    "invitation-code": "Einladungscode",
    "email-invite-register-subject": "__inviter__ hat Ihnen eine Einladung geschickt",
-    "email-invite-register-text": "Sehr geehrte(r) __user__,\n\n__inviter__ hat Sie zur Mitarbeit an einem Kanbanboard eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n__url__\n\nIhr Einladungscode lautet: __icode__\n\nDanke.",
-    "email-smtp-test-subject": "SMTP Test-E-Mail",
+    "email-invite-register-text": "Hallo __user__,\n\n__inviter__ hat Sie für Ihre Zusammenarbeit zu Wekan eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n__url__\n\nIhr Einladungscode lautet: __icode__\n\nDanke.",
+    "email-smtp-test-subject": "SMTP-Test-E-Mail von Wekan",
    "email-smtp-test-text": "Sie haben erfolgreich eine E-Mail versandt",
    "error-invitation-code-not-exist": "Ungültiger Einladungscode",
    "error-notAuthorized": "Sie sind nicht berechtigt diese Seite zu sehen.",
    "outgoing-webhooks": "Ausgehende Webhooks",
    "outgoingWebhooksPopup-title": "Ausgehende Webhooks",
-    "boardCardTitlePopup-title": "Kartentitelfilter",
    "new-outgoing-webhook": "Neuer ausgehender Webhook",
    "no-name": "(Unbekannt)",
+    "Wekan_version": "Wekan-Version",
    "Node_version": "Node-Version",
    "OS_Arch": "Betriebssystem-Architektur",
    "OS_Cpus": "Anzahl Prozessoren",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Gesamter Arbeitsspeicher",
    "OS_Type": "Typ des Betriebssystems",
    "OS_Uptime": "Laufzeit des Systems",
-    "days": "Tage",
    "hours": "Stunden",
    "minutes": "Minuten",
    "seconds": "Sekunden",
    "show-field-on-card": "Zeige dieses Feld auf der Karte",
-    "automatically-field-on-card": "Automatisch Label für alle Karten erzeugen",
-    "showLabel-field-on-card": "Feldbezeichnung auf Minikarte anzeigen",
    "yes": "Ja",
    "no": "Nein",
    "accounts": "Konten",
@@ -534,10 +496,6 @@
    "card-end-on": "Endet am",
    "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
    "editCardEndDatePopup-title": "Enddatum ändern",
-    "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.",
@@ -576,53 +534,50 @@
    "r-delete-rule": "Regel löschen",
    "r-new-rule-name": "Neuer Regeltitel",
    "r-no-rules": "Keine Regeln",
-    "r-when-a-card": "Wenn eine Karte",
-    "r-is": "ist",
-    "r-is-moved": "verschoben wird",
-    "r-added-to": "hinzugefügt wird zu",
+    "r-when-a-card-is": "Wenn eine Karte ist",
+    "r-added-to": "Hinzugefügt zu",
    "r-removed-from": "Entfernt von",
    "r-the-board": "das Board",
    "r-list": "Liste",
-    "set-filter": "Setze Filter",
    "r-moved-to": "Verschieben nach",
    "r-moved-from": "Verschieben von",
-    "r-archived": "Ins Archiv verschieben",
-    "r-unarchived": "Aus dem Archiv wiederhergestellt",
+    "r-archived": "In den Papierkorb verschieben",
+    "r-unarchived": "Aus dem Papierkorb wiederhergestellt",
    "r-a-card": "eine Karte",
    "r-when-a-label-is": "Wenn ein Label ist",
    "r-when-the-label-is": " Wenn das Label ist",
-    "r-list-name": "Listenname",
+    "r-list-name": "Listennamen",
    "r-when-a-member": "Wenn ein Mitglied ist",
    "r-when-the-member": "Wenn das Mitglied",
    "r-name": "Name",
+    "r-is": "ist",
    "r-when-a-attach": "Wenn ein Anhang",
    "r-when-a-checklist": "Wenn eine Checkliste ist",
    "r-when-the-checklist": "Wenn die Checkliste",
    "r-completed": "Abgeschlossen",
    "r-made-incomplete": "Unvollständig gemacht",
-    "r-when-a-item": "Wenn ein Checklistenelement ist",
-    "r-when-the-item": "Wenn das Checklistenelement",
+    "r-when-a-item": "Wenn eine Checklistenposition ist",
+    "r-when-the-item": "Wenn die Checklistenposition",
    "r-checked": "Markiert",
-    "r-unchecked": "Abgewählt",
+    "r-unchecked": "Demarkiert",
    "r-move-card-to": "Verschiebe Karte nach",
    "r-top-of": "Anfang von",
    "r-bottom-of": "Ende von",
    "r-its-list": "seine Liste",
-    "r-archive": "Ins Archiv verschieben",
-    "r-unarchive": "Aus dem Archiv wiederherstellen",
+    "r-archive": "In den Papierkorb verschieben",
+    "r-unarchive": "Wiederherstellen aus dem Papierkorb",
    "r-card": "Karte",
    "r-add": "Hinzufügen",
    "r-remove": "entfernen",
    "r-label": "Label",
    "r-member": "Mitglied",
    "r-remove-all": "Entferne alle Mitglieder von der Karte",
-    "r-set-color": "Farbe festlegen auf",
    "r-checklist": "Checkliste",
    "r-check-all": "Alle markieren",
-    "r-uncheck-all": "Alle abwählen",
+    "r-uncheck-all": "Alle demarkieren",
    "r-items-check": "Elemente der Checkliste",
    "r-check": "Markieren",
-    "r-uncheck": "Abwählen",
+    "r-uncheck": "Demarkieren",
    "r-item": "Element",
    "r-of-checklist": "der Checkliste",
    "r-send-email": "Eine E-Mail senden",
@@ -637,31 +592,20 @@
    "r-d-send-email-to": "an",
    "r-d-send-email-subject": "Betreff",
    "r-d-send-email-message": "Nachricht",
-    "r-d-archive": "Karte ins Archiv verschieben",
-    "r-d-unarchive": "Karte aus dem Archiv wiederherstellen",
+    "r-d-archive": "Karte in den Papierkorb verschieben",
+    "r-d-unarchive": "Karte aus den Papierkorb wiederherstellen",
    "r-d-add-label": "Label hinzufügen",
    "r-d-remove-label": "Label entfernen",
-    "r-create-card": "Neue Karte erstellen",
-    "r-in-list": "in der Liste",
-    "r-in-swimlane": "in Swimlane",
    "r-d-add-member": "Mitglied hinzufügen",
    "r-d-remove-member": "Mitglied entfernen",
    "r-d-remove-all-member": "Entferne alle Mitglieder",
-    "r-d-check-all": "Alle Elemente der Liste markieren",
-    "r-d-uncheck-all": "Alle Element der Liste abwählen",
-    "r-d-check-one": "Element auswählen",
-    "r-d-uncheck-one": "Element abwählen",
+    "r-d-check-all": "Alle Element der Liste markieren",
+    "r-d-uncheck-all": "Alle Element der Liste demarkieren",
+    "r-d-check-one": "Element markieren",
+    "r-d-uncheck-one": "Element demarkieren",
    "r-d-check-of-list": "der Checkliste",
    "r-d-add-checklist": "Checkliste hinzufügen",
    "r-d-remove-checklist": "Checkliste entfernen",
-    "r-by": "durch",
-    "r-add-checklist": "Checkliste hinzufügen",
-    "r-with-items": "mit Elementen",
-    "r-items-list": "Element1,Element2,Element3",
-    "r-add-swimlane": "Füge Swimlane hinzu",
-    "r-swimlane-name": "Swimlanename",
-    "r-board-note": "Hinweis: Lassen Sie ein Feld leer, um alle möglichen Werte zu finden.",
-    "r-checklist-note": "Hinweis: Die Elemente der Checkliste müssen als kommagetrennte Werte geschrieben werden.",
    "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -669,12 +613,5 @@
    "authentication-method": "Authentifizierungsmethode",
    "authentication-type": "Authentifizierungstyp",
    "custom-product-name": "Benutzerdefinierter Produktname",
-    "layout": "Layout",
-    "hide-logo": "Verstecke Logo",
-    "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",
-    "display-authentication-method": "Anzeige Authentifizierungsverfahren",
-    "default-authentication-method": "Standardauthentifizierungsverfahren"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Accept",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Actions",
    "activities": "Activities",
    "activity": "Activity",
    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "created %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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": "Προσθήκη",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "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": "Archive",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Λίστες",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Ακύρωση",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Έως",
    "card-due-on": "Έως τις",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Ετικέτες",
    "cardMembersPopup-title": "Μέλοι",
    "cardMorePopup-title": "Περισσότερα",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Κάρτες",
    "cards-count": "Κάρτες",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Κλείσιμο",
    "close-board": "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": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "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": "white",
    "color-yellow": "κίτρινο",
-    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Αναζήτηση",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "Από το Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "Από το Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Έκδοση",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Λίστες",
    "swimlanes": "Swimlanes",
    "log-out": "Αποσύνδεση",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Κανένα αποτέλεσμα",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Όνομα Χρήστη",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Ο κωδικός πρόσκλησης δεν υπάρχει",
    "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": "(Άγνωστο)",
+    "Wekan_version": "Wekan έκδοση",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "ώρες",
    "minutes": "λεπτά",
    "seconds": "δευτερόλεπτα",
    "show-field-on-card": "Show this 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": "Λογαριασμοί",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Accept",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Actions",
    "activities": "Activities",
    "activity": "Activity",
    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "created %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "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": "Archive",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "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": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Members",
    "cardMorePopup-title": "More",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Cards",
    "cards-count": "Cards",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "black",
    "color-blue": "blue",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "green",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "red",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "yellow",
-    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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 its activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve its activity.",
    "lists": "Lists",
    "swimlanes": "Swimlanes",
    "log-out": "Log Out",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in a list in the Archive",
+    "warn-list-archived": "warning: this card is in a list in the Recycle Bin",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any changes in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaboration.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "error-notAuthorized": "You are not authorised 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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Accept",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Actions",
    "activities": "Activities",
    "activity": "Activity",
    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "created %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "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": "Archive",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "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": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Members",
    "cardMorePopup-title": "More",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Cards",
    "cards-count": "Cards",
    "casSignIn" : "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "black",
    "color-blue": "blue",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "green",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "red",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "yellow",
-    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Lists",
    "swimlanes": "Swimlanes",
    "log-out": "Log Out",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,22 +534,19 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
+    "r-when-a-card-is": "When a card is",
    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
@@ -610,15 +565,14 @@
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
    "r-list": "list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "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",
@@ -639,13 +593,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -656,15 +607,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-board-note": "Note: leave a field empty to match every possible value. ",
-    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
-    "r-added-to": "added to",
    "r-when-a-card-is-moved": "When a card is moved to another list",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -672,12 +614,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Akcepti",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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": "Kreiis __board__",
+    "act-createCard": "Aldonis __card__ al __list__",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "Aldonis __card__ al __board__",
+    "act-addBoardMember": "Aldonis __member__ al __board__",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "act-joinMember": "Aldonis __member__ al __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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Akcioj",
    "activities": "Aktivaĵoj",
    "activity": "Aktivaĵo",
    "activity-added": "Aldonis %s al %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "Kreiis %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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": "Aldoni",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "Apliki",
-    "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": "Arkivi",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Arkivi",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listoj",
    "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": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Etikedoj",
    "cardMembersPopup-title": "Membroj",
    "cardMorePopup-title": "Pli",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Kartoj",
    "cards-count": "Kartoj",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Fermi",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "nigra",
    "color-blue": "blua",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "verda",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "oranĝa",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "ruĝa",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "flava",
-    "unset-color": "Unset",
    "comment": "Komento",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Serĉi",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Ligi al ĉitiu karto",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Movu ĉiujn kartojn en tiu listo.",
    "list-select-cards": "Elektu ĉiujn kartojn en tiu listo.",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Listoj",
    "swimlanes": "Swimlanes",
    "log-out": "Elsaluti",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "Nomo",
-    "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Neniaj rezultoj",
    "normal": "Normala",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Uzantnomo",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Rigardi",
    "watching": "Rigardante",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Kion vi volas fari?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Aldoni",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Aceptar",
-    "act-activity-notify": "Notificación de Actividad",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Notificación de Actividad",
+    "act-addAttachment": "adjunto __attachment__ a __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "lista de ítems __checklist__ agregada a __card__",
+    "act-addChecklistItem": " __checklistItem__ agregada a lista de ítems __checklist__ en __card__",
+    "act-addComment": "comentado en __card__: __comment__",
+    "act-createBoard": "__board__ creado",
+    "act-createCard": "agregada __card__ a __list__",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "agregada __list__ a __board__",
+    "act-addBoardMember": "agregado __member__ a __board__",
+    "act-archivedBoard": "__board__ movido a Papelera de Reciclaje",
+    "act-archivedCard": "__card__ movido a Papelera de Reciclaje",
+    "act-archivedList": "__list__ movido a Papelera de Reciclaje",
+    "act-archivedSwimlane": "__swimlane__ movido a Papelera de Reciclaje",
+    "act-importBoard": "__board__ importado",
+    "act-importCard": "__card__ importada",
+    "act-importList": "__list__ importada",
+    "act-joinMember": "__member__ agregado a __card__",
+    "act-moveCard": "__card__ movida de __oldList__ a __list__",
+    "act-removeBoardMember": "__member__ removido de __board__",
+    "act-restoredCard": "__card__ restaurada a __board__",
+    "act-unjoinMember": "__member__ removido de __card__",
+    "act-withBoardTitle": "__board__ [Wekan]",
    "act-withCardTitle": "__card__ [__board__] ",
    "actions": "Acciones",
    "activities": "Actividades",
    "activity": "Actividad",
    "activity-added": "agregadas %s a %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s movido a Papelera de Reciclaje",
    "activity-attached": "adjuntadas %s a %s",
    "activity-created": "creadas %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "agregada lista de tareas a %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "agregado item de lista de tareas a '%s' en %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Agregar",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Agregar Adjunto",
    "add-board": "Agregar Tablero",
@@ -87,22 +78,20 @@
    "and-n-other-card": "Y __count__ otra tarjeta",
    "and-n-other-card_plural": "Y __count__ otras tarjetas",
    "apply": "Aplicar",
-    "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": "Archivar",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan está cargándose, por favor espere. Refrescar la página va a causar pérdida de datos. Si Wekan no se carga, por favor revise que el servidor de Wekan no se haya detenido.",
+    "archive": "Mover a Papelera de Reciclaje",
+    "archive-all": "Mover Todo a la Papelera de Reciclaje",
+    "archive-board": "Mover Tablero a la Papelera de Reciclaje",
+    "archive-card": "Mover Tarjeta a la Papelera de Reciclaje",
+    "archive-list": "Mover Lista a la Papelera de Reciclaje",
+    "archive-swimlane": "Mover Calle a la Papelera de Reciclaje",
+    "archive-selection": "Mover selección a la Papelera de Reciclaje",
+    "archiveBoardPopup-title": "¿Mover Tablero a la Papelera de Reciclaje?",
+    "archived-items": "Papelera de Reciclaje",
+    "archived-boards": "Tableros en la Papelera de Reciclaje",
    "restore-board": "Restaurar Tablero",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archivar",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No hay tableros en la Papelera de Reciclaje",
+    "archives": "Papelera de Reciclaje",
    "assign-member": "Asignar miembro",
    "attached": "adjunto(s)",
    "attachment": "Adjunto",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Renombrar Tablero",
    "boardChangeVisibilityPopup-title": "Cambiar Visibilidad",
    "boardChangeWatchPopup-title": "Alternar Seguimiento",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Menú del Tablero",
    "boards": "Tableros",
    "board-view": "Vista de Tablero",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listas",
    "bucket-example": "Como \"Lista de Contenedores\" por ejemplo",
    "cancel": "Cancelar",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Esta tarjeta es movida a la Papelera de Reciclaje",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "Esta tarjeta tiene %s comentario.",
    "card-delete-notice": "Borrar es permanente. Perderás todas las acciones asociadas con esta tarjeta.",
    "card-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podrás re-abrir la tarjeta. No hay deshacer.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Tu puedes mover una tarjeta a la Papelera de Reciclaje para removerla del tablero y preservar la actividad.",
    "card-due": "Vence",
    "card-due-on": "Vence en",
    "card-spent": "Tiempo Empleado",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Etiquetas",
    "cardMembersPopup-title": "Miembros",
    "cardMorePopup-title": "Mas",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Tarjetas",
    "cards-count": "Tarjetas",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Portapapeles o arrastrar y soltar",
    "close": "Cerrar",
    "close-board": "Cerrar Tablero",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Podrás restaurar el tablero apretando el botón \"Papelera de Reciclaje\" del encabezado en inicio.",
    "color-black": "negro",
    "color-blue": "azul",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "verde",
-    "color-indigo": "indigo",
    "color-lime": "lima",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "naranja",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "rosa",
-    "color-plum": "plum",
    "color-purple": "púrpura",
    "color-red": "rojo",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "cielo",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "amarillo",
-    "unset-color": "Unset",
    "comment": "Comentario",
    "comment-placeholder": "Comentar",
    "comment-only": "Comentar solamente",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copiar enlace a tarjeta en el portapapeles",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Buscar",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "Copiar Tarjeta",
    "copyChecklistToManyCardsPopup-title": "Copiar Plantilla Checklist a Muchas Tarjetas",
    "copyChecklistToManyCardsPopup-instructions": "Títulos y Descripciones de la Tarjeta Destino en este formato JSON",
@@ -311,20 +283,18 @@
    "import-board": "importar tablero",
    "import-board-c": "Importar tablero",
    "import-board-title-trello": "Importar tablero de 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": "Importar tablero de Wekan",
    "import-sandstorm-warning": "El tablero importado va a borrar todos los datos existentes en el tablero y reemplazarlos con los del tablero en cuestión.",
    "from-trello": "De Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "De Wekan",
    "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego a 'Más', 'Imprimir y Exportar', 'Exportar JSON', y copia el texto resultante.",
-    "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-board-instruction-wekan": "En tu tablero Wekan, ve a 'Menú', luego a 'Exportar tablero', y copia el texto en el archivo descargado.",
    "import-json-placeholder": "Pegá tus datos JSON válidos acá",
    "import-map-members": "Mapear Miembros",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Tu tablero importado tiene algunos miembros. Por favor mapeá los miembros que quieras importar/convertir a usuarios de Wekan.",
    "import-show-user-mapping": "Revisar mapeo de miembros",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "import-user-select": "Elegí el usuario de Wekan que querés usar como éste miembro",
+    "importMapMembersAddPopup-title": "Elegí el miembro de Wekan.",
    "info": "Versión",
    "initials": "Iniciales",
    "invalid-date": "Fecha inválida",
@@ -343,19 +313,17 @@
    "leave-board-pop": "¿Estás seguro que querés dejar __boardTitle__? Vas a salir de todas las tarjetas en este tablero.",
    "leaveBoardPopup-title": "¿Dejar Tablero?",
    "link-card": "Enlace a esta tarjeta",
-    "list-archive-cards": "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": "Mover todas las tarjetas en esta lista a la Papelera de Reciclaje",
+    "list-archive-cards-pop": "Esto va a remover las tarjetas en esta lista del tablero. Para ver tarjetas en la Papelera de Reciclaje y traerlas de vuelta al tablero, clickeá \"Menú\" > \"Papelera de Reciclaje\".",
    "list-move-cards": "Mueve todas las tarjetas en esta lista",
    "list-select-cards": "Selecciona todas las tarjetas en esta lista",
-    "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",
    "list-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podás recuperar la lista. No se puede deshacer.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Podés mover la lista a la Papelera de Reciclaje para remvoerla del tablero y preservar la actividad.",
    "lists": "Listas",
    "swimlanes": "Calles",
    "log-out": "Salir",
@@ -375,9 +343,9 @@
    "muted-info": "No serás notificado de ningún cambio en este tablero",
    "my-boards": "Mis Tableros",
    "name": "Nombre",
-    "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 hay tarjetas en la Papelera de Reciclaje",
+    "no-archived-lists": "No hay listas en la Papelera de Reciclaje",
+    "no-archived-swimlanes": "No hay calles en la Papelera de Reciclaje",
    "no-results": "No hay resultados",
    "normal": "Normal",
    "normal-desc": "Puede ver y editar tarjetas. No puede cambiar opciones.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Cargado un avatar",
    "username": "Nombre de usuario",
    "view-it": "Verlo",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "cuidado; esta tarjeta está en la Papelera de Reciclaje",
    "watch": "Seguir",
    "watching": "Siguiendo",
    "watching-info": "Serás notificado de cualquier cambio en este tablero",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Hito 1",
    "welcome-list1": "Básicos",
    "welcome-list2": "Avanzado",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "¿Qué querés hacer?",
    "wipLimitErrorPopup-title": "Límite TEP Inválido",
    "wipLimitErrorPopup-dialog-pt1": " El número de tareas en esta lista es mayor que el límite TEP que definiste.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Enviarse un email de prueba",
    "invitation-code": "Código de Invitación",
    "email-invite-register-subject": "__inviter__ te envió una invitación",
-    "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": "Querido __user__,\n\n__inviter__ te invita a Wekan para colaborar.\n\nPor favor sigue el enlace de abajo:\n__url__\n\nI tu código de invitación es: __icode__\n\nGracias.",
+    "email-smtp-test-subject": "Email de Prueba SMTP de Wekan",
    "email-smtp-test-text": "Enviaste el correo correctamente",
    "error-invitation-code-not-exist": "El código de invitación no existe",
    "error-notAuthorized": "No estás autorizado para ver esta página.",
    "outgoing-webhooks": "Ganchos Web Salientes",
    "outgoingWebhooksPopup-title": "Ganchos Web Salientes",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "Nuevo Gancho Web",
    "no-name": "(desconocido)",
+    "Wekan_version": "Versión de Wekan",
    "Node_version": "Versión de Node",
    "OS_Arch": "Arch del SO",
    "OS_Cpus": "Cantidad de CPU del SO",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Memoria Total del SO",
    "OS_Type": "Tipo de SO",
    "OS_Uptime": "Tiempo encendido del SO",
-    "days": "days",
    "hours": "horas",
    "minutes": "minutos",
    "seconds": "segundos",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Si",
    "no": "No",
    "accounts": "Cuentas",
@@ -534,10 +496,6 @@
    "card-end-on": "Termina en",
    "editCardReceivedDatePopup-title": "Cambiar fecha de recepción",
    "editCardEndDatePopup-title": "Cambiar fecha de término",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Mover a Papelera de Reciclaje",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Agregar",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Aceptar",
-    "act-activity-notify": "Notificación de actividad",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Notificación de actividad",
+    "act-addAttachment": "ha adjuntado __attachment__ a __card__",
+    "act-addSubtask": "ha añadido la subtarea __checklist__ a __card__",
+    "act-addChecklist": "ha añadido la lista de verificación __checklist__ a __card__",
+    "act-addChecklistItem": "ha añadido __checklistItem__ a la lista de verificación __checklist__ en __card__",
+    "act-addComment": "ha comentado en __card__: __comment__",
+    "act-createBoard": "ha creado __board__",
+    "act-createCard": "ha añadido __card__ a __list__",
+    "act-createCustomField": "creado el campo personalizado __customField__",
+    "act-createList": "ha añadido __list__ a __board__",
+    "act-addBoardMember": "ha añadido a __member__ a __board__",
+    "act-archivedBoard": "__board__ se ha enviado a la papelera de reciclaje",
+    "act-archivedCard": "__card__ se ha enviado a la papelera de reciclaje",
+    "act-archivedList": "__list__ se ha enviado a la papelera de reciclaje",
+    "act-archivedSwimlane": "__swimlane__ se ha enviado a la papelera de reciclaje",
+    "act-importBoard": "ha importado __board__",
+    "act-importCard": "ha importado __card__",
+    "act-importList": "ha importado __list__",
+    "act-joinMember": "ha añadido a __member__ a __card__",
+    "act-moveCard": "ha movido __card__ desde __oldList__ a __list__",
+    "act-removeBoardMember": "ha eliminado a __member__ de __board__",
+    "act-restoredCard": "ha restaurado __card__ en __board__",
+    "act-unjoinMember": "ha eliminado a __member__ de __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Acciones",
    "activities": "Actividades",
    "activity": "Actividad",
    "activity-added": "ha añadido %s a %s",
-    "activity-archived": "%s movido a Archivo",
+    "activity-archived": "%s se ha enviado a la papelera de reciclaje",
    "activity-attached": "ha adjuntado %s a %s",
    "activity-created": "ha creado %s",
    "activity-customfield-created": "creado el campo personalizado %s",
@@ -52,19 +43,19 @@
    "activity-sent": "ha enviado %s a %s",
    "activity-unjoined": "se ha desvinculado de %s",
    "activity-subtask-added": "ha añadido la subtarea a %s",
-    "activity-checked-item": "marcado %s en la lista de verificación %s de %s",
-    "activity-unchecked-item": "desmarcado %s en lista  %s de %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "ha añadido una lista de verificación a %s",
-    "activity-checklist-removed": "eliminada una lista de verificación desde %s ",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted": "no completado la lista %s de %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-checklist-item-added": "ha añadido el elemento de la lista de verificación a '%s' en %s",
-    "activity-checklist-item-removed": "eliminado un elemento de la lista de verificación desde '%s' en %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Añadir",
-    "activity-checked-item-card": "marcado %s en la lista de verificación %s",
-    "activity-unchecked-item-card": "desmarcado %s en la lista de verificación %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted-card": "no completó la lista de verificación %s",
+    "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",
    "add-attachment": "Añadir adjunto",
    "add-board": "Añadir tablero",
    "add-card": "Añadir una tarjeta",
@@ -79,7 +70,7 @@
    "added": "Añadida el",
    "addMemberPopup-title": "Miembros",
    "admin": "Administrador",
-    "admin-desc": "Puedes ver y editar tarjetas, eliminar miembros, y cambiar las preferencias del tablero",
+    "admin-desc": "Puedes ver y editar tarjetas, eliminar miembros, y cambiar los ajustes del tablero",
    "admin-announcement": "Aviso",
    "admin-announcement-active": "Activar el aviso para todo el sistema",
    "admin-announcement-title": "Aviso del administrador",
@@ -87,22 +78,20 @@
    "and-n-other-card": "y __count__ tarjeta más",
    "and-n-other-card_plural": "y otras __count__ tarjetas",
    "apply": "Aplicar",
-    "app-is-offline": "Cargando, espera por favor. Refrescar esta página causará pérdida de datos. Si la carga no funciona, por favor comprueba que el servidor no se ha parado.",
-    "archive": "Mover al Archivo",
-    "archive-all": "Mover todo al Archivo",
-    "archive-board": "Mover Tablero al Archivo",
-    "archive-card": "Mover tarjeta al Archivo",
-    "archive-list": "Mover Lista al Archivo",
-    "archive-swimlane": "Mover carril al Archivo",
-    "archive-selection": "Mover selección al Archivo",
-    "archiveBoardPopup-title": "¿Mover Tablero al Archivo?",
-    "archived-items": "Archivar",
-    "archived-boards": "Tableros en Archivo",
+    "app-is-offline": "Wekan se está cargando, por favor espere. Actualizar la página provocará la pérdida de datos. Si Wekan no se carga, por favor verifique que el servidor de Wekan no está detenido.",
+    "archive": "Enviar a la papelera de reciclaje",
+    "archive-all": "Enviar todo a la papelera de reciclaje",
+    "archive-board": "Enviar el tablero a la papelera de reciclaje",
+    "archive-card": "Enviar la tarjeta a la papelera de reciclaje",
+    "archive-list": "Enviar la lista a la papelera de reciclaje",
+    "archive-swimlane": "Enviar el carril de flujo a la papelera de reciclaje",
+    "archive-selection": "Enviar la selección a la papelera de reciclaje",
+    "archiveBoardPopup-title": "Enviar el tablero a la papelera de reciclaje",
+    "archived-items": "Papelera de reciclaje",
+    "archived-boards": "Tableros en la papelera de reciclaje",
    "restore-board": "Restaurar el tablero",
-    "no-archived-boards": "No hay Tableros en el Archivo",
-    "archives": "Archivar",
-    "template": "Plantilla",
-    "templates": "Plantillas",
+    "no-archived-boards": "No hay tableros en la papelera de reciclaje",
+    "archives": "Papelera de reciclaje",
    "assign-member": "Asignar miembros",
    "attached": "adjuntado",
    "attachment": "Adjunto",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Renombrar el tablero",
    "boardChangeVisibilityPopup-title": "Cambiar visibilidad",
    "boardChangeWatchPopup-title": "Cambiar vigilancia",
-    "boardMenuPopup-title": "Preferencias del tablero",
+    "boardMenuPopup-title": "Menú del tablero",
    "boards": "Tableros",
    "board-view": "Vista del tablero",
    "board-view-cal": "Calendario",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listas",
    "bucket-example": "Como “Cosas por hacer” por ejemplo",
    "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta se movió al Archivo",
-    "board-archived": "Este tablero se movió al Archivo",
+    "card-archived": "Esta tarjeta se ha enviado a la papelera de reciclaje.",
+    "board-archived": "Este tablero  se ha enviado a la papelera de reciclaje.",
    "card-comments-title": "Esta tarjeta tiene %s comentarios.",
    "card-delete-notice": "la eliminación es permanente. Perderás todas las acciones asociadas a esta tarjeta.",
    "card-delete-pop": "Se eliminarán todas las acciones del historial de actividades y no se podrá volver a abrir la tarjeta. Esta acción no puede deshacerse.",
-    "card-delete-suggest-archive": "Puedes mover una tarjeta al Archivo para quitarla del tablero y preservar la actividad.",
+    "card-delete-suggest-archive": "Puedes enviar una tarjeta a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
    "card-due": "Vence",
    "card-due-on": "Vence el",
    "card-spent": "Tiempo consumido",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Etiquetas",
    "cardMembersPopup-title": "Miembros",
    "cardMorePopup-title": "Más",
-    "cardTemplatePopup-title": "Crear plantilla",
    "cards": "Tarjetas",
    "cards-count": "Tarjetas",
    "casSignIn": "Iniciar sesión con CAS",
@@ -178,33 +166,17 @@
    "clipboard": "el portapapeles o con arrastrar y soltar",
    "close": "Cerrar",
    "close-board": "Cerrar el tablero",
-    "close-board-pop": "Podrás restaurar el tablero haciendo clic en el botón \"Archivo\" del encabezado de la pantalla inicial.",
+    "close-board-pop": "Podrás restaurar el tablero haciendo clic en el botón \"Papelera de reciclaje\" en la cabecera.",
    "color-black": "negra",
    "color-blue": "azul",
-    "color-crimson": "carmesí",
-    "color-darkgreen": "verde oscuro",
-    "color-gold": "oro",
-    "color-gray": "gris",
    "color-green": "verde",
-    "color-indigo": "añil",
    "color-lime": "lima",
-    "color-magenta": "magenta",
-    "color-mistyrose": "rosa claro",
-    "color-navy": "azul marino",
    "color-orange": "naranja",
-    "color-paleturquoise": "turquesa",
-    "color-peachpuff": "melocotón",
    "color-pink": "rosa",
-    "color-plum": "púrpura",
    "color-purple": "violeta",
    "color-red": "roja",
-    "color-saddlebrown": "marrón",
-    "color-silver": "plata",
    "color-sky": "celeste",
-    "color-slateblue": "azul",
-    "color-white": "blanco",
    "color-yellow": "amarilla",
-    "unset-color": "Desmarcar",
    "comment": "Comentar",
    "comment-placeholder": "Escribir comentario",
    "comment-only": "Sólo comentarios",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "¿Seguro que quieres eliminar la lista de verificación?",
    "copy-card-link-to-clipboard": "Copiar el enlace de la tarjeta al portapapeles",
    "linkCardPopup-title": "Enlazar tarjeta",
-    "searchElementPopup-title": "Buscar",
+    "searchCardPopup-title": "Buscar tarjeta",
    "copyCardPopup-title": "Copiar la tarjeta",
    "copyChecklistToManyCardsPopup-title": "Copiar la plantilla de la lista de verificación en varias tarjetas",
    "copyChecklistToManyCardsPopup-instructions": "Títulos y descripciones de las tarjetas de destino en formato JSON",
@@ -311,20 +283,18 @@
    "import-board": "importar un tablero",
    "import-board-c": "Importar un tablero",
    "import-board-title-trello": "Importar un tablero desde Trello",
-    "import-board-title-wekan": "Importar tablero desde una exportación previa",
-    "import-sandstorm-backup-warning": "No elimine los datos que está importando del tablero o Trello original antes de verificar que la semilla pueda cerrarse y abrirse nuevamente, o que ocurra un error de \"Tablero no encontrado\", de lo contrario perderá sus datos.",
+    "import-board-title-wekan": "Importar un tablero desde Wekan",
    "import-sandstorm-warning": "El tablero importado eliminará todos los datos existentes en este tablero y los reemplazará con los datos del tablero importado.",
    "from-trello": "Desde Trello",
-    "from-wekan": "Desde exportación previa",
+    "from-wekan": "Desde Wekan",
    "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.",
-    "import-board-instruction-wekan": "En tu tablero, vete a 'Menú', luego 'Exportar tablero', y copia el texto en el archivo descargado.",
-    "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-board-instruction-wekan": "En tu tablero de Wekan, ve a 'Menú del tablero', luego 'Exportar el tablero', y copia aquí el texto del fichero descargado.",
    "import-json-placeholder": "Pega tus datos JSON válidos aquí",
    "import-map-members": "Mapa de miembros",
-    "import-members-map": "Tu tablero importado tiene algunos miembros. Por favor, mapea los miembros que quieres importar con tus usuarios.",
+    "import-members-map": "El tablero importado tiene algunos miembros. Por favor mapea los miembros que deseas importar a los usuarios de Wekan",
    "import-show-user-mapping": "Revisión de la asignación de miembros",
-    "import-user-select": "Selecciona el miembro existe que quieres usar como este miembro.",
-    "importMapMembersAddPopup-title": "Seleccionar miembro",
+    "import-user-select": "Escoge el usuario de Wekan que deseas utilizar como miembro",
+    "importMapMembersAddPopup-title": "Selecciona un miembro de Wekan",
    "info": "Versión",
    "initials": "Iniciales",
    "invalid-date": "Fecha no válida",
@@ -343,19 +313,17 @@
    "leave-board-pop": "¿Seguro que quieres abandonar __boardTitle__? Serás desvinculado de todas las tarjetas en este tablero.",
    "leaveBoardPopup-title": "¿Abandonar el tablero?",
    "link-card": "Enlazar a esta tarjeta",
-    "list-archive-cards": "Mover todas las tarjetas de la lista al Archivo",
-    "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-archive-cards": "Enviar todas las tarjetas de esta lista a la papelera de reciclaje",
+    "list-archive-cards-pop": "Esto eliminará todas las tarjetas de esta lista del tablero. Para ver las tarjetas en la papelera de reciclaje y devolverlas al tablero, haga clic en \"Menú\" > \"Papelera de reciclaje\".",
    "list-move-cards": "Mover todas las tarjetas de esta lista",
    "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
-    "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",
    "list-delete-pop": "Todas las acciones serán eliminadas del historial de actividades y no se podrá recuperar la lista. Esta acción no puede deshacerse.",
-    "list-delete-suggest-archive": "Puedes mover una lista al Archivo para quitarla del tablero y preservar la actividad.",
+    "list-delete-suggest-archive": "Puedes enviar una lista a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
    "lists": "Listas",
    "swimlanes": "Carriles",
    "log-out": "Finalizar la sesión",
@@ -375,9 +343,9 @@
    "muted-info": "No serás notificado de ningún cambio en este tablero",
    "my-boards": "Mis tableros",
    "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas archivadas.",
-    "no-archived-lists": "No hay listas archivadas.",
-    "no-archived-swimlanes": "No hay carriles archivados.",
+    "no-archived-cards": "No hay tarjetas en la papelera de reciclaje",
+    "no-archived-lists": "No hay listas en la papelera de reciclaje",
+    "no-archived-swimlanes": "No hay carriles de flujo en la papelera de reciclaje",
    "no-results": "Sin resultados",
    "normal": "Normal",
    "normal-desc": "Puedes ver y editar tarjetas. No puedes cambiar la configuración.",
@@ -413,12 +381,12 @@
    "restore": "Restaurar",
    "save": "Añadir",
    "search": "Buscar",
-    "rules": "Reglas",
+    "rules": "Rules",
    "search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
    "search-example": "¿Texto a buscar?",
-    "select-color": "Seleccionar el color",
+    "select-color": "Selecciona un color",
    "set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
-    "setWipLimitPopup-title": "Fija el límite del trabajo en proceso",
+    "setWipLimitPopup-title": "Fijar el límite del trabajo en proceso",
    "shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
    "shortcut-autocomplete-emoji": "Autocompletar emoji",
    "shortcut-autocomplete-members": "Autocompletar miembros",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar cargado",
    "username": "Nombre de usuario",
    "view-it": "Verla",
-    "warn-list-archived": "advertencia: esta tarjeta está en una lista en el Archivo",
+    "warn-list-archived": "advertencia: esta tarjeta está en una lista en la papelera de reciclaje",
    "watch": "Vigilar",
    "watching": "Vigilando",
    "watching-info": "Serás notificado de cualquier cambio en este tablero",
@@ -465,15 +433,12 @@
    "welcome-swimlane": "Hito 1",
    "welcome-list1": "Básicos",
    "welcome-list2": "Avanzados",
-    "card-templates-swimlane": "Plantilla de tarjeta",
-    "list-templates-swimlane": "Listar plantillas",
-    "board-templates-swimlane": "Plantilla de tablero",
    "what-to-do": "¿Qué deseas hacer?",
    "wipLimitErrorPopup-title": "El límite del trabajo en proceso no es válido.",
    "wipLimitErrorPopup-dialog-pt1": "El número de tareas en esta lista es mayor que el límite del trabajo en proceso que has definido.",
    "wipLimitErrorPopup-dialog-pt2": "Por favor, mueve algunas tareas fuera de esta lista, o fija un límite del trabajo en proceso más alto.",
    "admin-panel": "Panel del administrador",
-    "settings": "Preferencias",
+    "settings": "Ajustes",
    "people": "Personas",
    "registration": "Registro",
    "disable-self-registration": "Deshabilitar autoregistro",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Enviarte un correo de prueba a ti mismo",
    "invitation-code": "Código de Invitación",
    "email-invite-register-subject": "__inviter__ te ha enviado una invitación",
-    "email-invite-register-text": "Querido __user__,\n__inviter__ le invita al tablero kanban para colaborar.\n\nPor favor, siga el siguiente enlace:\n__url__\n\nY tu código de invitación es:  __icode__\n\nGracias.",
-    "email-smtp-test-subject": "Prueba de email SMTP",
+    "email-invite-register-text": "Estimado __user__,\n\n__inviter__ te invita a unirte a Wekan para colaborar.\n\nPor favor, haz clic en el siguiente enlace:\n__url__\n\nTu código de invitación es: __icode__\n\nGracias.",
+    "email-smtp-test-subject": "Prueba de correo SMTP desde Wekan",
    "email-smtp-test-text": "El correo se ha enviado correctamente",
    "error-invitation-code-not-exist": "El código de invitación no existe",
    "error-notAuthorized": "No estás autorizado a ver esta página.",
    "outgoing-webhooks": "Webhooks salientes",
    "outgoingWebhooksPopup-title": "Webhooks salientes",
-    "boardCardTitlePopup-title": "Filtro de títulos de tarjeta ",
    "new-outgoing-webhook": "Nuevo webhook saliente",
    "no-name": "(Desconocido)",
+    "Wekan_version": "Versión de Wekan",
    "Node_version": "Versión de Node",
    "OS_Arch": "Arquitectura del sistema",
    "OS_Cpus": "Número de CPUs del sistema",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Memoria Total del sistema",
    "OS_Type": "Tipo de sistema",
    "OS_Uptime": "Tiempo activo del sistema",
-    "days": "días",
    "hours": "horas",
    "minutes": "minutos",
    "seconds": "segundos",
    "show-field-on-card": "Mostrar este campo en la tarjeta",
-    "automatically-field-on-card": "Crear campos automáticamente para todas las tarjetas.",
-    "showLabel-field-on-card": "Mostrar etiquetas de campos en la minitarjeta.",
    "yes": "Sí",
    "no": "No",
    "accounts": "Cuentas",
@@ -534,10 +496,6 @@
    "card-end-on": "Finalizado el",
    "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
    "editCardEndDatePopup-title": "Cambiar la fecha de finalización",
-    "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.",
@@ -547,8 +505,8 @@
    "default-subtasks-board": "Subtareas para el tablero __board__",
    "default": "Por defecto",
    "queue": "Cola",
-    "subtask-settings": "Preferencias de las subtareas",
-    "boardSubtaskSettingsPopup-title": "Preferencias de las subtareas del tablero",
+    "subtask-settings": "Subtareas del tablero",
+    "boardSubtaskSettingsPopup-title": "Configuración de las subtareas del tablero",
    "show-subtasks-field": "Las tarjetas pueden tener subtareas",
    "deposit-subtasks-board": "Depositar subtareas en este tablero:",
    "deposit-subtasks-list": "Lista de destino para subtareas depositadas aquí:",
@@ -561,120 +519,99 @@
    "parent-card": "Tarjeta padre",
    "source-board": "Tablero de origen",
    "no-parent": "No mostrar la tarjeta padre",
-    "activity-added-label": "añadida etiqueta %s a %s",
-    "activity-removed-label": "eliminada etiqueta '%s' desde %s",
-    "activity-delete-attach": "borrado un adjunto desde %s",
-    "activity-added-label-card": "añadida etiqueta '%s'",
-    "activity-removed-label-card": "eliminada etiqueta '%s'",
-    "activity-delete-attach-card": "borrado un adjunto",
-    "r-rule": "Regla",
-    "r-add-trigger": "Añadir disparador",
-    "r-add-action": "Añadir acción",
-    "r-board-rules": "Reglas del tablero",
-    "r-add-rule": "Añadir regla",
-    "r-view-rule": "Ver regla",
-    "r-delete-rule": "Eliminar regla",
-    "r-new-rule-name": "Nueva título de regla",
-    "r-no-rules": "No hay reglas",
-    "r-when-a-card": "Cuando una tarjeta",
-    "r-is": "es",
-    "r-is-moved": "es movida",
-    "r-added-to": "es agregada a",
-    "r-removed-from": "Eliminado de",
-    "r-the-board": "el tablero",
-    "r-list": "lista",
-    "set-filter": "Filtrar",
-    "r-moved-to": "Movido a",
-    "r-moved-from": "Movido desde",
-    "r-archived": "Movido a Archivo",
-    "r-unarchived": "Restaurado del archivo",
-    "r-a-card": "una tarjeta",
-    "r-when-a-label-is": "Cuando una etiqueta es",
-    "r-when-the-label-is": "Cuando la etiqueta es",
-    "r-list-name": "Nombre de lista",
-    "r-when-a-member": "Cuando un miembro es",
-    "r-when-the-member": "Cuando el miembro",
-    "r-name": "nombre",
-    "r-when-a-attach": "Cuando un adjunto",
-    "r-when-a-checklist": "Cuando una lista de verificación es",
-    "r-when-the-checklist": "Cuando la lista de verificación",
-    "r-completed": "Completada",
-    "r-made-incomplete": "Hecha incompleta",
-    "r-when-a-item": "Cuando un elemento de la lista de verificación es",
-    "r-when-the-item": "Cuando el elemento de la lista de verificación es",
-    "r-checked": "Marcado",
-    "r-unchecked": "Desmarcado",
-    "r-move-card-to": "Mover tarjeta a",
-    "r-top-of": "Arriba de",
-    "r-bottom-of": "Abajo de",
-    "r-its-list": "su lista",
-    "r-archive": "Mover al Archivo",
-    "r-unarchive": "Restaurar del Archivo",
-    "r-card": "tarjeta",
+    "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",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
+    "r-a-card": "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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "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": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Enviar a la papelera de reciclaje",
+    "r-unarchive": "Restore from Recycle Bin",
+    "r-card": "card",
    "r-add": "Añadir",
-    "r-remove": "Eliminar",
-    "r-label": "etiqueta",
-    "r-member": "miembro",
-    "r-remove-all": "Eliminar todos los miembros de la tarjeta",
-    "r-set-color": "Cambiar el color a",
-    "r-checklist": "lista de verificación",
-    "r-check-all": "Marcar todo",
-    "r-uncheck-all": "Desmarcar todo",
-    "r-items-check": "elementos de la lista de verificación",
-    "r-check": "Marcar",
-    "r-uncheck": "Desmarcar",
-    "r-item": "elemento",
-    "r-of-checklist": "de la lista de verificación",
-    "r-send-email": "Enviar un email",
-    "r-to": "a",
-    "r-subject": "asunto",
-    "r-rule-details": "Detalle de la regla",
-    "r-d-move-to-top-gen": "Mover tarjeta arriba de su lista",
-    "r-d-move-to-top-spec": "Mover tarjeta arriba de la lista",
-    "r-d-move-to-bottom-gen": "Mover tarjeta abajo de su lista",
-    "r-d-move-to-bottom-spec": "Mover tarjeta al fondo de la lista",
-    "r-d-send-email": "Enviar email",
-    "r-d-send-email-to": "a",
-    "r-d-send-email-subject": "asunto",
-    "r-d-send-email-message": "mensaje",
-    "r-d-archive": "Mover tarjeta al Archivo",
-    "r-d-unarchive": "Restaurar tarjeta del Archivo",
-    "r-d-add-label": "Añadir etiqueta",
-    "r-d-remove-label": "Eliminar etiqueta",
-    "r-create-card": "Crear nueva tarjeta",
-    "r-in-list": "en la lista",
-    "r-in-swimlane": "en carril ",
-    "r-d-add-member": "Añadir miembro",
-    "r-d-remove-member": "Eliminar miembro",
-    "r-d-remove-all-member": "Eliminar todos los miembros",
-    "r-d-check-all": "Marcar todos los elementos de una lista",
-    "r-d-uncheck-all": "Desmarcar todos los elementos de una lista",
-    "r-d-check-one": "Marcar elemento",
-    "r-d-uncheck-one": "Desmarcar elemento",
-    "r-d-check-of-list": "de la lista de verificación",
-    "r-d-add-checklist": "Añadir una lista de verificación",
-    "r-d-remove-checklist": "Eliminar lista de verificación",
-    "r-by": "por",
-    "r-add-checklist": "Añadir una lista de verificación",
-    "r-with-items": "con items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Agregar carril",
-    "r-swimlane-name": "nombre del carril",
-    "r-board-note": "Nota: deje un campo vacío para que coincida con todos los valores posibles",
-    "r-checklist-note": "Nota: los ítems de la lista tienen que escribirse como valores separados por coma.",
-    "r-when-a-card-is-moved": "Cuando una tarjeta es movida a otra lista",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "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": "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "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": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
    "cas": "CAS",
-    "authentication-method": "Método de autenticación",
-    "authentication-type": "Tipo de autenticación",
-    "custom-product-name": "Nombre de producto personalizado",
-    "layout": "Disñeo",
-    "hide-logo": "Ocultar logo",
-    "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",
-    "display-authentication-method": "Mostrar el método de autenticación",
-    "default-authentication-method": "Método de autenticación por defecto"
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Onartu",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Jarduera-jakinarazpena",
+    "act-addAttachment": "__attachment__ __card__ txartelera erantsita",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "gehituta checklist __checklist__ __card__ -ri",
+    "act-addChecklistItem": "gehituta __checklistItem__ checklist __checklist__ on __card__ -ri",
+    "act-addComment": "__card__ txartelean iruzkina: __comment__",
+    "act-createBoard": "__board__ sortuta",
+    "act-createCard": "__card__ __list__ zerrrendara gehituta",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "__list__ __board__ arbelera gehituta",
+    "act-addBoardMember": "__member__ __board__ arbelera gehituta",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "__board__ inportatuta",
+    "act-importCard": "__card__ inportatuta",
+    "act-importList": "__list__ inportatuta",
+    "act-joinMember": "__member__ __card__ txartelera gehituta",
+    "act-moveCard": "__card__ __oldList__ zerrendartik __list__ zerrendara eraman da",
+    "act-removeBoardMember": "__member__ __board__ arbeletik kendu da",
+    "act-restoredCard": "__card__ __board__ arbelean berrezarri da",
+    "act-unjoinMember": "__member__ __card__ txarteletik kendu da",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Ekintzak",
    "activities": "Jarduerak",
    "activity": "Jarduera",
    "activity-added": "%s %s(e)ra gehituta",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "%s %s(e)ra erantsita",
    "activity-created": "%s sortuta",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "egiaztaketa zerrenda %s(e)ra gehituta",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "egiaztaketa zerrendako elementuak '%s'(e)ra gehituta %s(e)n",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Gehitu",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Gehitu eranskina",
    "add-board": "Gehitu arbela",
@@ -87,22 +78,20 @@
    "and-n-other-card": "Eta beste txartel __count__",
    "and-n-other-card_plural": "Eta beste  __count__ txartel",
    "apply": "Aplikatu",
-    "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": "Artxibatu",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan kargatzen ari da, itxaron mesedez. Orria freskatzeak datuen galera ekarriko luke. Wekan kargatzen ez bada, egiaztatu Wekan zerbitzaria gelditu ez dela.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Berreskuratu arbela",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Artxibatu",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Esleitu kidea",
    "attached": "erantsita",
    "attachment": "Eranskina",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Aldatu izena arbelari",
    "boardChangeVisibilityPopup-title": "Aldatu ikusgaitasuna",
    "boardChangeWatchPopup-title": "Aldatu ikuskatzea",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Arbelaren menua",
    "boards": "Arbelak",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Zerrendak",
    "bucket-example": "Esaterako \"Pertz zerrenda\"",
    "cancel": "Utzi",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "Txartel honek iruzkin %s  dauka.",
    "card-delete-notice": "Ezabaketa behin betiko da. Txartel honi lotutako ekintza guztiak galduko dituzu.",
    "card-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu txartela berrireki. Ez dago desegiterik.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Epemuga",
    "card-due-on": "Epemuga",
    "card-spent": "Erabilitako denbora",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Etiketak",
    "cardMembersPopup-title": "Kideak",
    "cardMorePopup-title": "Gehiago",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Txartelak",
    "cards-count": "Txartelak",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Kopiatu eta itsatsi edo arrastatu eta jaregin",
    "close": "Itxi",
    "close-board": "Itxi arbela",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "beltza",
    "color-blue": "urdina",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "berdea",
-    "color-indigo": "indigo",
    "color-lime": "lima",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "laranja",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "larrosa",
-    "color-plum": "plum",
    "color-purple": "purpura",
    "color-red": "gorria",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "zerua",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "horia",
-    "unset-color": "Unset",
    "comment": "Iruzkina",
    "comment-placeholder": "Idatzi iruzkin bat",
    "comment-only": "Iruzkinak besterik ez",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Kopiatu txartela arbelera",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Bilatu",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "Kopiatu txartela",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -311,20 +283,18 @@
    "import-board": "inportatu arbela",
    "import-board-c": "Inportatu arbela",
    "import-board-title-trello": "Inportatu arbela Trellotik",
-    "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": "Inportatu arbela Wekanetik",
    "import-sandstorm-warning": "Inportatutako arbelak oraingo arbeleko informazio guztia ezabatuko du eta inportatutako arbeleko informazioarekin ordeztu.",
    "from-trello": "Trellotik",
-    "from-wekan": "From previous export",
+    "from-wekan": "Wekanetik",
    "import-board-instruction-trello": "Zure Trello arbelean, aukeratu 'Menu\", 'More', 'Print and Export', 'Export JSON', eta kopiatu jasotako testua hemen.",
-    "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-board-instruction-wekan": "Zure Wekan arbelean, aukeratu 'Menua' - 'Esportatu arbela', eta kopiatu testua deskargatutako fitxategian.",
    "import-json-placeholder": "Isatsi baliozko JSON datuak hemen",
    "import-map-members": "Kideen mapa",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Inportatu duzun arbela kide batzuk ditu, mesedez lotu inportatu nahi dituzun kideak Wekan erabiltzaileekin",
    "import-show-user-mapping": "Berrikusi kideen mapa",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "import-user-select": "Hautatu kide hau bezala erabili nahi duzun Wekan erabiltzailea",
+    "importMapMembersAddPopup-title": "Aukeratu Wekan kidea",
    "info": "Bertsioa",
    "initials": "Inizialak",
    "invalid-date": "Baliogabeko data",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Ziur zaude __boardTitle__ utzi nahi duzula? Arbel honetako txartel guztietatik ezabatua izango zara.",
    "leaveBoardPopup-title": "Arbela utzi?",
    "link-card": "Lotura txartel honetara",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Lekuz aldatu zerrendako txartel guztiak",
    "list-select-cards": "Aukeratu zerrenda honetako txartel guztiak",
-    "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",
    "list-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu zerrenda berreskuratu. Ez dago desegiterik.",
-    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Zerrendak",
    "swimlanes": "Swimlanes",
    "log-out": "Itxi saioa",
@@ -375,9 +343,9 @@
    "muted-info": "Ez zaizkizu jakinaraziko arbel honi egindako aldaketak",
    "my-boards": "Nire arbelak",
    "name": "Izena",
-    "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Emaitzarik ez",
    "normal": "Arrunta",
    "normal-desc": "Txartelak ikusi eta editatu ditzake. Ezin ditu ezarpenak aldatu.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar bat igo da",
    "username": "Erabiltzaile-izena",
    "view-it": "Ikusi",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Ikuskatu",
    "watching": "Ikuskatzen",
    "watching-info": "Arbel honi egindako aldaketak jakinaraziko zaizkizu",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Oinarrizkoa",
    "welcome-list2": "Aurreratua",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Zer egin nahi duzu?",
    "wipLimitErrorPopup-title": "Baliogabeko WIP muga",
    "wipLimitErrorPopup-dialog-pt1": "Zerrenda honetako atazen muga, WIP-en ezarritakoa baina handiagoa da",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Bidali posta elektroniko mezu bat zure buruari",
    "invitation-code": "Gonbidapen kodea",
    "email-invite-register-subject": "__inviter__ erabiltzaileak gonbidapen bat bidali dizu",
-    "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": "Kaixo __user__,\n\n__inviter__ erabiltzaileak Wekanera gonbidatu zaitu elkar-lanean aritzeko.\n\nJarraitu mesedez lotura hau:\n__url__\n\nZure gonbidapen kodea hau da: __icode__\n\nEskerrik asko.",
+    "email-smtp-test-subject": "Wekan-etik bidalitako test-mezua",
    "email-smtp-test-text": "Arrakastaz bidali duzu posta elektroniko mezua",
    "error-invitation-code-not-exist": "Gonbidapen kodea ez da existitzen",
    "error-notAuthorized": "Ez duzu orri hau ikusteko baimenik.",
    "outgoing-webhooks": "Irteerako Webhook-ak",
    "outgoingWebhooksPopup-title": "Irteerako Webhook-ak",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "Irteera-webhook berria",
    "no-name": "(Ezezaguna)",
+    "Wekan_version": "Wekan bertsioa",
    "Node_version": "Nodo bertsioa",
    "OS_Arch": "SE Arkitektura",
    "OS_Cpus": "SE PUZ kopurua",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "SE memoria guztira",
    "OS_Type": "SE mota",
    "OS_Uptime": "SE denbora abiatuta",
-    "days": "days",
    "hours": "ordu",
    "minutes": "minutu",
    "seconds": "segundo",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Bai",
    "no": "Ez",
    "accounts": "Kontuak",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Gehitu",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "پذیرش",
-    "act-activity-notify": "اعلان فعالیت",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[wekan] اطلاع فعالیت",
+    "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": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "اعمال",
    "activities": "فعالیت‌ها",
    "activity": "فعالیت",
    "activity-added": "%s به %s اضافه شد",
-    "activity-archived": "%s به آرشیو انتقال یافت",
+    "activity-archived": "%s به بازیافتی منتقل شد",
    "activity-attached": "%s به %s پیوست شد",
    "activity-created": "%s ایجاد شد",
    "activity-customfield-created": "%s فیلدشخصی ایجاد شد",
@@ -52,19 +43,19 @@
    "activity-sent": "ارسال %s به %s",
    "activity-unjoined": "قطع اتصال %s",
    "activity-subtask-added": "زیروظیفه به %s اضافه شد",
-    "activity-checked-item": "چک شده  %s در چک لیست %s از %s",
-    "activity-unchecked-item": "چک نشده  %s در چک لیست %s از %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-removed": "از چک لیست حذف گردید",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted": "تمام نشده ها در چک لیست %s از %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-checklist-item-added": "added checklist item to '%s' in %s",
-    "activity-checklist-item-removed": "حذف شده از چک لیست  '%s' در %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "افزودن",
-    "activity-checked-item-card": "چک شده  %s در چک لیست %s",
-    "activity-unchecked-item-card": "چک نشده  %s در چک لیست %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "activity-checklist-uncompleted-card": "چک لیست تمام نشده %s",
+    "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",
    "add-attachment": "افزودن ضمیمه",
    "add-board": "افزودن برد",
    "add-card": "افزودن کارت",
@@ -87,22 +78,20 @@
    "and-n-other-card": "و __count__ کارت دیگر",
    "and-n-other-card_plural": "و __count__ کارت دیگر",
    "apply": "اعمال",
-    "app-is-offline": "در حال بارگزاری لطفا منتظر بمانید. بازخوانی صفحه باعث از بین رفتن اطلاعات می شود. اگر بارگذاری کار نمی کند، لطفا بررسی کنید که این سرور متوقف نشده است.",
-    "archive": "انتقال به آرشیو",
-    "archive-all": "انتقال همه به آرشیو",
-    "archive-board": "انتقال برد به آرشیو",
-    "archive-card": "انتقال کارت به آرشیو",
-    "archive-list": "انتقال لیست به آرشیو",
-    "archive-swimlane": "انتقال مسیر به آرشیو",
-    "archive-selection": "انتقال انتخاب شده ها به آرشیو",
-    "archiveBoardPopup-title": "انتقال برد به آرشیو؟",
-    "archived-items": "بایگانی",
-    "archived-boards": "برد های داخل آرشیو",
+    "app-is-offline": "Wekan در حال بارگذاری است. لطفا صبر کنید. نوسازی صفحه، منجر به از دست رفتن داده‌ها می‌شود. اگر Wekan بارگذاری نشد، لطفا بررسی کنید که سرور Wekan متوقف نشده باشد.",
+    "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": "بایگانی",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "هیچ تخته ای در سطل زباله وجود ندارد",
+    "archives": "سطل زباله",
    "assign-member": "تعیین عضو",
    "attached": "ضمیمه شده",
    "attachment": "ضمیمه",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "تغییر نام تخته",
    "boardChangeVisibilityPopup-title": "تغییر وضعیت نمایش",
    "boardChangeWatchPopup-title": "تغییر دیده بانی",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "منوی تخته",
    "boards": "تخته‌ها",
    "board-view": "نمایش تخته",
    "board-view-cal": "تقویم",
@@ -129,12 +118,12 @@
    "board-view-lists": "فهرست‌ها",
    "bucket-example": "برای مثال چیزی شبیه \"لیست سبدها\"",
    "cancel": "انصراف",
-    "card-archived": "این کارت به آرشیو انتقال داده شد",
-    "board-archived": "این برد به آرشیو انتقال یافت",
+    "card-archived": "این کارت به سطل زباله ریخته شده است",
+    "board-archived": "این تخته به بازیافتی انتقال یافت.",
    "card-comments-title": "این کارت دارای %s نظر است.",
    "card-delete-notice": "حذف دائمی. تمامی موارد مرتبط با این کارت از بین خواهند رفت.",
-    "card-delete-pop": "همه اقدامات از این پردازه  حذف خواهد شد و امکان بازگرداندن کارت وجود نخواهد داشت.",
-    "card-delete-suggest-archive": "شما می توانید کارت را به بایگانی منتقل کنید تا آن را از هیئت مدیره حذف کنید و فعالیت را حفظ کنید.",
+    "card-delete-pop": "همه اقدامات از این پردازه (خوراک) حذف خواهد شد و امکان بازگرداندن کارت وجود نخواهد داشت.",
+    "card-delete-suggest-archive": "شما میتوانید این کارت را به سطل بازیافت انتقال دهید تا از تخته پاک و فعالیت ها حفظ شود",
    "card-due": "تا",
    "card-due-on": "تا",
    "card-spent": "زمان صرف شده",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "برچسب ها",
    "cardMembersPopup-title": "اعضا",
    "cardMorePopup-title": "بیشتر",
-    "cardTemplatePopup-title": "Create template",
    "cards": "کارت‌ها",
    "cards-count": "کارت‌ها",
    "casSignIn": "ورود با استفاده از CAS",
@@ -178,45 +166,29 @@
    "clipboard": "ذخیره در حافظه ویا بردار-رهاکن",
    "close": "بستن",
    "close-board": "بستن برد",
-    "close-board-pop": "شما می توانید با کلیک کردن بر روی دکمه «بایگانی» از صفحه هدر، صفحه را بازگردانید.",
+    "close-board-pop": "شما با کلیک روی دکمه \"سطل زباله\" در قسمت خانه می توانید تخته را بازیابی کنید.",
    "color-black": "مشکی",
    "color-blue": "آبی",
-    "color-crimson": "قرمز",
-    "color-darkgreen": "سبز تیره",
-    "color-gold": "طلایی",
-    "color-gray": "خاکستری",
    "color-green": "سبز",
-    "color-indigo": "نیلی",
    "color-lime": "لیمویی",
-    "color-magenta": "ارغوانی",
-    "color-mistyrose": "صورتی روشن",
-    "color-navy": "لاجوردی",
    "color-orange": "نارنجی",
-    "color-paleturquoise": "فیروزه‌ای کدر",
-    "color-peachpuff": "هلویی",
    "color-pink": "صورتی",
-    "color-plum": "بنفش کدر",
    "color-purple": "بنفش",
    "color-red": "قرمز",
-    "color-saddlebrown": "کاکائویی",
-    "color-silver": "نقره‌ای",
    "color-sky": "آبی آسمانی",
-    "color-slateblue": "آبی فولادی",
-    "color-white": "سفید",
    "color-yellow": "زرد",
-    "unset-color": "بازنشانی",
    "comment": "نظر",
    "comment-placeholder": "درج نظر",
    "comment-only": "فقط نظر",
    "comment-only-desc": "فقط می‌تواند روی کارت‌ها نظر دهد.",
-    "no-comments": "هیچ کامنتی موجود نیست",
-    "no-comments-desc": "نظرات و فعالیت ها را نمی توان دید.",
+    "no-comments": "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": "ارتباط دادن کارت",
-    "searchElementPopup-title": "جستجو",
+    "searchCardPopup-title": "جستجوی کارت",
    "copyCardPopup-title": "کپی کارت",
    "copyChecklistToManyCardsPopup-title": "کپی قالب کارت به کارت‌های متعدد",
    "copyChecklistToManyCardsPopup-instructions": "عنوان و توضیحات کارت مقصد در این قالب JSON",
@@ -300,7 +272,7 @@
    "filter-on-desc": "شما صافی ـFilterـ برای کارتهای تخته را روشن کرده اید. جهت ویرایش کلیک نمایید.",
    "filter-to-selection": "صافی ـFilterـ برای موارد انتخابی",
    "advanced-filter-label": "صافی پیشرفته",
-    "advanced-filter-description": "فیلتر پیشرفته اجازه می دهد تا برای نوشتن رشته حاوی اپراتورهای زیر: ==! = <=> = && || () یک فضای به عنوان یک جداساز بین اپراتورها استفاده می شود. با تایپ کردن نام ها و مقادیر آنها می توانید برای تمام زمینه های سفارشی فیلتر کنید. به عنوان مثال: Field1 == Value1. نکته: اگر فیلدها یا مقادیر حاوی فضاها باشند، شما باید آنها را به یک نقل قول کپسول کنید. برای مثال: 'فیلد 1' == 'مقدار 1'. برای تک تک کاراکترهای کنترل (\\\\) که می توانید از آنها استفاده کنید، می توانید از \\ استفاده کنید. به عنوان مثال: Field1 == I \\ 'm. همچنین شما می توانید شرایط مختلف را ترکیب کنید. برای مثال: F1 == V1 || F1 == V2. به طور معمول همه اپراتورها از چپ به راست تفسیر می شوند. شما می توانید سفارش را با قرار دادن براکت تغییر دهید. برای مثال: F1 == V1 && (F2 == V2 || F2 == V3). همچنین می توانید فیلدهای متنی را با استفاده از regex جستجو کنید: F1 == /Tes.*/i",
+    "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": "عدم نمایش پیامهای سیستمی",
@@ -311,20 +283,18 @@
    "import-board": "وارد کردن تخته",
    "import-board-c": "وارد کردن تخته",
    "import-board-title-trello": "وارد کردن تخته از Trello",
-    "import-board-title-wekan": "بارگذاری برد ها از آخرین خروجی",
-    "import-sandstorm-backup-warning": "قبل از بررسی این داده ها را از صفحه اصلی صادر شده یا Trello وارد نمیکنید این دانه دوباره باز می شود و یا دوباره باز می شود، یا برد را پیدا نمی کنید، این بدان معنی است که از دست دادن اطلاعات.",
+    "import-board-title-wekan": "وارد کردن تخته از Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "از Trello",
-    "from-wekan": "از آخرین خروجی",
+    "from-wekan": "از Wekan",
    "import-board-instruction-trello": "در Trello-ی خود  به 'Menu'، 'More'، 'Print'، 'Export to JSON رفته و متن نهایی را دراینجا وارد نمایید.",
-    "import-board-instruction-wekan": "در هیئت مدیره خود، به 'Menu' بروید، سپس 'Export Board'، و متن را در فایل دانلود شده کپی کنید.",
-    "import-board-instruction-about-errors": "اگر هنگام بازگردانی با خطا مواجه شدید بعضی اوقات بازگردانی انجام می شود و تمامی برد ها در داخل صفحه All Boards هستند",
+    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "اطلاعات Json معتبر خود را اینجا وارد کنید.",
    "import-map-members": "نگاشت اعضا",
-    "import-members-map": "برد ها بازگردانده شده تعدادی کاربر دارند . لطفا کاربر های که می خواهید را انتخاب نمایید",
+    "import-members-map": "تعدادی عضو در تخته وارد شده می باشد. لطفا کاربرانی که باید وارد نرم افزار بشوند را مشخص کنید.",
    "import-show-user-mapping": "بررسی نقشه کاربران",
-    "import-user-select": "کاربر فعلی خود را انتخاب نمایید اگر میخواهیپ بعنوان کاربر باشد",
-    "importMapMembersAddPopup-title": "انتخاب کاربر",
+    "import-user-select": "کاربری از نرم افزار را که می خواهید بعنوان این عضو جایگزین شود را انتخاب کنید.",
+    "importMapMembersAddPopup-title": "انتخاب کاربر Wekan",
    "info": "نسخه",
    "initials": "تخصیصات اولیه",
    "invalid-date": "تاریخ نامعتبر",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "ارجاع به این کارت",
-    "list-archive-cards": "انتقال تمامی کارت های این لیست به آرشیو",
-    "list-archive-cards-pop": "این کارتباعث حذف تمامی کارت های این لیست از برد می شود . برای مشاهده کارت ها در آرشیو و برگرداندن آنها به برد بر بروی \"Menu\">\"Archive\" کلیک نمایید",
+    "list-archive-cards": "همه‌ کارت‌های این لیست را به بازیافتی انتقال بده",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "انتقال تمام کارت های این لیست",
    "list-select-cards": "انتخاب تمام کارت های این لیست",
-    "set-color-list": "انتخاب رنگ",
    "listActionPopup-title": "لیست اقدامات",
    "swimlaneActionPopup-title": "Swimlane Actions",
-    "swimlaneAddPopup-title": "اضافه کردن مسیر شناور",
    "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": "شما می توانید لیست را به آرشیو انتقال دهید تا آن را از برد حذف نمایید و فعالیت های خود را حفظ نمایید",
+    "list-delete-suggest-archive": "با انتقال سیاهه به سطل ذباله می‌توانید ضمن حفظ فعالیت، سیاهه را از تخته حذف کنید.",
    "lists": "لیست ها",
    "swimlanes": "Swimlanes",
    "log-out": "خروج",
@@ -375,9 +343,9 @@
    "muted-info": "شما هیچگاه از تغییرات این تخته مطلع نخواهید شد",
    "my-boards": "تخته‌های من",
    "name": "نام",
-    "no-archived-cards": "هیچ کارتی در آرشیو موجود نمی باشد",
-    "no-archived-lists": "هیچ لیستی در آرشیو موجود نمی باشد",
-    "no-archived-swimlanes": "هیچ مسیری در آرشیو موجود نمی باشد",
+    "no-archived-cards": "کارتی در سطل ذباله نیست.",
+    "no-archived-lists": "سیاهه‌ای در سطل ذباله نیست.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "بدون نتیجه",
    "normal": "عادی",
    "normal-desc": "امکان نمایش و تنظیم کارت بدون امکان تغییر تنظیمات",
@@ -413,7 +381,7 @@
    "restore": "بازیابی",
    "save": "ذخیره",
    "search": "جستجو",
-    "rules": "قوانین",
+    "rules": "Rules",
    "search-cards": "جستجو در میان عناوین و توضیحات در این تخته",
    "search-example": "متن مورد جستجو؟",
    "select-color": "انتخاب رنگ",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "تصویر ارسال شد",
    "username": "نام کاربری",
    "view-it": "مشاهده",
-    "warn-list-archived": "اخطار:این کارت در یک لیست در آرشیو موجود می باشد",
+    "warn-list-archived": "هشدار: این کارت در سیاهه‌ای داخل سطح ذباله است",
    "watch": "دیده بانی",
    "watching": "درحال دیده بانی",
    "watching-info": "شما از هر تغییری دراین تخته آگاه خواهید شد",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "پایه ای ها",
    "welcome-list2": "پیشرفته",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "چه کاری می خواهید انجام دهید؟",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "فرستادن رایانامه آزمایشی به خود",
    "invitation-code": "کد دعوت نامه",
    "email-invite-register-subject": "__inviter__ برای شما دعوت نامه ارسال کرده است",
-    "email-invite-register-text": "__user__ عزیز,\n\n__inviter__ شما را به این برد دعوت کرده است.\n\nلطفا روی لینک زیر کلیک نمایید:\n__url__\n\nو کد معرفی شما: __icode__\n\nبا تشکر.",
-    "email-smtp-test-subject": "SMTP تست ایمیل",
+    "email-invite-register-text": "__User__ عزیز \nکاربر __inviter__ شما را به عضویت در Wekan برای همکاری دعوت کرده است.\nلطفا لینک زیر را دنبال کنید،\n __url__\nکد دعوت شما __icode__ می باشد.\n باتشکر",
+    "email-smtp-test-subject": "رایانامه SMTP آزمایشی از Wekan",
    "email-smtp-test-text": "با موفقیت، یک رایانامه را فرستادید",
    "error-invitation-code-not-exist": "چنین کد دعوتی یافت نشد",
    "error-notAuthorized": "شما مجاز به دیدن این صفحه نیستید.",
    "outgoing-webhooks": "Outgoing Webhooks",
    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "boardCardTitlePopup-title": "فیلتر موضوع کارت",
    "new-outgoing-webhook": "New Outgoing Webhook",
    "no-name": "(ناشناخته)",
+    "Wekan_version": "نسخه Wekan",
    "Node_version": "نسخه Node ",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "روزه‌ها",
    "hours": "ساعت",
    "minutes": "دقیقه",
    "seconds": "ثانیه",
-    "show-field-on-card": "این رشته را در کارت نمایش بده",
-    "automatically-field-on-card": "اتوماتیک این رشته را در همه ی کارت ها اضافه کن",
-    "showLabel-field-on-card": "نمایش نام رشته در کارت های کوچک",
+    "show-field-on-card": "Show this field on card",
    "yes": "بله",
    "no": "خیر",
    "accounts": "حساب‌ها",
@@ -534,89 +496,82 @@
    "card-end-on": "پایان در",
    "editCardReceivedDatePopup-title": "تغییر تاریخ رسید",
    "editCardEndDatePopup-title": "تغییر تاریخ پایان",
-    "setCardColorPopup-title": "انتخاب رنگ",
-    "setCardActionsColorPopup-title": "انتخاب کردن رنگ",
-    "setSwimlaneColorPopup-title": "انتخاب کردن رنگ",
-    "setListColorPopup-title": "انتخاب کردن رنگ",
    "assigned-by": "محول شده توسط",
    "requested-by": "تقاضا شده توسط",
-    "board-delete-notice": "حذف دائمی است شما تمام لیست ها، کارت ها و اقدامات مرتبط با این برد را از دست خواهید داد.",
-    "delete-board-confirm-popup": "تمام لیست ها، کارت ها، برچسب ها و فعالیت ها حذف خواهند شد و شما نمی توانید محتوای برد را بازیابی کنید. هیچ واکنشی وجود ندارد",
+    "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-subtasks-board": "Subtasks for __board__ board",
    "default": "پیش‌فرض",
    "queue": "صف",
-    "subtask-settings": "تنظیمات ریزکارها",
-    "boardSubtaskSettingsPopup-title": "تنظیمات ریزکار های برد",
-    "show-subtasks-field": "کارت می تواند ریزکار داشته باشد",
-    "deposit-subtasks-board": "افزودن ریزکار به برد:",
-    "deposit-subtasks-list": "لیست برای ریزکار های افزوده شده",
-    "show-parent-in-minicard": "نمایش خانواده در ریز کارت",
-    "prefix-with-full-path": "پیشوند با مسیر کامل",
-    "prefix-with-parent": "پیشوند با خانواده",
-    "subtext-with-full-path": "زیرنویس با مسیر کامل",
-    "subtext-with-parent": "زیرنویس با خانواده",
-    "change-card-parent": "تغییرخانواده کارت",
-    "parent-card": "کارت خانواده",
-    "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": "اضافه کردن فیلتر",
-    "r-moved-to": "انتقال به",
-    "r-moved-from": "انتقال از",
-    "r-archived": "انتقال به آرشیو",
-    "r-unarchived": "بازگردانی از آرشیو",
-    "r-a-card": "کارت",
-    "r-when-a-label-is": "زمانی که لیبل هست",
-    "r-when-the-label-is": "زمانی که لیبل هست",
-    "r-list-name": "نام لیست",
-    "r-when-a-member": "زمانی که کاربر هست",
-    "r-when-the-member": "زمانی که کاربر",
-    "r-name": "نام",
-    "r-when-a-attach": "زمانی که ضمیمه",
-    "r-when-a-checklist": "زمانی که چک لیست هست",
-    "r-when-the-checklist": "زمانی که چک لیست",
-    "r-completed": "تمام شده",
-    "r-made-incomplete": "تمام نشده",
-    "r-when-a-item": "زمانی که چک لیست ایتم هست",
-    "r-when-the-item": "زمانی که چک لیست ایتم",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "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": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show 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",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
+    "r-a-card": "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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
    "r-checked": "انتخاب شده",
    "r-unchecked": "لغو انتخاب",
    "r-move-card-to": "انتقال کارت به",
    "r-top-of": "بالای",
    "r-bottom-of": "پایین",
    "r-its-list": "لیست خود",
-    "r-archive": "انتقال به آرشیو",
-    "r-unarchive": "بازگردانی از آرشیو",
+    "r-archive": "انتقال به بازیافتی",
+    "r-unarchive": "بازگردانی از سطل زباله",
    "r-card": "کارت",
    "r-add": "افزودن",
    "r-remove": "حذف",
    "r-label": "برچسب",
    "r-member": "عضو",
    "r-remove-all": "حذف همه کاربران از کارت",
-    "r-set-color": "انتخاب رنگ به",
    "r-checklist": "چک لیست",
    "r-check-all": "انتخاب همه",
    "r-uncheck-all": "لغو انتخاب همه",
@@ -637,13 +592,10 @@
    "r-d-send-email-to": "به",
    "r-d-send-email-subject": "عنوان",
    "r-d-send-email-message": "پیام",
-    "r-d-archive": "انتقال کارت به آرشیو",
-    "r-d-unarchive": "بازگردانی کارت از آرشیو",
+    "r-d-archive": "انتقال کارت به سطل زباله",
+    "r-d-unarchive": "بازگردانی کارت از سطل زباله",
    "r-d-add-label": "افزودن برچسب",
    "r-d-remove-label": "حذف برچسب",
-    "r-create-card": "ساخت کارت جدید",
-    "r-in-list": "در لیست",
-    "r-in-swimlane": "در مسیرِ شناور",
    "r-d-add-member": "افزودن عضو",
    "r-d-remove-member": "حذف عضو",
    "r-d-remove-all-member": "حذف تمامی کاربران",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "از چک لیست",
    "r-d-add-checklist": "افزودن چک لیست",
    "r-d-remove-checklist": "حذف چک لیست",
-    "r-by": "توسط",
-    "r-add-checklist": "افزودن چک لیست",
-    "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",
@@ -669,12 +613,5 @@
    "authentication-method": "متد اعتبارسنجی",
    "authentication-type": "نوع اعتبارسنجی",
    "custom-product-name": "نام سفارشی محصول",
-    "layout": "لایه",
-    "hide-logo": "مخفی سازی نماد",
-    "add-custom-html-after-body-start": "افزودن کد های HTML بعد از  <body> شروع",
-    "add-custom-html-before-body-end": "افزودن کد های HTML قبل از  </body> پایان",
-    "error-undefined": "یک اشتباه رخ داده شده است",
-    "error-ldap-login": "هنگام تلاش برای ورود به یک خطا رخ داد",
-    "display-authentication-method": "نمایش نوع اعتبارسنجی",
-    "default-authentication-method": "نوع اعتبارسنجی پیشفرض"
+    "layout": "لایه"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Hyväksy",
-    "act-activity-notify": "Toimintailmoitus",
-    "act-addAttachment": "lisätty liite __attachment__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-deleteAttachment": "poistettu liite __attachment__ kortilla __card__ listalla __list__ swimlanella  __swimlane__ taululla __board__",
-    "act-addSubtask": "lisätty alitehtävä __subtask__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-addLabel": "Lisätty tunniste __label__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-removeLabel": "Poistettu tunniste __label__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-addChecklistItem": "lisätty tarkistuslistan kohta __checklistItem__ tarkistuslistalle __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-removeChecklist": "poistettu tarkistuslista __checklist__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-removeChecklistItem": "poistettu tarkistuslistan kohta __checklistItem__ tarkistuslistalta __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-checkedItem": "ruksattu __checklistItem__ tarkistuslistalla __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-uncheckedItem": "poistettu ruksi __checklistItem__ tarkistuslistalta __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-completeChecklist": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-uncompleteChecklist": "tehty ei valmistuneeksi tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-addComment": "kommentoitu kortilla __card__: __comment__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-createBoard": "luotu taulu __board__",
-    "act-createCard": "luotu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
-    "act-createCustomField": "luotu mukautettu kenttä __customField__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-createList": "lisätty lista __list__ taululle __board__",
-    "act-addBoardMember": "lisätty jäsen __member__ taululle __board__",
-    "act-archivedBoard": "Taulu __board__ siirretty Arkistoon",
-    "act-archivedCard": "Kortti __card__ listalla __list__ swimlanella __swimlane__ taululla __board__ siirretty Arkistoon",
-    "act-archivedList": "Lista __list__ swimlanella __swimlane__ taululla __board__ siirretty Arkistoon",
-    "act-archivedSwimlane": "Swimlane __swimlane__ taululla __board__ siirretty Arkistoon",
-    "act-importBoard": "tuotu taulu __board__",
-    "act-importCard": "tuotu kortti  __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
-    "act-importList": "tuotu lista __list__ swimlanelle __swimlane__ taululla __board__",
-    "act-joinMember": "lisätty jäsen __member__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-moveCard": "siirretty kortti __card__ listasta __oldList__ swimlanella __oldSwimlane__ taululla __oldBoard__ listalle __list__ swimlanella __swimlane__ taululla __board__",
-    "act-removeBoardMember": "poistettu jäsen __member__ taululta __board__",
-    "act-restoredCard": "palautettu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
-    "act-unjoinMember": "poistettu jäsen __member__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Toimintailmoitus",
+    "act-addAttachment": "liitetty __attachment__ kortille __card__",
+    "act-addSubtask": "lisätty alitehtävä __checklist__ kortille __card__",
+    "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__",
+    "act-addChecklistItem": "lisätty kohta __checklistItem__ tarkistuslistaan __checklist__ kortilla __card__",
+    "act-addComment": "kommentoitu __card__: __comment__",
+    "act-createBoard": "luotu __board__",
+    "act-createCard": "lisätty __card__ listalle __list__",
+    "act-createCustomField": "luotu mukautettu kenttä __customField__",
+    "act-createList": "lisätty __list__ taululle __board__",
+    "act-addBoardMember": "lisätty __member__ taululle __board__",
+    "act-archivedBoard": "__board__ siirretty roskakoriin",
+    "act-archivedCard": "__card__ siirretty roskakoriin",
+    "act-archivedList": "__list__ siirretty roskakoriin",
+    "act-archivedSwimlane": "__swimlane__ siirretty roskakoriin",
+    "act-importBoard": "tuotu __board__",
+    "act-importCard": "tuotu __card__",
+    "act-importList": "tuotu __list__",
+    "act-joinMember": "lisätty __member__ kortille __card__",
+    "act-moveCard": "siirretty __card__ listalta __oldList__ listalle __list__",
+    "act-removeBoardMember": "poistettu __member__ taululta __board__",
+    "act-restoredCard": "palautettu __card__ taululle __board__",
+    "act-unjoinMember": "poistettu __member__ kortilta __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Toimet",
    "activities": "Toimet",
    "activity": "Toiminta",
    "activity-added": "lisätty %s kohteeseen %s",
-    "activity-archived": "%s siirretty Arkistoon",
+    "activity-archived": "%s siirretty roskakoriin",
    "activity-attached": "liitetty %s kohteeseen %s",
    "activity-created": "luotu %s",
    "activity-customfield-created": "luotu mukautettu kenttä %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "poistettu ruksi %s tarkistuslistassa %s / %s",
    "activity-checklist-added": "lisätty tarkistuslista kortille %s",
    "activity-checklist-removed": "poistettu tarkistuslista kohteesta %s",
-    "activity-checklist-completed": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "activity-checklist-completed": "saatu valmiíksi tarkistuslista %s / %s",
    "activity-checklist-uncompleted": "ei saatu valmiiksi tarkistuslista %s / %s",
    "activity-checklist-item-added": "lisäsi kohdan tarkistuslistaan '%s' kortilla %s",
    "activity-checklist-item-removed": "poistettu tarkistuslistan kohta '%s' / %s",
    "add": "Lisää",
    "activity-checked-item-card": "ruksattu %s tarkistuslistassa %s",
    "activity-unchecked-item-card": "poistettu ruksi %s tarkistuslistassa %s",
-    "activity-checklist-completed-card": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "activity-checklist-completed-card": "valmistui tarkistuslista %s",
    "activity-checklist-uncompleted-card": "ei valmistunut tarkistuslista %s",
    "add-attachment": "Lisää liite",
    "add-board": "Lisää taulu",
@@ -87,22 +78,20 @@
    "and-n-other-card": "Ja __count__ muu kortti",
    "and-n-other-card_plural": "Ja __count__ muuta korttia",
    "apply": "Käytä",
-    "app-is-offline": "Ladataan, odota. Sivun uudelleenlataus aiheuttaa tietojen menettämisen. Jos lataaminen ei toimi, tarkista että palvelin ei ole pysähtynyt.",
-    "archive": "Siirrä Arkistoon",
-    "archive-all": "Siirrä kaikki Arkistoon",
-    "archive-board": "Siirrä taulu Arkistoon",
-    "archive-card": "Siirrä kortti Arkistoon",
-    "archive-list": "Siirrä lista Arkistoon",
-    "archive-swimlane": "Siirrä Swimlane Arkistoon",
-    "archive-selection": "Siirrä valinta Arkistoon",
-    "archiveBoardPopup-title": "Siirrä taulu Arkistoon?",
-    "archived-items": "Arkisto",
-    "archived-boards": "Taulut Arkistossa",
+    "app-is-offline": "Wekan latautuu, odota. Sivun uudelleenlataus aiheuttaa tietojen menettämisen. Jos Wekan ei lataudu, tarkista että Wekan palvelin ei ole pysähtynyt.",
+    "archive": "Siirrä roskakoriin",
+    "archive-all": "Siirrä kaikki roskakoriin",
+    "archive-board": "Siirrä taulu roskakoriin",
+    "archive-card": "Siirrä kortti roskakoriin",
+    "archive-list": "Siirrä lista roskakoriin",
+    "archive-swimlane": "Siirrä Swimlane roskakoriin",
+    "archive-selection": "Siirrä valinta roskakoriin",
+    "archiveBoardPopup-title": "Siirrä taulu roskakoriin?",
+    "archived-items": "Roskakori",
+    "archived-boards": "Taulut roskakorissa",
    "restore-board": "Palauta taulu",
-    "no-archived-boards": "Ei tauluja Arkistossa",
-    "archives": "Arkisto",
-    "template": "Malli",
-    "templates": "Mallit",
+    "no-archived-boards": "Ei tauluja roskakorissa",
+    "archives": "Roskakori",
    "assign-member": "Valitse jäsen",
    "attached": "liitetty",
    "attachment": "Liitetiedosto",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Nimeä taulu uudelleen",
    "boardChangeVisibilityPopup-title": "Muokkaa näkyvyyttä",
    "boardChangeWatchPopup-title": "Muokkaa seuraamista",
-    "boardMenuPopup-title": "Taulu asetukset",
+    "boardMenuPopup-title": "Taulu valikko",
    "boards": "Taulut",
    "board-view": "Taulu näkymä",
    "board-view-cal": "Kalenteri",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listat",
    "bucket-example": "Kuten “Laatikko lista” esimerkiksi",
    "cancel": "Peruuta",
-    "card-archived": "Tämä kortti on siirretty Arkistoon.",
-    "board-archived": "Tämä taulu on siirretty Arkistoon.",
+    "card-archived": "Tämä kortti on siirretty roskakoriin.",
+    "board-archived": "Tämä taulu on siirretty roskakoriin.",
    "card-comments-title": "Tässä kortissa on %s kommenttia.",
    "card-delete-notice": "Poistaminen on lopullista. Menetät kaikki toimet jotka on liitetty tähän korttiin.",
    "card-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja et tule pystymään uudelleenavaamaan korttia. Tätä ei voi peruuttaa.",
-    "card-delete-suggest-archive": "Voit siirtää kortin Arkistoon poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
+    "card-delete-suggest-archive": "Voit siirtää kortin roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
    "card-due": "Erääntyy",
    "card-due-on": "Erääntyy",
    "card-spent": "Käytetty aika",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Tunnisteet",
    "cardMembersPopup-title": "Jäsenet",
    "cardMorePopup-title": "Lisää",
-    "cardTemplatePopup-title": "Luo malli",
    "cards": "Kortit",
    "cards-count": "korttia",
    "casSignIn": "CAS kirjautuminen",
@@ -178,33 +166,17 @@
    "clipboard": "Leikepöytä tai raahaa ja pudota",
    "close": "Sulje",
    "close-board": "Sulje taulu",
-    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Arkisto” painiketta taululistan yläpalkista.",
+    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Roskakori” painiketta taululistan yläpalkista.",
    "color-black": "musta",
    "color-blue": "sininen",
-    "color-crimson": "karmiininpunainen",
-    "color-darkgreen": "tummanvihreä",
-    "color-gold": "kulta",
-    "color-gray": "harmaa",
    "color-green": "vihreä",
-    "color-indigo": "syvän sininen",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "vaaleanpunainen ruusu",
-    "color-navy": "laivastonsininen",
    "color-orange": "oranssi",
-    "color-paleturquoise": "vaalean turkoosi",
-    "color-peachpuff": "persikanpunainen",
    "color-pink": "vaaleanpunainen",
-    "color-plum": "luumunvärinen",
    "color-purple": "violetti",
    "color-red": "punainen",
-    "color-saddlebrown": "satulanruskea",
-    "color-silver": "hopea",
    "color-sky": "taivas",
-    "color-slateblue": "liuskekivi sininen",
-    "color-white": "valkoinen",
    "color-yellow": "keltainen",
-    "unset-color": "Peru väri",
    "comment": "Kommentti",
    "comment-placeholder": "Kirjoita kommentti",
    "comment-only": "Vain kommentointi",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Oletko varma että haluat poistaa tarkistuslistan?",
    "copy-card-link-to-clipboard": "Kopioi kortin linkki leikepöydälle",
    "linkCardPopup-title": "Linkitä kortti",
-    "searchElementPopup-title": "Etsi",
+    "searchCardPopup-title": "Etsi kortti",
    "copyCardPopup-title": "Kopioi kortti",
    "copyChecklistToManyCardsPopup-title": "Kopioi tarkistuslistan malli monille korteille",
    "copyChecklistToManyCardsPopup-instructions": "Kohde korttien otsikot ja kuvaukset JSON muodossa",
@@ -311,20 +283,18 @@
    "import-board": "tuo taulu",
    "import-board-c": "Tuo taulu",
    "import-board-title-trello": "Tuo taulu Trellosta",
-    "import-board-title-wekan": "Tuo taulu edellisestä viennistä",
-    "import-sandstorm-backup-warning": "Älä poista tietoja joita toit alkuperäisestä viennistä tai Trellosta ennenkuin tarkistat onnistuuko sulkea ja avata tämä jyvä uudelleen, vai näkyykö Board not found virhe, joka tarkoittaa tietojen häviämistä.",
+    "import-board-title-wekan": "Tuo taulu Wekanista",
    "import-sandstorm-warning": "Tuotu taulu poistaa kaikki olemassaolevan taulun tiedot ja korvaa ne tuodulla taululla.",
    "from-trello": "Trellosta",
-    "from-wekan": "Edellisestä viennistä",
+    "from-wekan": "Wekanista",
    "import-board-instruction-trello": "Trello taulullasi, mene 'Menu', sitten 'More', 'Print and Export', 'Export JSON', ja kopioi tuloksena saamasi teksti",
-    "import-board-instruction-wekan": "Taulullasi, mene 'Valikko', sitten 'Vie taulu', ja kopioi teksti ladatusta tiedostosta.",
-    "import-board-instruction-about-errors": "Jos virheitä tulee taulua tuotaessa, joskus tuonti silti toimii, ja taulu on Kaikki taulut sivulla.",
+    "import-board-instruction-wekan": "Wekan taulullasi, mene 'Valikko', sitten 'Vie taulu', ja kopioi teksti ladatusta tiedostosta.",
    "import-json-placeholder": "Liitä kelvollinen JSON tietosi tähän",
    "import-map-members": "Vastaavat jäsenet",
-    "import-members-map": "Tuomallasi taululla on muutamia jäseniä. Ole hyvä ja valitse tuomiasi jäseniä vastaavat käyttäjäsi",
+    "import-members-map": "Tuomallasi taululla on muutamia jäseniä. Ole hyvä ja valitse tuomiasi jäseniä vastaavat  Wekan käyttäjät",
    "import-show-user-mapping": "Tarkasta vastaavat jäsenet",
-    "import-user-select": "Valitse olemassaoleva käyttäjä jota haluat käyttää tänä käyttäjänä",
-    "importMapMembersAddPopup-title": "Valitse käyttäjä",
+    "import-user-select": "Valitse Wekan käyttäjä jota haluat käyttää tänä käyttäjänä",
+    "importMapMembersAddPopup-title": "Valitse Wekan käyttäjä",
    "info": "Versio",
    "initials": "Nimikirjaimet",
    "invalid-date": "Virheellinen päivämäärä",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Haluatko varmasti poistua taululta __boardTitle__? Sinut poistetaan kaikista tämän taulun korteista.",
    "leaveBoardPopup-title": "Jää pois taululta ?",
    "link-card": "Linkki tähän korttiin",
-    "list-archive-cards": "Siirrä kaikki tämän listan kortit Arkistoon",
-    "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-archive-cards": "Siirrä kaikki tämän listan kortit roskakoriin",
+    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi roskakorissa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Roskakori”.",
    "list-move-cards": "Siirrä kaikki kortit tässä listassa",
    "list-select-cards": "Valitse kaikki kortit tässä listassa",
-    "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",
    "list-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja listan poistaminen on lopullista. Tätä ei pysty peruuttamaan.",
-    "list-delete-suggest-archive": "Voit siirtää listan Arkistoon poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
+    "list-delete-suggest-archive": "Voit siirtää listan roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
    "lists": "Listat",
    "swimlanes": "Swimlanet",
    "log-out": "Kirjaudu ulos",
@@ -375,9 +343,9 @@
    "muted-info": "Et saa koskaan ilmoituksia tämän taulun muutoksista",
    "my-boards": "Tauluni",
    "name": "Nimi",
-    "no-archived-cards": "Ei kortteja Arkistossa.",
-    "no-archived-lists": "Ei listoja Arkistossa.",
-    "no-archived-swimlanes": "Ei Swimlaneja Arkistossa.",
+    "no-archived-cards": "Ei kortteja roskakorissa.",
+    "no-archived-lists": "Ei listoja roskakorissa.",
+    "no-archived-swimlanes": "Ei Swimlaneja roskakorissa.",
    "no-results": "Ei tuloksia",
    "normal": "Normaali",
    "normal-desc": "Voi nähdä ja muokata kortteja. Ei voi muokata asetuksia.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Profiilikuva lähetetty",
    "username": "Käyttäjätunnus",
    "view-it": "Näytä se",
-    "warn-list-archived": "varoitus: tämä kortti on Arkistossa olevassa listassa",
+    "warn-list-archived": "varoitus: tämä kortti on roskakorissa olevassa listassa",
    "watch": "Seuraa",
    "watching": "Seurataan",
    "watching-info": "Sinulle ilmoitetaan tämän taulun muutoksista",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Merkkipaalu 1",
    "welcome-list1": "Perusasiat",
    "welcome-list2": "Edistynyt",
-    "card-templates-swimlane": "Kortti mallit",
-    "list-templates-swimlane": "Lista mallit",
-    "board-templates-swimlane": "Taulu mallit",
    "what-to-do": "Mitä haluat tehdä?",
    "wipLimitErrorPopup-title": "Virheellinen WIP-raja",
    "wipLimitErrorPopup-dialog-pt1": "Tässä listassa olevien tehtävien määrä on korkeampi kuin asettamasi WIP-raja.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Lähetä testi sähköposti itsellesi",
    "invitation-code": "Kutsukoodi",
    "email-invite-register-subject": "__inviter__ lähetti sinulle kutsun",
-    "email-invite-register-text": "Hei __user__,\n\n__inviter__ kutsuu sinut mukaan kanban taulun käyttöön.\n\nOle hyvä ja seuraa allaolevaa linkkiä:\n__url__\n\nJa kutsukoodisi on: __icode__\n\nKiitos.",
-    "email-smtp-test-subject": "SMTP testi sähköposti",
+    "email-invite-register-text": "Hei __user__,\n\n__inviter__ kutsuu sinut mukaan Wekan ohjelman käyttöön.\n\nOle hyvä ja seuraa allaolevaa linkkiä:\n__url__\n\nJa kutsukoodisi on: __icode__\n\nKiitos.",
+    "email-smtp-test-subject": "SMTP testi sähköposti Wekanista",
    "email-smtp-test-text": "Olet onnistuneesti lähettänyt sähköpostin",
    "error-invitation-code-not-exist": "Kutsukoodi ei ole olemassa",
    "error-notAuthorized": "Sinulla ei ole oikeutta tarkastella tätä sivua.",
    "outgoing-webhooks": "Lähtevät Webkoukut",
    "outgoingWebhooksPopup-title": "Lähtevät Webkoukut",
-    "boardCardTitlePopup-title": "Kortin otsikko suodatin",
    "new-outgoing-webhook": "Uusi lähtevä Webkoukku",
    "no-name": "(Tuntematon)",
+    "Wekan_version": "Wekan versio",
    "Node_version": "Node versio",
    "OS_Arch": "Käyttöjärjestelmän arkkitehtuuri",
    "OS_Cpus": "Käyttöjärjestelmän CPU määrä",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Käyttöjärjestelmän muistin kokonaismäärä",
    "OS_Type": "Käyttöjärjestelmän tyyppi",
    "OS_Uptime": "Käyttöjärjestelmä ollut käynnissä",
-    "days": "päivää",
    "hours": "tuntia",
    "minutes": "minuuttia",
    "seconds": "sekuntia",
    "show-field-on-card": "Näytä tämä kenttä kortilla",
-    "automatically-field-on-card": "Luo kenttä automaattisesti kaikille korteille",
-    "showLabel-field-on-card": "Näytä kentän tunniste minikortilla",
    "yes": "Kyllä",
    "no": "Ei",
    "accounts": "Tilit",
@@ -534,10 +496,6 @@
    "card-end-on": "Loppuu",
    "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
    "editCardEndDatePopup-title": "Vaihda loppumispäivää",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Poista sääntö",
    "r-new-rule-name": "Uuden säännön otsikko",
    "r-no-rules": "Ei sääntöjä",
-    "r-when-a-card": "Kun kortti",
-    "r-is": "on",
-    "r-is-moved": "on siirretty",
-    "r-added-to": "lisätty kohteeseen",
+    "r-when-a-card-is": "Kun kortti on",
+    "r-added-to": "Lisätty kohteeseen",
    "r-removed-from": "Poistettu kohteesta",
    "r-the-board": "taulu",
    "r-list": "lista",
-    "set-filter": "Aseta suodatin",
    "r-moved-to": "Siirretty kohteeseen",
    "r-moved-from": "Siirretty kohteesta",
-    "r-archived": "Siirretty Arkistoon",
-    "r-unarchived": "Palautettu Arkistosta",
+    "r-archived": "Siirretty roskakoriin",
+    "r-unarchived": "Palautettu roskakorista",
    "r-a-card": "kortti",
    "r-when-a-label-is": "Kun tunniste on",
    "r-when-the-label-is": "Kun tunniste on",
-    "r-list-name": "listan nimi",
+    "r-list-name": "Listan nimi",
    "r-when-a-member": "Kun jäsen on",
    "r-when-the-member": "Kun käyttäjä",
    "r-name": "nimi",
+    "r-is": "on",
    "r-when-a-attach": "Kun liitetiedosto",
    "r-when-a-checklist": "Kun tarkistuslista on",
    "r-when-the-checklist": "Kun tarkistuslista",
@@ -605,18 +561,17 @@
    "r-checked": "Ruksattu",
    "r-unchecked": "Poistettu ruksi",
    "r-move-card-to": "Siirrä kortti kohteeseen",
-    "r-top-of": "Ylimmäiseksi",
-    "r-bottom-of": "Alimmaiseksi",
+    "r-top-of": "Päällä kohteen",
+    "r-bottom-of": "Pohjalla kohteen",
    "r-its-list": "sen lista",
-    "r-archive": "Siirrä Arkistoon",
-    "r-unarchive": "Palauta Arkistosta",
+    "r-archive": "Siirrä roskakoriin",
+    "r-unarchive": "Palauta roskakorista",
    "r-card": "kortti",
    "r-add": "Lisää",
    "r-remove": "Poista",
    "r-label": "tunniste",
    "r-member": "jäsen",
    "r-remove-all": "Poista kaikki jäsenet kortilta",
-    "r-set-color": "Aseta väriksi",
    "r-checklist": "tarkistuslista",
    "r-check-all": "Ruksaa kaikki",
    "r-uncheck-all": "Poista ruksi kaikista",
@@ -637,13 +592,10 @@
    "r-d-send-email-to": "vastaanottajalle",
    "r-d-send-email-subject": "aihe",
    "r-d-send-email-message": "viesti",
-    "r-d-archive": "Siirrä kortti Arkistoon",
-    "r-d-unarchive": "Palauta kortti Arkistosta",
+    "r-d-archive": "Siirrä kortti roskakoriin",
+    "r-d-unarchive": "Palauta kortti roskakorista",
    "r-d-add-label": "Lisää tunniste",
    "r-d-remove-label": "Poista tunniste",
-    "r-create-card": "Luo uusi kortti",
-    "r-in-list": "listassa",
-    "r-in-swimlane": "swimlanessa",
    "r-d-add-member": "Lisää jäsen",
    "r-d-remove-member": "Poista jäsen",
    "r-d-remove-all-member": "Poista kaikki jäsenet",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "tarkistuslistasta",
    "r-d-add-checklist": "Lisää tarkistuslista",
    "r-d-remove-checklist": "Poista tarkistuslista",
-    "r-by": "mennessä",
-    "r-add-checklist": "Lisää tarkistuslista",
-    "r-with-items": "kohteiden kanssa",
-    "r-items-list": "kohde1,kohde2,kohde3",
-    "r-add-swimlane": "Lisää swimlane",
-    "r-swimlane-name": "swimlanen nimi",
-    "r-board-note": "Huom: jätä kenttä tyhjäksi täsmätäksesi jokaiseen mahdolliseen arvoon.",
-    "r-checklist-note": "Huom: tarkistuslistan kohteet täytyy kirjoittaa pilkulla eroteltuina.",
    "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -669,12 +613,5 @@
    "authentication-method": "Kirjautumistapa",
    "authentication-type": "Kirjautumistyyppi",
    "custom-product-name": "Mukautettu tuotenimi",
-    "layout": "Ulkoasu",
-    "hide-logo": "Piilota Logo",
-    "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",
-    "display-authentication-method": "Näytä kirjautumistapa",
-    "default-authentication-method": "Oletus kirjautumistapa"
+    "layout": "Ulkoasu"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Accepter",
-    "act-activity-notify": "Notification d'activité",
-    "act-addAttachment": "a ajouté la pièce jointe __attachment__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-deleteAttachment": "a supprimé la pièce jointe __attachment__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-addSubtask": "a ajouté la sous-tâche __checklist__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-addLabel": "a ajouté l'étiquette __label__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-removeLabel": "a enlevé l'étiquette __label__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-addChecklist": "a ajouté la checklist __checklist__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-removeChecklist": "a supprimé la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-removeChecklistItem": "a supprimé l'élément __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-checkedItem": "a coché __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-uncheckedItem": "a décoché __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-completeChecklist": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-uncompleteChecklist": "a rendu incomplet la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-addComment": "a commenté la carte __card__ : __comment__ dans la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-createBoard": "a créé le tableau __board__",
-    "act-createCard": "a créé la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-createCustomField": "a créé le champ personnalisé __customField__ pour la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-createList": "a ajouté la liste __list__ au tableau __board__",
-    "act-addBoardMember": "a ajouté le participant __member__ au tableau __board__",
-    "act-archivedBoard": "Le tableau __board__ a été déplacé vers les archives",
-    "act-archivedCard": "Carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__ archivée",
-    "act-archivedList": "Liste __list__ du couloir __swimlane__ du tableau __board__ archivée",
-    "act-archivedSwimlane": "Couloir __swimlane__ du tableau __board__ archivé",
-    "act-importBoard": "a importé le tableau __board__",
-    "act-importCard": "a importé la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-importList": "a importé la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-joinMember": "a ajouté le participant __member__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-moveCard": "a déplacé la carte __card__ de la liste __oldList__ du couloir __oldSwimlane__ du tableau __oldBoard__ vers la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-removeBoardMember": "a supprimé le participant __member__ du tableau __board__",
-    "act-restoredCard": "a restauré la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-unjoinMember": "a supprimé le participant __member__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Notification d'activité",
+    "act-addAttachment": "a joint __attachment__ à __card__",
+    "act-addSubtask": "a ajouté une sous-tâche __checklist__ à __card__",
+    "act-addChecklist": "a ajouté la checklist __checklist__ à __card__",
+    "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de __card__",
+    "act-addComment": "a commenté __card__ : __comment__",
+    "act-createBoard": "a créé __board__",
+    "act-createCard": "a ajouté __card__ à __list__",
+    "act-createCustomField": "a créé le champ personnalisé __customField__",
+    "act-createList": "a ajouté __list__ à __board__",
+    "act-addBoardMember": "a ajouté __member__ à __board__",
+    "act-archivedBoard": "__board__ a été déplacé vers la corbeille",
+    "act-archivedCard": "__card__ a été déplacée vers la corbeille",
+    "act-archivedList": "__list__ a été déplacée vers la corbeille",
+    "act-archivedSwimlane": "__swimlane__ a été déplacé vers la corbeille",
+    "act-importBoard": "a importé __board__",
+    "act-importCard": "a importé __card__",
+    "act-importList": "a importé __list__",
+    "act-joinMember": "a ajouté __member__ à __card__",
+    "act-moveCard": "a déplacé __card__ de __oldList__ à __list__",
+    "act-removeBoardMember": "a retiré __member__ de __board__",
+    "act-restoredCard": "a restauré __card__ dans __board__",
+    "act-unjoinMember": "a retiré __member__ de __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Actions",
    "activities": "Activités",
    "activity": "Activité",
    "activity-added": "a ajouté %s à %s",
-    "activity-archived": "%s a été archivé",
+    "activity-archived": "%s a été déplacé vers la corbeille",
    "activity-attached": "a attaché %s à %s",
    "activity-created": "a créé %s",
    "activity-customfield-created": "a créé le champ personnalisé %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "a décoché %s dans la checklist %s de %s",
    "activity-checklist-added": "a ajouté une checklist à %s",
    "activity-checklist-removed": "a supprimé une checklist de %s",
-    "activity-checklist-completed": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "activity-checklist-completed": "a complété la checklist %s de %s",
    "activity-checklist-uncompleted": "a rendu incomplète la checklist %s de %s",
    "activity-checklist-item-added": "a ajouté un élément à la checklist '%s' dans %s",
    "activity-checklist-item-removed": "a supprimé une checklist de '%s' dans %s",
    "add": "Ajouter",
    "activity-checked-item-card": "a coché %s dans la checklist %s",
    "activity-unchecked-item-card": "a décoché %s dans la checklist %s",
-    "activity-checklist-completed-card": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "activity-checklist-completed-card": "a complété la checklist %s",
    "activity-checklist-uncompleted-card": "a rendu incomplète la checklist %s",
    "add-attachment": "Ajouter une pièce jointe",
    "add-board": "Ajouter un tableau",
@@ -87,22 +78,20 @@
    "and-n-other-card": "Et __count__ autre carte",
    "and-n-other-card_plural": "Et __count__ autres cartes",
    "apply": "Appliquer",
-    "app-is-offline": "Chargement en cours, veuillez patienter. Vous risquez de perdre des données si vous rechargez la page. Si le chargement échoue, veuillez vérifier que le serveur n'est pas arrêté.",
-    "archive": "Archiver",
-    "archive-all": "Tout archiver",
-    "archive-board": "Archiver le tableau",
-    "archive-card": "Archiver la carte",
-    "archive-list": "Archiver la liste",
-    "archive-swimlane": "Archiver le couloir",
-    "archive-selection": "Archiver la sélection",
-    "archiveBoardPopup-title": "Archiver le tableau ?",
-    "archived-items": "Archiver",
-    "archived-boards": "Tableaux archivés",
+    "app-is-offline": "Chargement en cours, veuillez patienter. Vous risquez de perdre des données si vous rechargez la page. Si le chargement échoue, veuillez vérifier l'état du serveur Wekan.",
+    "archive": "Déplacer vers la corbeille",
+    "archive-all": "Tout déplacer vers la corbeille",
+    "archive-board": "Déplacer le tableau vers la corbeille",
+    "archive-card": "Déplacer la carte vers la corbeille",
+    "archive-list": "Déplacer la liste vers la corbeille",
+    "archive-swimlane": "Déplacer le couloir vers la corbeille",
+    "archive-selection": "Déplacer la sélection vers la corbeille",
+    "archiveBoardPopup-title": "Déplacer le tableau vers la corbeille ?",
+    "archived-items": "Corbeille",
+    "archived-boards": "Tableaux dans la corbeille",
    "restore-board": "Restaurer le tableau",
-    "no-archived-boards": "Aucun tableau archivé.",
-    "archives": "Archiver",
-    "template": "Modèle",
-    "templates": "Modèles",
+    "no-archived-boards": "Aucun tableau dans la corbeille.",
+    "archives": "Corbeille",
    "assign-member": "Affecter un membre",
    "attached": "joint",
    "attachment": "Pièce jointe",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Renommer le tableau",
    "boardChangeVisibilityPopup-title": "Changer la visibilité",
    "boardChangeWatchPopup-title": "Modifier le suivi",
-    "boardMenuPopup-title": "Paramètres du tableau",
+    "boardMenuPopup-title": "Menu du tableau",
    "boards": "Tableaux",
    "board-view": "Vue du tableau",
    "board-view-cal": "Calendrier",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listes",
    "bucket-example": "Comme « todo list » par exemple",
    "cancel": "Annuler",
-    "card-archived": "Cette carte est archivée",
-    "board-archived": "Ce tableau est archivé",
+    "card-archived": "Cette carte est déplacée vers la corbeille.",
+    "board-archived": "Ce tableau a été déplacé dans la Corbeille.",
    "card-comments-title": "Cette carte a %s commentaires.",
    "card-delete-notice": "La suppression est permanente. Vous perdrez toutes les actions associées à cette carte.",
    "card-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser cette carte. Cette action est irréversible.",
-    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers les archives afin de l'enlever du tableau tout en préservant l'activité.",
+    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers la corbeille afin de l'enlever du tableau tout en préservant l'activité.",
    "card-due": "À échéance",
    "card-due-on": "Échéance le",
    "card-spent": "Temps passé",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Étiquettes",
    "cardMembersPopup-title": "Membres",
    "cardMorePopup-title": "Plus",
-    "cardTemplatePopup-title": "Créer un modèle",
    "cards": "Cartes",
    "cards-count": "Cartes",
    "casSignIn": "Se connecter avec CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Presse-papier ou glisser-déposer",
    "close": "Fermer",
    "close-board": "Fermer le tableau",
-    "close-board-pop": "Vous pouvez restaurer le tableau en cliquant sur le bouton « Archives » depuis le menu en entête.",
+    "close-board-pop": "Vous pourrez restaurer le tableau en cliquant le bouton « Corbeille » en entête.",
    "color-black": "noir",
    "color-blue": "bleu",
-    "color-crimson": "rouge cramoisi",
-    "color-darkgreen": "vert foncé",
-    "color-gold": "or",
-    "color-gray": "gris",
    "color-green": "vert",
-    "color-indigo": "indigo",
    "color-lime": "citron vert",
-    "color-magenta": "magenta",
-    "color-mistyrose": "rose brumeux",
-    "color-navy": "bleu marin",
    "color-orange": "orange",
-    "color-paleturquoise": "azurin",
-    "color-peachpuff": "beige pêche",
    "color-pink": "rose",
-    "color-plum": "prune",
    "color-purple": "violet",
    "color-red": "rouge",
-    "color-saddlebrown": "brun cuir",
-    "color-silver": "argent",
    "color-sky": "ciel",
-    "color-slateblue": "bleu ardoise",
-    "color-white": "blanc",
    "color-yellow": "jaune",
-    "unset-color": "Enlever",
    "comment": "Commenter",
    "comment-placeholder": "Écrire un commentaire",
    "comment-only": "Commentaire uniquement",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist ?",
    "copy-card-link-to-clipboard": "Copier le lien vers la carte dans le presse-papier",
    "linkCardPopup-title": "Lier une Carte",
-    "searchElementPopup-title": "Chercher",
+    "searchCardPopup-title": "Chercher une Carte",
    "copyCardPopup-title": "Copier la carte",
    "copyChecklistToManyCardsPopup-title": "Copier le modèle de checklist vers plusieurs cartes",
    "copyChecklistToManyCardsPopup-instructions": "Titres et descriptions des cartes de destination dans ce format JSON",
@@ -311,20 +283,18 @@
    "import-board": "importer un tableau",
    "import-board-c": "Importer un tableau",
    "import-board-title-trello": "Importer le tableau depuis Trello",
-    "import-board-title-wekan": "Importer le tableau depuis l'export précédent",
-    "import-sandstorm-backup-warning": "Ne supprimez pas les données que vous importez du tableau exporté d'origine ou de Trello avant de vérifier que la graine peut se fermer et s'ouvrir à nouveau, ou qu'une erreur \"Tableau introuvable\" survient, sinon vous perdrez vos données.",
+    "import-board-title-wekan": "Importer un tableau depuis Wekan",
    "import-sandstorm-warning": "Le tableau importé supprimera toutes les données du tableau et les remplacera avec celles du tableau importé.",
    "from-trello": "Depuis Trello",
-    "from-wekan": "Depuis un export précédent",
+    "from-wekan": "Depuis Wekan",
    "import-board-instruction-trello": "Dans votre tableau Trello, allez sur 'Menu', puis sur 'Plus', 'Imprimer et exporter', 'Exporter en JSON' et copiez le texte du résultat",
-    "import-board-instruction-wekan": "Dans votre tableau, allez dans 'Menu', puis 'Exporter un tableau', et copier le texte du fichier téléchargé.",
-    "import-board-instruction-about-errors": "Si une erreur survient en important le tableau, il se peut que l'import ait fonctionné, et que le tableau se trouve sur la page \"Tous les tableaux\".",
+    "import-board-instruction-wekan": "Dans votre tableau Wekan, allez dans 'Menu', puis 'Exporter un tableau', et copier le texte du fichier téléchargé.",
    "import-json-placeholder": "Collez ici les données JSON valides",
    "import-map-members": "Faire correspondre aux membres",
-    "import-members-map": "Le tableau que vous venez d'importer contient des membres. Veuillez associer les membres que vous souhaitez importer à vos utilisateurs.",
+    "import-members-map": "Le tableau que vous venez d'importer contient des membres. Veuillez associer les membres que vous souhaitez importer à des utilisateurs de Wekan.",
    "import-show-user-mapping": "Contrôler l'association des membres",
-    "import-user-select": "Sélectionnez l'utilisateur existant que vous voulez associer à ce membre",
-    "importMapMembersAddPopup-title": "Sélectionner le membre",
+    "import-user-select": "Sélectionnez l'utilisateur Wekan que vous voulez associer à ce membre",
+    "importMapMembersAddPopup-title": "Sélectionner le membre Wekan",
    "info": "Version",
    "initials": "Initiales",
    "invalid-date": "Date invalide",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Êtes-vous sur de vouloir quitter __boardTitle__ ? Vous ne serez plus associé aux cartes de ce tableau.",
    "leaveBoardPopup-title": "Quitter le tableau",
    "link-card": "Lier à cette carte",
-    "list-archive-cards": "Déplacer toutes les cartes de cette liste vers les archives",
-    "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-archive-cards": "Déplacer toutes les cartes de la liste vers la corbeille",
+    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes dans la corbeille et les renvoyer vers le tableau, cliquez sur « Menu » puis « Corbeille ».",
    "list-move-cards": "Déplacer toutes les cartes de cette liste",
    "list-select-cards": "Sélectionner toutes les cartes de cette liste",
-    "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",
    "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cette action ne peut pas être annulée.",
-    "list-delete-suggest-archive": "Vous pouvez archiver une liste pour l'enlever du tableau tout en conservant son activité.",
+    "list-delete-suggest-archive": "Vous pouvez déplacer une liste vers la corbeille pour l'enlever du tableau tout en conservant son activité.",
    "lists": "Listes",
    "swimlanes": "Couloirs",
    "log-out": "Déconnexion",
@@ -375,9 +343,9 @@
    "muted-info": "Vous ne serez jamais averti des modifications effectuées dans ce tableau",
    "my-boards": "Mes tableaux",
    "name": "Nom",
-    "no-archived-cards": "Aucune carte archivée.",
-    "no-archived-lists": "Aucune liste archivée.",
-    "no-archived-swimlanes": "Aucun couloir archivé.",
+    "no-archived-cards": "Aucune carte dans la corbeille.",
+    "no-archived-lists": "Aucune liste dans la corbeille.",
+    "no-archived-swimlanes": "Aucun couloir dans la corbeille.",
    "no-results": "Pas de résultats",
    "normal": "Normal",
    "normal-desc": "Peut voir et modifier les cartes. Ne peut pas changer les paramètres.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar téléchargé",
    "username": "Nom d'utilisateur",
    "view-it": "Le voir",
-    "warn-list-archived": "attention : cette carte est dans une liste archivée",
+    "warn-list-archived": "Attention : cette carte est dans une liste se trouvant dans la corbeille",
    "watch": "Suivre",
    "watching": "Suivi",
    "watching-info": "Vous serez notifié de toute modification dans ce tableau",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Jalon 1",
    "welcome-list1": "Basiques",
    "welcome-list2": "Avancés",
-    "card-templates-swimlane": "Modèles de cartes",
-    "list-templates-swimlane": "Modèles de listes",
-    "board-templates-swimlane": "Modèles de tableaux",
    "what-to-do": "Que voulez-vous faire ?",
    "wipLimitErrorPopup-title": "Limite WIP invalide",
    "wipLimitErrorPopup-dialog-pt1": "Le nombre de cartes de cette liste est supérieur à la limite WIP que vous avez définie.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Envoyer un mail de test à vous-même",
    "invitation-code": "Code d'invitation",
    "email-invite-register-subject": "__inviter__ vous a envoyé une invitation",
-    "email-invite-register-text": "Cher __user__,\n\n__inviter__ vous invite à le rejoindre sur le tableau kanban pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
-    "email-smtp-test-subject": "Email de test SMTP",
+    "email-invite-register-text": "Cher __user__,\n\n__inviter__ vous invite à le rejoindre sur Wekan pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
+    "email-smtp-test-subject": "Email de test SMTP de Wekan",
    "email-smtp-test-text": "Vous avez envoyé un mail avec succès",
    "error-invitation-code-not-exist": "Ce code d'invitation n'existe pas.",
    "error-notAuthorized": "Vous n'êtes pas autorisé à accéder à cette page.",
    "outgoing-webhooks": "Webhooks sortants",
    "outgoingWebhooksPopup-title": "Webhooks sortants",
-    "boardCardTitlePopup-title": "Filtre par titre de carte",
    "new-outgoing-webhook": "Nouveau webhook sortant",
    "no-name": "(Inconnu)",
+    "Wekan_version": "Version de Wekan",
    "Node_version": "Version de Node",
    "OS_Arch": "OS Architecture",
    "OS_Cpus": "OS Nombre CPU",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Mémoire totale",
    "OS_Type": "Type d'OS",
    "OS_Uptime": "OS Durée de fonctionnement",
-    "days": "jours",
    "hours": "heures",
    "minutes": "minutes",
    "seconds": "secondes",
    "show-field-on-card": "Afficher ce champ sur la carte",
-    "automatically-field-on-card": "Créer automatiquement le champ sur toutes les cartes",
-    "showLabel-field-on-card": "Indiquer l'étiquette du champ sur la mini-carte",
    "yes": "Oui",
    "no": "Non",
    "accounts": "Comptes",
@@ -534,10 +496,6 @@
    "card-end-on": "Se termine le",
    "editCardReceivedDatePopup-title": "Modifier la date de réception",
    "editCardEndDatePopup-title": "Modifier la date de fin",
-    "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.",
@@ -576,18 +534,15 @@
    "r-delete-rule": "Supprimer la règle",
    "r-new-rule-name": "Titre de la nouvelle règle",
    "r-no-rules": "Pas de règles",
-    "r-when-a-card": "Quand une carte",
-    "r-is": "est",
-    "r-is-moved": "est déplacée",
-    "r-added-to": "est ajoutée à",
+    "r-when-a-card-is": "Quand une carte est",
+    "r-added-to": "Ajouté à",
    "r-removed-from": "Supprimé de",
    "r-the-board": "tableau",
    "r-list": "liste",
-    "set-filter": "Définir un filtre",
    "r-moved-to": "Déplacé vers",
    "r-moved-from": "Déplacé depuis",
-    "r-archived": "Archivé",
-    "r-unarchived": "Restauré depuis l'Archive",
+    "r-archived": "Déplacé vers la Corbeille",
+    "r-unarchived": "Restauré depuis la Corbeille",
    "r-a-card": "carte",
    "r-when-a-label-is": "Quand une étiquette est",
    "r-when-the-label-is": "Quand l'étiquette est",
@@ -595,6 +550,7 @@
    "r-when-a-member": "Quand un membre est",
    "r-when-the-member": "Quand le membre",
    "r-name": "nom",
+    "r-is": "est",
    "r-when-a-attach": "Quand une pièce jointe",
    "r-when-a-checklist": "Quand une checklist est",
    "r-when-the-checklist": "Quand la checklist",
@@ -608,15 +564,14 @@
    "r-top-of": "En haut de",
    "r-bottom-of": "En bas de",
    "r-its-list": "sa liste",
-    "r-archive": "Archiver",
-    "r-unarchive": "Restaurer depuis l'Archive",
+    "r-archive": "Déplacer vers la corbeille",
+    "r-unarchive": "Restaurer depuis la Corbeille",
    "r-card": "carte",
    "r-add": "Ajouter",
    "r-remove": "Supprimer",
    "r-label": "étiquette",
    "r-member": "membre",
    "r-remove-all": "Supprimer tous les membres de la carte",
-    "r-set-color": "Définir la couleur à",
    "r-checklist": "checklist",
    "r-check-all": "Tout cocher",
    "r-uncheck-all": "Tout décocher",
@@ -637,13 +592,10 @@
    "r-d-send-email-to": "à",
    "r-d-send-email-subject": "sujet",
    "r-d-send-email-message": "message",
-    "r-d-archive": "Archiver la carte",
-    "r-d-unarchive": "Restaurer la carte depuis l'Archive",
+    "r-d-archive": "Déplacer la carte vers la Corbeille",
+    "r-d-unarchive": "Restaurer la carte depuis la Corbeille",
    "r-d-add-label": "Ajouter une étiquette",
    "r-d-remove-label": "Supprimer l'étiquette",
-    "r-create-card": "Créer une nouvelle carte",
-    "r-in-list": "dans la liste",
-    "r-in-swimlane": "Dans le couloir",
    "r-d-add-member": "Ajouter un membre",
    "r-d-remove-member": "Supprimer un membre",
    "r-d-remove-all-member": "Supprimer tous les membres",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "de la checklist",
    "r-d-add-checklist": "Ajouter une checklist",
    "r-d-remove-checklist": "Supprimer la checklist",
-    "r-by": "par",
-    "r-add-checklist": "Ajouter une checklist",
-    "r-with-items": "avec les items",
-    "r-items-list": "item1, item2, item3",
-    "r-add-swimlane": "Ajouter un couloir",
-    "r-swimlane-name": "Nom du couloir",
-    "r-board-note": "Note : laisser le champ vide pour faire correspondre avec toutes les valeurs possibles.",
-    "r-checklist-note": "Note : les items de la checklist doivent être séparés par des virgules.",
    "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -669,12 +613,5 @@
    "authentication-method": "Méthode d'authentification",
    "authentication-type": "Type d'authentification",
    "custom-product-name": "Nom personnalisé",
-    "layout": "Interface",
-    "hide-logo": "Cacher le logo",
-    "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",
-    "display-authentication-method": "Afficher la méthode d'authentification",
-    "default-authentication-method": "Méthode d'authentification par défaut"
+    "layout": "Interface"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Aceptar",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] 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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Accións",
    "activities": "Actividades",
    "activity": "Actividade",
    "activity-added": "engadiuse %s a %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "created %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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": "Engadir",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Engadir anexo",
    "add-board": "Engadir taboleiro",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "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": "Arquivar",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restaurar taboleiro",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Arquivar",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Anexo",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Taboleiros",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listas",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancelar",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Etiquetas",
    "cardMembersPopup-title": "Membros",
    "cardMorePopup-title": "Máis",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Tarxetas",
    "cards-count": "Tarxetas",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "negro",
    "color-blue": "azul",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "verde",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "laranxa",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "rosa",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "vermello",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "celeste",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "amarelo",
-    "unset-color": "Unset",
    "comment": "Comentario",
    "comment-placeholder": "Escribir un comentario",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
+    "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",
@@ -311,20 +283,18 @@
    "import-board": "importar taboleiro",
    "import-board-c": "Importar taboleiro",
    "import-board-title-trello": "Importar taboleiro de 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": "Importar taboleiro de Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "De Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "De Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Iniciais",
    "invalid-date": "A data é incorrecta",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Listas",
    "swimlanes": "Swimlanes",
    "log-out": "Pechar a sesión",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "Nome",
-    "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Non hai resultados",
    "normal": "Normal",
    "normal-desc": "Pode ver e editar tarxetas. Non pode cambiar a configuración.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Nome de usuario",
    "view-it": "Velo",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Vixiar",
    "watching": "Vixiando",
    "watching-info": "Recibirá unha notificación sobre calquera cambio que se produza neste taboleiro",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Fundamentos",
    "welcome-list2": "Avanzado",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Que desexa facer?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Engadir",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,69 +1,60 @@
 {
    "accept": "אישור",
-    "act-activity-notify": "הודעת פעילות",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "נוסף פריט סימון __checklistItem__ לרשימת המטלות __checklist__ לכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-activity-notify": "[Wekan] הודעת פעילות",
+    "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": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "הלוח __board__ הועבר לארכיון",
-    "act-archivedCard": "הכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__ הועבר לארכיון",
-    "act-archivedList": "הרשימה __list__ במסלול __swimlane__ בלוח __board__ הועברה לארכיון",
-    "act-archivedSwimlane": "המסלול __swimlane__ בלוח __board__ הועבר לארכיון",
-    "act-importBoard": "הייבוא של הלוח __board__ הושלם",
-    "act-importCard": "הייבוא של הכרטיס __card__ לרשימה __list__ למסלול __swimlane__ ללוח __board__ הושלם",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "החבר __member__ נוסף לכרטיס __card__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
-    "act-moveCard": "הכרטיס __card__ הועבר מהרשימה __oldList__ במסלול __oldSwimlane__ בלוח __oldBoard__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
-    "act-removeBoardMember": "החבר __member__ הוסר מהלוח __board__",
-    "act-restoredCard": "הכרטיס __card__ שוחזר לרשימה __list__ למסלול __swimlane__ ללוח __board__",
-    "act-unjoinMember": "החבר __member__ הוסר מהכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
-    "act-withBoardTitle": "__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": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "פעולות",
    "activities": "פעילויות",
    "activity": "פעילות",
    "activity-added": "%s נוסף ל%s",
-    "activity-archived": "%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-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-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": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "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": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "רשימת המשימות %s הושלמה",
    "activity-checklist-uncompleted-card": "רשימת המשימות %s סומנה כבלתי מושלמת",
    "add-attachment": "הוספת קובץ מצורף",
    "add-board": "הוספת לוח",
@@ -87,22 +78,20 @@
    "and-n-other-card": "וכרטיס נוסף",
    "and-n-other-card_plural": "ו־__count__ כרטיסים נוספים",
    "apply": "החלה",
-    "app-is-offline": "בטעינה, נא להמתין. רענון הדף תוביל לאבדן מידע. אם הטעינה אורכת זמן רב מדי, מוטב לבדוק אם השרת מקוון.",
-    "archive": "העברה לארכיון",
-    "archive-all": "אחסן הכל בארכיון",
-    "archive-board": "העברת הלוח לארכיון",
-    "archive-card": "העברת הכרטיס לארכיון",
-    "archive-list": "העברת הרשימה לארכיון",
-    "archive-swimlane": "העברת מסלול לארכיון",
-    "archive-selection": "העברת הבחירה לארכיון",
-    "archiveBoardPopup-title": "להעביר לוח זה לארכיון?",
-    "archived-items": "להעביר לארכיון",
-    "archived-boards": "לוחות שנשמרו בארכיון",
+    "app-is-offline": "Wekan בטעינה, נא להמתין. רענון העמוד עשוי להוביל לאובדן מידע. אם הטעינה של Wekan נעצרה, נא לבדוק ששרת ה־Wekan לא נעצר.",
+    "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": "להעביר לארכיון",
-    "template": "תבנית",
-    "templates": "תבניות",
+    "no-archived-boards": "אין לוחות בסל המחזור",
+    "archives": "סל מחזור",
    "assign-member": "הקצאת חבר",
    "attached": "מצורף",
    "attachment": "קובץ מצורף",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "שינוי שם הלוח",
    "boardChangeVisibilityPopup-title": "שינוי מצב הצגה",
    "boardChangeWatchPopup-title": "שינוי הגדרת המעקב",
-    "boardMenuPopup-title": "הגדרות לוח",
+    "boardMenuPopup-title": "תפריט לוח",
    "boards": "לוחות",
    "board-view": "תצוגת לוח",
    "board-view-cal": "לוח שנה",
@@ -129,12 +118,12 @@
    "board-view-lists": "רשימות",
    "bucket-example": "כמו למשל „רשימת המשימות“",
    "cancel": "ביטול",
-    "card-archived": "כרטיס זה שמור בארכיון.",
-    "board-archived": "הלוח עבר לארכיון",
+    "card-archived": "כרטיס זה הועבר לסל המחזור",
+    "board-archived": "הלוח עבר לסל המחזור",
    "card-comments-title": "לכרטיס זה %s תגובות.",
    "card-delete-notice": "מחיקה היא סופית. כל הפעולות המשויכות לכרטיס זה תלכנה לאיוד.",
    "card-delete-pop": "כל הפעולות יוסרו מלוח הפעילות ולא תהיה אפשרות לפתוח מחדש את הכרטיס. אין דרך חזרה.",
-    "card-delete-suggest-archive": "על מנת להסיר כרטיסים מהלוח מבלי לאבד את היסטוריית הפעילות שלהם, ניתן לשמור אותם בארכיון.",
+    "card-delete-suggest-archive": "ניתן להעביר כרטיס לסל המחזור כדי להסיר אותו מהלוח ולשמר את הפעילות.",
    "card-due": "תאריך יעד",
    "card-due-on": "תאריך יעד",
    "card-spent": "זמן שהושקע",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "תוויות",
    "cardMembersPopup-title": "חברים",
    "cardMorePopup-title": "עוד",
-    "cardTemplatePopup-title": "יצירת תבנית",
    "cards": "כרטיסים",
    "cards-count": "כרטיסים",
    "casSignIn": "כניסה עם CAS",
@@ -171,40 +159,24 @@
    "changePasswordPopup-title": "החלפת ססמה",
    "changePermissionsPopup-title": "שינוי הרשאות",
    "changeSettingsPopup-title": "שינוי הגדרות",
-    "subtasks": "תת משימות",
+    "subtasks": "תתי משימות",
    "checklists": "רשימות",
    "click-to-star": "יש ללחוץ להוספת הלוח למועדפים.",
    "click-to-unstar": "יש ללחוץ להסרת הלוח מהמועדפים.",
    "clipboard": "לוח גזירים או גרירה ושחרור",
    "close": "סגירה",
    "close-board": "סגירת לוח",
-    "close-board-pop": "ניתן לשחזר את הלוח בלחיצה על כפתור „ארכיונים“ מהכותרת העליונה.",
+    "close-board-pop": "תהיה לך אפשרות להסיר את הלוח על ידי לחיצה על הכפתור „סל מחזור” מכותרת הבית.",
    "color-black": "שחור",
    "color-blue": "כחול",
-    "color-crimson": "שני",
-    "color-darkgreen": "ירוק כהה",
-    "color-gold": "זהב",
-    "color-gray": "אפור",
    "color-green": "ירוק",
-    "color-indigo": "אינדיגו",
    "color-lime": "ליים",
-    "color-magenta": "ארגמן",
-    "color-mistyrose": "ורד",
-    "color-navy": "כחול כהה",
    "color-orange": "כתום",
-    "color-paleturquoise": "טורקיז חיוור",
-    "color-peachpuff": "נשיפת אפרסק",
    "color-pink": "ורוד",
-    "color-plum": "שזיף",
    "color-purple": "סגול",
    "color-red": "אדום",
-    "color-saddlebrown": "חום אוכף",
-    "color-silver": "כסף",
    "color-sky": "תכלת",
-    "color-slateblue": "צפחה כחולה",
-    "color-white": "לבן",
    "color-yellow": "צהוב",
-    "unset-color": "בטל הגדרה",
    "comment": "לפרסם",
    "comment-placeholder": "כתיבת הערה",
    "comment-only": "תגובה בלבד",
@@ -216,14 +188,14 @@
    "confirm-checklist-delete-dialog": "למחוק את רשימת המשימות?",
    "copy-card-link-to-clipboard": "העתקת קישור הכרטיס ללוח הגזירים",
    "linkCardPopup-title": "קישור כרטיס",
-    "searchElementPopup-title": "חיפוש",
+    "searchCardPopup-title": "חיפוש כרטיס",
    "copyCardPopup-title": "העתק כרטיס",
    "copyChecklistToManyCardsPopup-title": "העתקת תבנית רשימת מטלות למגוון כרטיסים",
    "copyChecklistToManyCardsPopup-instructions": "כותרות ותיאורים של כרטיסי יעד בתצורת JSON זו",
    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"כותרת כרטיס ראשון\", \"description\":\"תיאור כרטיס ראשון\"}, {\"title\":\"כותרת כרטיס שני\",\"description\":\"תיאור כרטיס שני\"},{\"title\":\"כותרת כרטיס אחרון\",\"description\":\"תיאור כרטיס אחרון\"} ]",
    "create": "יצירה",
    "createBoardPopup-title": "יצירת לוח",
-    "chooseBoardSourcePopup-title": "יבוא לוח",
+    "chooseBoardSourcePopup-title": "ייבוא לוח",
    "createLabelPopup-title": "יצירת תווית",
    "createCustomField": "יצירת שדה",
    "createCustomFieldPopup-title": "יצירת שדה",
@@ -311,21 +283,19 @@
    "import-board": "ייבוא לוח",
    "import-board-c": "יבוא לוח",
    "import-board-title-trello": "ייבוא לוח מטרלו",
-    "import-board-title-wekan": "ייבוא לוח מייצוא קודם",
-    "import-sandstorm-backup-warning": "עדיף לא למחוק נתונים שייובאו מייצוא מקורי או מ־Trello בטרם בדיקה האם הגרעין הזה נסגר ונפתח שוב או אם מתקבלת שגיאה על כך שהלוח לא נמצא, משמעות הדבר היא אבדן מידע.",
+    "import-board-title-wekan": "ייבוא לוח מ־Wekan",
    "import-sandstorm-warning": "הלוח שייובא ימחק את כל הנתונים הקיימים בלוח ויחליף אותם בלוח שייובא.",
    "from-trello": "מ־Trello",
-    "from-wekan": "מייצוא קודם",
+    "from-wekan": "מ־Wekan",
    "import-board-instruction-trello": "בלוח הטרלו שלך, עליך ללחוץ על ‚תפריט‘, ואז על ‚עוד‘, ‚הדפסה וייצוא‘, ‚יצוא JSON‘ ולהעתיק את הטקסט שנוצר.",
-    "import-board-instruction-wekan": "בלוח שלך עליך לגשת אל ‚תפריט’, לאחר מכן ‚ייצוא לוח’ ואז להעתיק את הטקסט מהקובץ שהתקבל.",
-    "import-board-instruction-about-errors": "גם אם התקבלו שגיאות בעת יבוא לוח, ייתכן שהייבוא עבד. כדי לבדוק זאת, יש להיכנס ל„כל הלוחות”.",
+    "import-board-instruction-wekan": "בלוח ה־Wekan, יש לגשת אל ‚תפריט‘, לאחר מכן ‚יצוא לוח‘ ולהעתיק את הטקסט בקובץ שהתקבל.",
    "import-json-placeholder": "יש להדביק את נתוני ה־JSON התקינים לכאן",
    "import-map-members": "מיפוי חברים",
-    "import-members-map": "הלוחות המיובאים שלך מכילים חברים. נא למפות את החברים שברצונך לייבא למשתמשים שלך",
+    "import-members-map": "הלוחות המיובאים שלך מכילים חברים. נא למפות את החברים שברצונך לייבא למשתמשי Wekan",
    "import-show-user-mapping": "סקירת מיפוי חברים",
-    "import-user-select": "נא לבחור את המשתמש ב־Wekan אותו ברצונך למפות אל חבר זה",
-    "importMapMembersAddPopup-title": "בחירת משתמש",
-    "info": "גרסה",
+    "import-user-select": "נא לבחור את המשתמש ב־Wekan בו ברצונך להשתמש עבור חבר זה",
+    "importMapMembersAddPopup-title": "בחירת משתמש Wekan",
+    "info": "גרסא",
    "initials": "ראשי תיבות",
    "invalid-date": "תאריך שגוי",
    "invalid-time": "זמן שגוי",
@@ -343,19 +313,17 @@
    "leave-board-pop": "לעזוב את __boardTitle__? שמך יוסר מכל הכרטיסים שבלוח זה.",
    "leaveBoardPopup-title": "לעזוב לוח ?",
    "link-card": "קישור לכרטיס זה",
-    "list-archive-cards": "העברת כל הכרטיסים שברשימה זו לארכיון",
-    "list-archive-cards-pop": "כל הכרטיסים מרשימה זו יוסרו מהלוח. לצפייה בכרטיסים השמורים בארכיון ולהחזירם ללוח, ניתן ללחוץ על „תפריט” > „פריטים בארכיון”.",
+    "list-archive-cards": "להעביר את כל הכרטיסים לסל המחזור",
+    "list-archive-cards-pop": "פעולה זו תסיר את כל הכרטיסים שברשימה זו מהלוח. כדי לצפות בכרטיסים בסל המחזור ולהשיב אותם ללוח ניתן ללחוץ על „תפריט” > „סל מחזור”.",
    "list-move-cards": "העברת כל הכרטיסים שברשימה זו",
    "list-select-cards": "בחירת כל הכרטיסים שברשימה זו",
-    "set-color-list": "הגדרת צבע",
    "listActionPopup-title": "פעולות רשימה",
    "swimlaneActionPopup-title": "פעולות על מסלול",
-    "swimlaneAddPopup-title": "הוספת מסלול מתחת",
    "listImportCardPopup-title": "יבוא כרטיס מ־Trello",
    "listMorePopup-title": "עוד",
    "link-list": "קישור לרשימה זו",
    "list-delete-pop": "כל הפעולות תוסרנה מרצף הפעילות ולא תהיה לך אפשרות לשחזר את הרשימה. אין ביטול.",
-    "list-delete-suggest-archive": "ניתן לשמור רשימה בארכיון כדי להסיר אותה מהלוח ולשמור על היסטוריית הפעילות.",
+    "list-delete-suggest-archive": "ניתן להעביר רשימה לסל מחזור כדי להסיר אותה מהלוח ולשמר את הפעילות.",
    "lists": "רשימות",
    "swimlanes": "מסלולים",
    "log-out": "יציאה",
@@ -375,9 +343,9 @@
    "muted-info": "מעתה לא תתקבלנה אצלך התרעות על שינויים בלוח זה",
    "my-boards": "הלוחות שלי",
    "name": "שם",
-    "no-archived-cards": "אין כרטיסים בארכיון",
-    "no-archived-lists": "אין רשימות בארכיון",
-    "no-archived-swimlanes": "אין מסלולים בארכיון.",
+    "no-archived-cards": "אין כרטיסים בסל המחזור.",
+    "no-archived-lists": "אין רשימות בסל המחזור.",
+    "no-archived-swimlanes": "אין מסלולים בסל המחזור.",
    "no-results": "אין תוצאות",
    "normal": "רגיל",
    "normal-desc": "הרשאה לצפות ולערוך כרטיסים. לא ניתן לשנות הגדרות.",
@@ -443,7 +411,7 @@
    "overtime-hours": "שעות נוספות",
    "overtime": "שעות נוספות",
    "has-overtime-cards": "יש כרטיסי שעות נוספות",
-    "has-spenttime-cards": "יש כרטיסי זמן שהושקע",
+    "has-spenttime-cards": "ניצל את כרטיסי הזמן שהושקע",
    "time": "זמן",
    "title": "כותרת",
    "tracking": "מעקב",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "הועלתה תמונה משתמש",
    "username": "שם משתמש",
    "view-it": "הצגה",
-    "warn-list-archived": "אזהרה: כרטיס זה הוא חלק מרשימה שנמצאת בארכיון",
+    "warn-list-archived": "אזהרה: כרטיס זה נמצא ברשימה בסל המחזור",
    "watch": "לעקוב",
    "watching": "במעקב",
    "watching-info": "מעתה יגיעו אליך דיווחים על כל שינוי בלוח זה",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "ציון דרך 1",
    "welcome-list1": "יסודות",
    "welcome-list2": "מתקדם",
-    "card-templates-swimlane": "תבניות כרטיסים",
-    "list-templates-swimlane": "תבניות רשימות",
-    "board-templates-swimlane": "תבניות לוחות",
    "what-to-do": "מה ברצונך לעשות?",
    "wipLimitErrorPopup-title": "מגבלת „בעבודה” שגויה",
    "wipLimitErrorPopup-dialog-pt1": "מספר המשימות ברשימה זו גדולה ממגבלת הפריטים „בעבודה” שהגדרת.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "שליחת דוא״ל בדיקה לעצמך",
    "invitation-code": "קוד הזמנה",
    "email-invite-register-subject": "נשלחה אליך הזמנה מאת __inviter__",
-    "email-invite-register-text": " __user__, יקר/ה\n\n__inviter__ מזמין/ה אתכם לשיתוף פעולה בלוח הקנבן.\n\nאנא לחצו על הקישור הבא:\n__url__\n\nקוד ההזמנה הוא: __icode__\n\nתודה.",
-    "email-smtp-test-subject": "דוא״ל לבדיקת SMTP",
+    "email-invite-register-text": "__user__ היקר,\n\nקיבלת הזמנה מאת __inviter__ לשתף פעולה ב־Wekan.\n\nנא ללחוץ על הקישור:\n__url__\n\nקוד ההזמנה שלך הוא: __icode__\n\nתודה.",
+    "email-smtp-test-subject": "הודעת בדיקה דרך SMTP מאת Wekan",
    "email-smtp-test-text": "שלחת הודעת דוא״ל בהצלחה",
    "error-invitation-code-not-exist": "קוד ההזמנה אינו קיים",
    "error-notAuthorized": "אין לך הרשאה לצפות בעמוד זה.",
    "outgoing-webhooks": "קרסי רשת יוצאים",
    "outgoingWebhooksPopup-title": "קרסי רשת יוצאים",
-    "boardCardTitlePopup-title": "מסנן כותרת כרטיס",
    "new-outgoing-webhook": "קרסי רשת יוצאים חדשים",
    "no-name": "(לא ידוע)",
+    "Wekan_version": "גרסת Wekan",
    "Node_version": "גרסת Node",
    "OS_Arch": "ארכיטקטורת מערכת הפעלה",
    "OS_Cpus": "מספר מעבדים",
@@ -510,20 +475,17 @@
    "OS_Loadavg": "עומס ממוצע ",
    "OS_Platform": "מערכת הפעלה",
    "OS_Release": "גרסת מערכת הפעלה",
-    "OS_Totalmem": "סך כל הזיכרון (RAM)",
+    "OS_Totalmem": "סך הכל זיכרון (RAM)",
    "OS_Type": "סוג מערכת ההפעלה",
    "OS_Uptime": "זמן שעבר מאז האתחול האחרון",
-    "days": "ימים",
    "hours": "שעות",
    "minutes": "דקות",
    "seconds": "שניות",
    "show-field-on-card": "הצגת שדה זה בכרטיס",
-    "automatically-field-on-card": "הוספת שדה לכל הכרטיסים",
-    "showLabel-field-on-card": "הצגת תווית של השדה בכרטיס מוקטן",
    "yes": "כן",
    "no": "לא",
    "accounts": "חשבונות",
-    "accounts-allowEmailChange": "לאפשר שינוי דוא״ל",
+    "accounts-allowEmailChange": "אפשר שינוי דוא\"ל",
    "accounts-allowUserNameChange": "לאפשר שינוי שם משתמש",
    "createdAt": "נוצר ב",
    "verified": "עבר אימות",
@@ -534,10 +496,6 @@
    "card-end-on": "מועד הסיום",
    "editCardReceivedDatePopup-title": "החלפת מועד הקבלה",
    "editCardEndDatePopup-title": "החלפת מועד הסיום",
-    "setCardColorPopup-title": "הגדרת צבע",
-    "setCardActionsColorPopup-title": "בחירת צבע",
-    "setSwimlaneColorPopup-title": "בחירת צבע",
-    "setListColorPopup-title": "בחירת צבע",
    "assigned-by": "הוקצה על ידי",
    "requested-by": "התבקש על ידי",
    "board-delete-notice": "מחיקה היא לצמיתות. כל הרשימות, הכרטיבים והפעולות שקשורים בלוח הזה ילכו לאיבוד.",
@@ -545,7 +503,7 @@
    "boardDeletePopup-title": "למחוק את הלוח?",
    "delete-board": "מחיקת לוח",
    "default-subtasks-board": "תת־משימות עבור הלוח __board__",
-    "default": "בררת מחדל",
+    "default": "ברירת מחדל",
    "queue": "תור",
    "subtask-settings": "הגדרות תתי משימות",
    "boardSubtaskSettingsPopup-title": "הגדרות תת־משימות בלוח",
@@ -574,20 +532,17 @@
    "r-add-rule": "הוספת כלל",
    "r-view-rule": "הצגת כלל",
    "r-delete-rule": "מחיקת כל",
-    "r-new-rule-name": "שמו של הכלל החדש",
+    "r-new-rule-name": "New rule title",
    "r-no-rules": "אין כללים",
-    "r-when-a-card": "כאשר כרטיס",
-    "r-is": "הוא",
-    "r-is-moved": "מועבר",
+    "r-when-a-card-is": "כאשר כרטיס",
    "r-added-to": "נוסף אל",
    "r-removed-from": "מוסר מ־",
    "r-the-board": "הלוח",
    "r-list": "רשימה",
-    "set-filter": "הגדרת מסנן",
    "r-moved-to": "מועבר אל",
    "r-moved-from": "מועבר מ־",
-    "r-archived": "הועבר לארכיון",
-    "r-unarchived": "הוחזר מהארכיון",
+    "r-archived": "מועבר לסל המחזור",
+    "r-unarchived": "משוחזר מסל המחזור",
    "r-a-card": "כרטיס",
    "r-when-a-label-is": "כאשר תווית",
    "r-when-the-label-is": "כאשר התווית היא",
@@ -595,6 +550,7 @@
    "r-when-a-member": "כאשר חבר הוא",
    "r-when-the-member": "כאשר חבר",
    "r-name": "שם",
+    "r-is": "הוא",
    "r-when-a-attach": "כאשר קובץ מצורף",
    "r-when-a-checklist": "כאשר רשימת משימות",
    "r-when-the-checklist": "כאשר רשימת המשימות",
@@ -608,19 +564,18 @@
    "r-top-of": "ראש",
    "r-bottom-of": "תחתית",
    "r-its-list": "הרשימה שלו",
-    "r-archive": "העברה לארכיון",
-    "r-unarchive": "החזרה מהארכיון",
+    "r-archive": "העברה לסל המחזור",
+    "r-unarchive": "שחזור מסל המחזור",
    "r-card": "כרטיס",
    "r-add": "הוספה",
    "r-remove": "הסרה",
    "r-label": "תווית",
    "r-member": "חבר",
    "r-remove-all": "הסרת כל החברים מהכרטיס",
-    "r-set-color": "הגדרת צבע לכדי",
    "r-checklist": "רשימת משימות",
    "r-check-all": "לסמן הכול",
    "r-uncheck-all": "לבטל את הסימון",
-    "r-items-check": "פריטים ברשימת משימות",
+    "r-items-check": "items of checklist",
    "r-check": "סימון",
    "r-uncheck": "ביטול סימון",
    "r-item": "פריט",
@@ -637,13 +592,10 @@
    "r-d-send-email-to": "אל",
    "r-d-send-email-subject": "נושא",
    "r-d-send-email-message": "הודעה",
-    "r-d-archive": "העברת כרטיס לארכיון",
-    "r-d-unarchive": "החזרת כרטיס מהארכיון",
+    "r-d-archive": "העברת כרטיס לסל המחזור",
+    "r-d-unarchive": "שחזור כרטיס מסל המחזור",
    "r-d-add-label": "הוספת תווית",
    "r-d-remove-label": "הסרת תווית",
-    "r-create-card": "יצירת כרטיס חדש",
-    "r-in-list": "ברשימה",
-    "r-in-swimlane": "במסלול",
    "r-d-add-member": "הוספת חבר",
    "r-d-remove-member": "הסרת חבר",
    "r-d-remove-all-member": "הסרת כל החברים",
@@ -654,27 +606,12 @@
    "r-d-check-of-list": "של רשימת משימות",
    "r-d-add-checklist": "הוספת רשימת משימות",
    "r-d-remove-checklist": "הסרת רשימת משימות",
-    "r-by": "על ידי",
-    "r-add-checklist": "הוספת רשימת משימות",
-    "r-with-items": "עם פריטים",
-    "r-items-list": "פריט1,פריט2,פריט3",
-    "r-add-swimlane": "הוספת מסלול",
-    "r-swimlane-name": "שם המסלול",
-    "r-board-note": "לתשומת לבך: ניתן להשאיר את השדה ריק כדי ללכוד כל ערך אפשרי.",
-    "r-checklist-note": "לתשומת לבך: את פריטי רשימת הביצוע יש לכתוב בתצורת רשימה של ערכים המופרדים בפסיקים.",
    "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
    "cas": "CAS",
-    "authentication-method": "שיטת אימות",
-    "authentication-type": "סוג אימות",
-    "custom-product-name": "שם מותאם אישית למוצר",
-    "layout": "פריסה",
-    "hide-logo": "הסתרת לוגו",
-    "add-custom-html-after-body-start": "הוספת קוד HTML מותאם אישית לאחר ה־<body> הפותח.",
-    "add-custom-html-before-body-end": "הוספת קוד HTML מותאם אישית לפני ה־</body> הסוגר.",
-    "error-undefined": "מהו השתבש",
-    "error-ldap-login": "אירעה שגיאה בעת ניסיון הכניסה",
-    "display-authentication-method": "הצגת שיטת אימות",
-    "default-authentication-method": "שיטת אימות כבררת מחדל"
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "स्वीकार",
-    "act-activity-notify": "गतिविधि अधिसूचना",
-    "act-addAttachment": "अनुलग्नक जोड़ा __attachment__ कार्ड के लिए __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
-    "act-deleteAttachment": "हटाए गए अनुलग्नक __attachment__ कार्ड पर __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
-    "act-addSubtask": "जोड़ा उपकार्य __checklist__ को __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
-    "act-addLabel": "जोड़ा गया लेबल __label__ कार्ड के लिए __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] गतिविधि अधिसूचना",
+    "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": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "कार्रवाई",
    "activities": "गतिविधि",
    "activity": "क्रियाएँ",
    "activity-added": "जोड़ा गया %s से %s",
-    "activity-archived": "%sसंग्रह में ले जाया गया",
+    "activity-archived": "%s यह ले जाएँ और मिटाए",
    "activity-attached": "संलग्न %s से %s",
    "activity-created": "बनाया %s",
    "activity-customfield-created": "बनाया रिवाज क्षेत्र %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s of %s",
    "activity-checklist-added": "संकलित चिह्नांकन-सूची तक %s",
    "activity-checklist-removed": "हटा दिया एक चिह्नांकन-सूची से %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "पूर्ण चिह्नांकन-सूची %s of %s",
    "activity-checklist-uncompleted": "अपूर्ण चिह्नांकन-सूची %s of %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": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "पूर्ण चिह्नांकन-सूची %s",
    "activity-checklist-uncompleted-card": "अपूर्ण चिह्नांकन-सूची %s",
    "add-attachment": "संलग्न करें",
    "add-board": "बोर्ड जोड़ें",
@@ -87,22 +78,20 @@
    "and-n-other-card": "और __count__ other कार्ड",
    "and-n-other-card_plural": "और __count__ other कार्ड",
    "apply": "Apply",
-    "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": "संग्रह में कोई बोर्ड नहीं ।",
-    "archives": "पुरालेख",
-    "template": "खाका",
-    "templates": "खाका",
+    "app-is-offline": "Wekan लोड हो रहा है, कृपया प्रतीक्षा करें। पृष्ठ को रीफ्रेश करने से डेटा हानि होगी। यदि वीकन लोड नहीं होता है, तो कृपया जांचें कि वीकन सर्वर बंद नहीं हुआ है।",
+    "archive": "स्थानांतरित तक पुनः चक्र",
+    "archive-all": "स्थानांतरित संपूर्ण तक पुनः चक्र",
+    "archive-board": "स्थानांतरित बोर्ड तक पुनः चक्र",
+    "archive-card": "स्थानांतरित कार्ड तक पुनः चक्र",
+    "archive-list": "स्थानांतरित सूची तक पुनः चक्र",
+    "archive-swimlane": "स्थानांतरित तैरन तक पुनः चक्र",
+    "archive-selection": "चयन को मिटाए",
+    "archiveBoardPopup-title": "स्थानांतरित बोर्ड तक पुनः चक्र ?",
+    "archived-items": "पुनः चक्र",
+    "archived-boards": "बोर्डों अंदर में पुनः चक्र",
+    "restore-board": "Restore बोर्ड",
+    "no-archived-boards": "पुनः चक्र में कोई बोर्ड नहीं ।.",
+    "archives": "पुनः चक्र",
    "assign-member": "आवंटित सदस्य",
    "attached": "संलग्न",
    "attachment": "संलग्नक",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "बोर्ड का नाम बदलें",
    "boardChangeVisibilityPopup-title": "दृश्यता बदलें",
    "boardChangeWatchPopup-title": "बदलें वॉच",
-    "boardMenuPopup-title": "बोर्ड सेटिंग्स",
+    "boardMenuPopup-title": "बोर्ड मेनू",
    "boards": "बोर्डों",
    "board-view": "बोर्ड दृष्टिकोण",
    "board-view-cal": "तिथि-पत्र",
@@ -129,12 +118,12 @@
    "board-view-lists": "सूचियाँ",
    "bucket-example": "उदाहरण के लिए “बाल्टी सूची” की तरह",
    "cancel": "रद्द करें",
-    "card-archived": "यह कार्ड संग्रह करने के लिए ले जाया गया है ।",
-    "board-archived": "यह बोर्ड संग्रह करने के लिए ले जाया जाता है ।",
+    "card-archived": "यह कार्ड यह ले जाएँ और मिटाए.",
+    "board-archived": "यह बोर्ड यह ले जाएँ और मिटाए.",
    "card-comments-title": "इस कार्ड में %s टिप्पणी है।",
    "card-delete-notice": "हटाना स्थायी है। आप इस कार्ड से जुड़े सभी कार्यों को खो देंगे।",
    "card-delete-pop": "सभी कार्रवाइयां गतिविधि फ़ीड से निकाल दी जाएंगी और आप कार्ड को फिर से खोलने में सक्षम नहीं होंगे । कोई पूर्ववत् नहीं है ।",
-    "card-delete-suggest-archive": "आप एक कार्ड को बोर्ड से हटाने और गतिविधि को संरक्षित करने के लिए संग्रह में ले जा सकते हैं ।",
+    "card-delete-suggest-archive": "आप किसी कार्ड को पुनः चक्र में ले जा सकते है उसे बोर्ड से निकालने और गतिविधि को रक्षित करने के लिए ।",
    "card-due": "नियत",
    "card-due-on": "पर नियत",
    "card-spent": "समय बिताया",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "नामपत्र",
    "cardMembersPopup-title": "सदस्य",
    "cardMorePopup-title": "अतिरिक्त",
-    "cardTemplatePopup-title": "खाका बनाएं",
    "cards": "कार्ड्स",
    "cards-count": "कार्ड्स",
    "casSignIn": "सीएएस के साथ साइन इन करें",
@@ -178,33 +166,17 @@
    "clipboard": "क्लिपबोर्ड या खींचें और छोड़ें",
    "close": "बंद करे",
    "close-board": "बोर्ड बंद करे",
-    "close-board-pop": "आप होम हेडर से \"संग्रह\" बटन पर क्लिक करके बोर्ड को पुनर्स्थापित करने में सक्षम होंगे।",
+    "close-board-pop": "आप घर शीर्षक से “पुनः चक्र” बटन पर क्लिक करके बोर्ड को बहाल करने में सक्षम हो जाएगा ।",
    "color-black": "काला",
    "color-blue": "नीला",
-    "color-crimson": "गहरा लाल",
-    "color-darkgreen": "गहरा हरा",
-    "color-gold": "स्वर्ण",
-    "color-gray": "भूरे",
    "color-green": "हरा",
-    "color-indigo": "नील",
    "color-lime": "हल्का हरा",
-    "color-magenta": "मैजंटा",
-    "color-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": "white",
    "color-yellow": "पीला",
-    "unset-color": "Unset",
    "comment": "टिप्पणी",
    "comment-placeholder": "टिप्पणी लिखें",
    "comment-only": "केवल टिप्पणी करें",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "क्या आप वाकई जांचसूची हटाना चाहते हैं?",
    "copy-card-link-to-clipboard": "कॉपी कार्ड क्लिपबोर्ड करने के लिए लिंक",
    "linkCardPopup-title": "कार्ड कड़ी",
-    "searchElementPopup-title": "Search",
+    "searchCardPopup-title": "कार्ड खोज",
    "copyCardPopup-title": "कार्ड प्रतिलिपि",
    "copyChecklistToManyCardsPopup-title": "कई कार्ड के लिए जांचसूची खाके की प्रतिलिपि बनाएँ",
    "copyChecklistToManyCardsPopup-instructions": "इस JSON प्रारूप में गंतव्य कार्ड शीर्षक और विवरण",
@@ -311,20 +283,18 @@
    "import-board": "import बोर्ड",
    "import-board-c": "Import बोर्ड",
    "import-board-title-trello": "Import बोर्ड से 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": "Import बोर्ड से Wekan",
    "import-sandstorm-warning": "सूचित कर बोर्ड will मिटाएँ संपूर्ण existing data on बोर्ड और replace it साथ में  सूचित कर बोर्ड.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "import-board-instruction-trello": "In your Trello बोर्ड, go तक 'Menu', then 'More', 'Print और Export', 'Export JSON', और 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-board-instruction-wekan": "In your Wekan बोर्ड, go तक 'Menu', then 'Export बोर्ड', और copy the text अंदर में the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "import-map-members": "Map सदस्य",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Your  सूचित कर बोर्ड has some सदस्य. Please map the सदस्य you want तक import तक Wekan users",
    "import-show-user-mapping": "Re आलोकन सदस्य mapping",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "import-user-select": "Pick the Wekan user you want तक use as  यह सदस्य",
+    "importMapMembersAddPopup-title": "Select Wekan सदस्य",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want तक leave __boardTitle__? You हो जाएगा हटा दिया से संपूर्ण कार्ड इस पर बोर्ड.",
    "leaveBoardPopup-title": "Leave बोर्ड ?",
    "link-card": "Link तक यह कार्ड",
-    "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": "यह will हटा संपूर्ण the कार्ड अंदर में  यह सूची से the बोर्ड. तक  आलोकन कार्ड अंदर में पुनः चक्र  और bring them back तक the बोर्ड, click “Menu” > “पुनः चक्र”.",
    "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",
    "list-delete-pop": "All actions हो जाएगा हटा दिया से the activity feed और you won't be able तक 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": "You can स्थानांतरित एक सूची तक पुनः चक्र  तक हटा it से the बोर्ड और preserve the activity.",
    "lists": "Lists",
    "swimlanes": "तैरन",
    "log-out": "Log Out",
@@ -375,9 +343,9 @@
    "muted-info": "आप किसी भी परिवर्तन के अधिसूचित नहीं किया जाएगा अंदर में  यह बोर्ड",
    "my-boards": "My बोर्ड",
    "name": "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 कार्ड अंदर में पुनः चक्र .",
+    "no-archived-lists": "No lists अंदर में पुनः चक्र .",
+    "no-archived-swimlanes": "No swimlanes अंदर में पुनः चक्र .",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can  आलोकन और  संपादित करें कार्ड. Can't change  व्यवस्था.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "आलोकन it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning:  यह कार्ड is अंदर में  पुनः चक्र में एक सूची",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You हो जाएगा notified of any change अंदर में  यह बोर्ड",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "कार्ड का खाका",
-    "list-templates-swimlane": "सूची का खाका",
-    "board-templates-swimlane": "बोर्ड का खाका",
    "what-to-do": "What do you want तक do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks अंदर में  यह सूची is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send एक test email तक yourself",
    "invitation-code": "Invitation Code",
    "email-invite-register-subject": "__inviter__ प्रेषित 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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you तक Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nऔर your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email से Wekan",
    "email-smtp-test-text": "You have successfully प्रेषित an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "error-notAuthorized": "You are not authorized तक  आलोकन  यह page.",
    "outgoing-webhooks": "Outgoing Webhooks",
    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "New Outgoing Webhook",
    "no-name": "(Unknown)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show  यह field on कार्ड",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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 साथ में  यह बोर्ड.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "मिटाएँ rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "जब एक कार्ड is",
+    "r-added-to": "संकलित to",
    "r-removed-from": "हटा दिया from",
    "r-the-board": "the बोर्ड",
    "r-list": "list",
-    "set-filter": "Set Filter",
    "r-moved-to": "स्थानांतरित to",
    "r-moved-from": "स्थानांतरित from",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
+    "r-archived": "यह ले जाएँ और मिटाए",
+    "r-unarchived": "पुनर्स्थापित से पुनः चक्र",
    "r-a-card": "a कार्ड",
    "r-when-a-label-is": "जब एक नामपत्र है",
    "r-when-the-label-is": "जब नामपत्र है",
-    "r-list-name": "list name",
+    "r-list-name": "सूची name",
    "r-when-a-member": "जब एक सदस्य is",
    "r-when-the-member": "जब the सदस्य",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "जब an संलग्नक",
    "r-when-a-checklist": "जब एक चिह्नांकन-सूची is",
    "r-when-the-checklist": "जब the checklist",
@@ -608,15 +564,14 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "संग्रह में ले जाएं",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "स्थानांतरित तक पुनः चक्र",
+    "r-unarchive": "Restore से पुनः चक्र",
    "r-card": "कार्ड",
    "r-add": "जोड़ें",
    "r-remove": "Remove",
    "r-label": "label",
    "r-member": "member",
    "r-remove-all": "हटाएँ  संपूर्ण सदस्य से the कार्ड",
-    "r-set-color": "Set color to",
    "r-checklist": "checklist",
    "r-check-all": "Check all",
    "r-uncheck-all": "Uncheck all",
@@ -637,13 +592,10 @@
    "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": "Restore कार्ड से पुनः चक्र",
    "r-d-add-label": "जोड़ें label",
    "r-d-remove-label": "हटाएँ  label",
-    "r-create-card": "Create new card",
-    "r-in-list": "in list",
-    "r-in-swimlane": "in swimlane",
    "r-d-add-member": "जोड़ें सदस्य",
    "r-d-remove-member": "हटाएँ  सदस्य",
    "r-d-remove-all-member": "हटाएँ  संपूर्ण सदस्य",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "जोड़ें checklist",
    "r-d-remove-checklist": "हटाएँ  checklist",
-    "r-by": "by",
-    "r-add-checklist": "जोड़ें 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-when-a-card-is-moved": "जब एक कार्ड is स्थानांतरित तक another list",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Elfogadás",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Tevékenység értesítés",
+    "act-addAttachment": "__attachment__ mellékletet csatolt a kártyához: __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "__checklist__ ellenőrzőlistát adott hozzá a kártyához: __card__",
+    "act-addChecklistItem": "__checklistItem__ elemet adott hozzá a(z) __checklist__ ellenőrzőlistához ezen a kártyán: __card__",
+    "act-addComment": "hozzászólt a(z) __card__ kártyán: __comment__",
+    "act-createBoard": "létrehozta a táblát: __board__",
+    "act-createCard": "__card__ kártyát adott hozzá a listához: __list__",
+    "act-createCustomField": "létrehozta a(z) __customField__ egyéni listát",
+    "act-createList": "__list__ listát adott hozzá a táblához: __board__",
+    "act-addBoardMember": "__member__ tagot hozzáadta a táblához: __board__",
+    "act-archivedBoard": "A(z) __board__ tábla áthelyezve a lomtárba",
+    "act-archivedCard": "A(z) __card__ kártya áthelyezve a lomtárba",
+    "act-archivedList": "A(z) __list__ lista áthelyezve a lomtárba",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "importálta a táblát: __board__",
+    "act-importCard": "importálta a kártyát: __card__",
+    "act-importList": "importálta a listát: __list__",
+    "act-joinMember": "__member__ tagot hozzáadta a kártyához: __card__",
+    "act-moveCard": "áthelyezte a(z) __card__ kártyát: __oldList__ → __list__",
+    "act-removeBoardMember": "eltávolította __member__ tagot a tábláról: __board__",
+    "act-restoredCard": "visszaállította a(z) __card__ kártyát ide: __board__",
+    "act-unjoinMember": "eltávolította __member__ tagot a kártyáról: __card__",
+    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Műveletek",
    "activities": "Tevékenységek",
    "activity": "Tevékenység",
    "activity-added": "%s hozzáadva ehhez: %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s áthelyezve a lomtárba",
    "activity-attached": "%s mellékletet csatolt a kártyához: %s",
    "activity-created": "%s létrehozva",
    "activity-customfield-created": "létrehozta a(z) %s egyéni mezőt",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "ellenőrzőlista hozzáadva ehhez: %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "ellenőrzőlista elem hozzáadva ehhez: „%s”, ebben: %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Hozzáadás",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Melléklet hozzáadása",
    "add-board": "Tábla hozzáadása",
@@ -87,22 +78,20 @@
    "and-n-other-card": "És __count__ egyéb kártya",
    "and-n-other-card_plural": "És __count__ egyéb kártya",
    "apply": "Alkalmaz",
-    "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": "Archiválás",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "A Wekan betöltés alatt van, kérem várjon. Az oldal újratöltése adatvesztést okoz. Ha a Wekan nem töltődik be, akkor ellenőrizze, hogy a Wekan kiszolgáló nem állt-e le.",
+    "archive": "Lomtárba",
+    "archive-all": "Összes lomtárba helyezése",
+    "archive-board": "Tábla lomtárba helyezése",
+    "archive-card": "Kártya lomtárba helyezése",
+    "archive-list": "Lista lomtárba helyezése",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Kijelölés lomtárba helyezése",
+    "archiveBoardPopup-title": "Lomtárba helyezi a táblát?",
+    "archived-items": "Lomtár",
+    "archived-boards": "Lomtárban lévő táblák",
    "restore-board": "Tábla visszaállítása",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archiválás",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "Nincs tábla a lomtárban.",
+    "archives": "Lomtár",
    "assign-member": "Tag hozzárendelése",
    "attached": "csatolva",
    "attachment": "Melléklet",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Tábla átnevezése",
    "boardChangeVisibilityPopup-title": "Láthatóság megváltoztatása",
    "boardChangeWatchPopup-title": "Megfigyelés megváltoztatása",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Tábla menü",
    "boards": "Táblák",
    "board-view": "Tábla nézet",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Listák",
    "bucket-example": "Mint például „Bakancslista”",
    "cancel": "Mégse",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Ez a kártya a lomtárba került.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "Ez a kártya %s hozzászólást tartalmaz.",
    "card-delete-notice": "A törlés végleges. Az összes műveletet elveszíti, amely ehhez a kártyához tartozik.",
    "card-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz képes többé újra megnyitni a kártyát. Nincs visszaállítási lehetőség.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Esedékes",
    "card-due-on": "Esedékes ekkor",
    "card-spent": "Eltöltött idő",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Címkék",
    "cardMembersPopup-title": "Tagok",
    "cardMorePopup-title": "Több",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Kártyák",
    "cards-count": "Kártyák",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Vágólap vagy fogd és vidd",
    "close": "Bezárás",
    "close-board": "Tábla bezárása",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "fekete",
    "color-blue": "kék",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "zöld",
-    "color-indigo": "indigo",
    "color-lime": "citrus",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "narancssárga",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "rózsaszín",
-    "color-plum": "plum",
    "color-purple": "lila",
    "color-red": "piros",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "égszínkék",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "sárga",
-    "unset-color": "Unset",
    "comment": "Megjegyzés",
    "comment-placeholder": "Megjegyzés írása",
    "comment-only": "Csak megjegyzés",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Kártya hivatkozásának másolása a vágólapra",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Keresés",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "Kártya másolása",
    "copyChecklistToManyCardsPopup-title": "Ellenőrzőlista sablon másolása több kártyára",
    "copyChecklistToManyCardsPopup-instructions": "A célkártyák címe és a leírások ebben a JSON formátumban",
@@ -311,20 +283,18 @@
    "import-board": "tábla importálása",
    "import-board-c": "Tábla importálása",
    "import-board-title-trello": "Tábla importálása a Trello oldalról",
-    "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": "Tábla importálása a Wekan oldalról",
    "import-sandstorm-warning": "Az importált tábla törölni fogja a táblán lévő összes meglévő adatot, és kicseréli az importált táblával.",
    "from-trello": "A Trello oldalról",
-    "from-wekan": "From previous export",
+    "from-wekan": "A Wekan oldalról",
    "import-board-instruction-trello": "A Trello tábláján menjen a „Menü”, majd a „Több”, „Nyomtatás és exportálás”, „JSON exportálása” menüpontokra, és másolja ki az eredményül kapott szöveget.",
-    "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-board-instruction-wekan": "A Wekan tábláján menjen a „Menü”, majd a „Tábla exportálás” menüpontra, és másolja ki a letöltött fájlban lévő szöveget.",
    "import-json-placeholder": "Illessze be ide az érvényes JSON adatokat",
    "import-map-members": "Tagok leképezése",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Az importált táblának van néhány tagja. Képezze le a tagokat, akiket importálni szeretne a Wekan felhasználókba.",
    "import-show-user-mapping": "Tagok leképezésének vizsgálata",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "import-user-select": "Válassza ki a Wekan felhasználót, akit ezen tagként használni szeretne",
+    "importMapMembersAddPopup-title": "Wekan tag kiválasztása",
    "info": "Verzió",
    "initials": "Kezdőbetűk",
    "invalid-date": "Érvénytelen dátum",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Biztosan el szeretné hagyni ezt a táblát: __boardTitle__? El lesz távolítva a táblán lévő összes kártyáról.",
    "leaveBoardPopup-title": "Elhagyja a táblát?",
    "link-card": "Összekapcsolás ezzel a kártyával",
-    "list-archive-cards": "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": "Az összes kártya lomtárba helyezése ezen a listán.",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "A listán lévő összes kártya áthelyezése",
    "list-select-cards": "A listán lévő összes kártya kiválasztása",
-    "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",
    "list-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz lehetősége visszaállítani a listát. Nincs visszavonás.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Listák",
    "swimlanes": "Swimlanes",
    "log-out": "Kijelentkezés",
@@ -375,9 +343,9 @@
    "muted-info": "Soha sem lesz értesítve a táblán lévő semmilyen változásról.",
    "my-boards": "Saját tábláim",
    "name": "Név",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "Nincs kártya a lomtárban.",
+    "no-archived-lists": "Nincs lista a lomtárban.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Nincs találat",
    "normal": "Normál",
    "normal-desc": "Megtekintheti és szerkesztheti a kártyákat. Nem változtathatja meg a beállításokat.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Egy avatár feltöltve",
    "username": "Felhasználónév",
    "view-it": "Megtekintés",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "figyelem: ez a kártya egy lomtárban lévő listán van",
    "watch": "Megfigyelés",
    "watching": "Megfigyelés",
    "watching-info": "Értesítve lesz a táblán lévő összes változásról",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "1. mérföldkő",
    "welcome-list1": "Alapok",
    "welcome-list2": "Speciális",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Mit szeretne tenni?",
    "wipLimitErrorPopup-title": "Érvénytelen WIP korlát",
    "wipLimitErrorPopup-dialog-pt1": "A listán lévő feladatok száma magasabb a meghatározott WIP korlátnál.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Teszt e-mail küldése magamnak",
    "invitation-code": "Meghívási kód",
    "email-invite-register-subject": "__inviter__ egy meghívás küldött Önnek",
-    "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": "Kedves __user__!\n\n__inviter__ meghívta Önt közreműködésre a Wekan oldalra.\n\nKövesse a lenti hivatkozást:\n__url__\n\nÉs a meghívási kódja: __icode__\n\nKöszönjük.",
+    "email-smtp-test-subject": "SMTP teszt e-mail a Wekantól",
    "email-smtp-test-text": "Sikeresen elküldött egy e-mailt",
    "error-invitation-code-not-exist": "A meghívási kód nem létezik",
    "error-notAuthorized": "Nincs jogosultsága az oldal megtekintéséhez.",
    "outgoing-webhooks": "Kimenő webhurkok",
    "outgoingWebhooksPopup-title": "Kimenő webhurkok",
-    "boardCardTitlePopup-title": "Card Title Filter",
    "new-outgoing-webhook": "Új kimenő webhurok",
    "no-name": "(Ismeretlen)",
+    "Wekan_version": "Wekan verzió",
    "Node_version": "Node verzió",
    "OS_Arch": "Operációs rendszer architektúrája",
    "OS_Cpus": "Operációs rendszer CPU száma",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "Operációs rendszer összes memóriája",
    "OS_Type": "Operációs rendszer típusa",
    "OS_Uptime": "Operációs rendszer üzemideje",
-    "days": "days",
    "hours": "óra",
    "minutes": "perc",
    "seconds": "másodperc",
    "show-field-on-card": "A mező megjelenítése a kártyán",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Igen",
    "no": "Nem",
    "accounts": "Fiókok",
@@ -534,10 +496,6 @@
    "card-end-on": "Befejeződik ekkor",
    "editCardReceivedDatePopup-title": "Érkezési dátum megváltoztatása",
    "editCardEndDatePopup-title": "Befejezési dátum megváltoztatása",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Lomtárba",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Hozzáadás",
    "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Ընդունել",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Activity Notification",
+    "act-addAttachment": "attached __attachment__ to __card__",
+    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addChecklist": "added checklist __checklist__ to __card__",
+    "act-addChecklistItem": "ավելացրել է __checklistItem__ __checklist__ on __card__-ին",
+    "act-addComment": "մեկնաբանել է __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 Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "imported __board__",
+    "act-importCard": "imported __card__",
+    "act-importList": "imported __list__",
+    "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-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Actions",
    "activities": "Activities",
    "activity": "Activity",
    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "attached %s to %s",
    "activity-created": "created %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "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": "Archive",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archive",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Board Menu",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "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": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "This card has %s comment.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Members",
    "cardMorePopup-title": "More",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Cards",
    "cards-count": "Cards",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "black",
    "color-blue": "blue",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "green",
-    "color-indigo": "indigo",
    "color-lime": "lime",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
-    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "red",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "sky",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "yellow",
-    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Search",
+    "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",
@@ -311,20 +283,18 @@
    "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-board-title-wekan": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "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-members-map": "Your imported board has some members. Please map the members you want to import to Wekan 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",
+    "import-user-select": "Pick the Wekan user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select Wekan member",
    "info": "Version",
    "initials": "Initials",
    "invalid-date": "Invalid date",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link to this card",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Lists",
    "swimlanes": "Swimlanes",
    "log-out": "Log Out",
@@ -375,9 +343,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any change in this board",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "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-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Invitation code doesn't exist",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "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",
@@ -637,13 +592,10 @@
    "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": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
    "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",
@@ -654,14 +606,6 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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",
@@ -669,12 +613,5 @@
    "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"
+    "layout": "Layout"
 }
@@ -1,44 +1,35 @@
 {
    "accept": "Terima",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createBoard": "created board __board__",
-    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-createList": "added list __list__ to board __board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "Board __board__ moved to Archive",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-importBoard": "imported board __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-removeBoardMember": "removed member __member__ from board __board__",
-    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-withBoardTitle": "__board__",
+    "act-activity-notify": "[Wekan] Pemberitahuan Kegiatan",
+    "act-addAttachment": "Lampirkan__attachment__ke__kartu__",
+    "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": "Dikomentari di__kartu__:__comment__",
+    "act-createBoard": "Panel__dibuat__",
+    "act-createCard": "Kartu__dilampirkan__ke__Daftar",
+    "act-createCustomField": "created custom field __customField__",
+    "act-createList": "Daftar__ditambahkan__ke__Panel",
+    "act-addBoardMember": "Partisipan__ditambahkan__ke__Kartu",
+    "act-archivedBoard": "__board__ moved to Recycle Bin",
+    "act-archivedCard": "__card__ moved to Recycle Bin",
+    "act-archivedList": "__list__ moved to Recycle Bin",
+    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "act-importBoard": "Panel__diimpor",
+    "act-importCard": "Kartu__diimpor__",
+    "act-importList": "Daftar__diimpor__",
+    "act-joinMember": "Partisipan__ditambahkan__ke__kartu",
+    "act-moveCard": "Pindahkan__kartu__dari__daftarlama__ke__daftar",
+    "act-removeBoardMember": "Hapus__partisipan__dari__panel",
+    "act-restoredCard": "Kembalikan__kartu__ke__panel",
+    "act-unjoinMember": "hapus__partisipan__dari__kartu__",
+    "act-withBoardTitle": "Panel__[Wekan}__",
    "act-withCardTitle": "__kartu__[__Panel__]",
    "actions": "Daftar Tindakan",
    "activities": "Daftar Kegiatan",
    "activity": "Kegiatan",
    "activity-added": "ditambahkan %s ke %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s moved to Recycle Bin",
    "activity-attached": "dilampirkan %s ke %s",
    "activity-created": "dibuat %s",
    "activity-customfield-created": "created custom field %s",
@@ -56,14 +47,14 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "daftar periksa ditambahkan ke %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completed the checklist %s of %s",
    "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": "Tambah",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completed the checklist %s",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -87,22 +78,20 @@
    "and-n-other-card": "Dan__menghitung__kartu lain",
    "and-n-other-card_plural": "Dan__menghitung__kartu lain",
    "apply": "Terapkan",
-    "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": "Arsip",
-    "archived-boards": "Boards in Archive",
+    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
+    "archive": "Move to Recycle Bin",
+    "archive-all": "Move All to Recycle Bin",
+    "archive-board": "Move Board to Recycle Bin",
+    "archive-card": "Move Card to Recycle Bin",
+    "archive-list": "Move List to Recycle Bin",
+    "archive-swimlane": "Move Swimlane to Recycle Bin",
+    "archive-selection": "Move selection to Recycle Bin",
+    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
+    "archived-items": "Recycle Bin",
+    "archived-boards": "Boards in Recycle Bin",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Archive.",
-    "archives": "Arsip",
-    "template": "Template",
-    "templates": "Templates",
+    "no-archived-boards": "No Boards in Recycle Bin.",
+    "archives": "Recycle Bin",
    "assign-member": "Tugaskan anggota",
    "attached": "terlampir",
    "attachment": "Lampiran",
@@ -121,7 +110,7 @@
    "boardChangeTitlePopup-title": "Ganti Nama Panel",
    "boardChangeVisibilityPopup-title": "Ubah Penampakan",
    "boardChangeWatchPopup-title": "Ubah Pengamatan",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Menu Panel",
    "boards": "Panel",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -129,12 +118,12 @@
    "board-view-lists": "Daftar",
    "bucket-example": "Contohnya seperti “Bucket List” ",
    "cancel": "Batal",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "This card is moved to Recycle Bin.",
+    "board-archived": "This board is moved to Recycle Bin.",
    "card-comments-title": "Kartu ini punya %s komentar",
    "card-delete-notice": "Menghapus sama dengan permanen. Anda akan kehilangan semua aksi yang terhubung ke kartu ini",
    "card-delete-pop": "Semua aksi akan dihapus dari aktivitas dan anda tidak bisa lagi buka kartu ini",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
    "card-due": "Jatuh Tempo",
    "card-due-on": "Jatuh Tempo pada",
    "card-spent": "Spent Time",
@@ -154,7 +143,6 @@
    "cardLabelsPopup-title": "Daftar Label",
    "cardMembersPopup-title": "Daftar Anggota",
    "cardMorePopup-title": "Lainnya",
-    "cardTemplatePopup-title": "Create template",
    "cards": "Daftar Kartu",
    "cards-count": "Daftar Kartu",
    "casSignIn": "Sign In with CAS",
@@ -178,33 +166,17 @@
    "clipboard": "Clipboard atau drag & drop",
    "close": "Tutup",
    "close-board": "Tutup Panel",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
    "color-black": "hitam",
    "color-blue": "biru",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
    "color-green": "hijau",
-    "color-indigo": "indigo",
    "color-lime": "hijau muda",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
    "color-orange": "jingga",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
    "color-pink": "merah muda",
-    "color-plum": "plum",
    "color-purple": "ungu",
    "color-red": "merah",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
    "color-sky": "biru muda",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
    "color-yellow": "kuning",
-    "unset-color": "Unset",
    "comment": "Komentar",
    "comment-placeholder": "Write Comment",
    "comment-only": "Hanya komentar",
@@ -216,7 +188,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchElementPopup-title": "Cari",
+    "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",
@@ -311,20 +283,18 @@
    "import-board": "import board",
    "import-board-c": "Import board",
    "import-board-title-trello": "Impor panel dari 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": "Import board from Wekan",
    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
-    "from-wekan": "From previous export",
+    "from-wekan": "From Wekan",
    "import-board-instruction-trello": "Di panel Trello anda, ke 'Menu', terus 'More', 'Print and Export','Export JSON', dan salin hasilnya",
-    "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-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
    "import-json-placeholder": "Tempelkan data JSON yang sah disini",
    "import-map-members": "Petakan partisipan",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Panel yang anda impor punya partisipan. Silahkan petakan anggota yang anda ingin impor ke user [Wekan]",
    "import-show-user-mapping": "Review pemetaan partisipan",
-    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "import-user-select": "Pilih nama pengguna yang Anda mau gunakan sebagai anggota ini",
+    "importMapMembersAddPopup-title": "Pilih anggota Wekan",
    "info": "Versi",
    "initials": "Inisial",
    "invalid-date": "Tanggal tidak sah",
@@ -343,19 +313,17 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Link ke kartu ini",
-    "list-archive-cards": "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": "Move all cards in this list to Recycle Bin",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
    "list-move-cards": "Pindah semua kartu ke daftar ini",
    "list-select-cards": "Pilih semua kartu di daftar ini",
-    "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",
    "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": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
    "lists": "Daftar",
    "swimlanes": "Swimlanes",
    "log-out": "Keluar",
@@ -375,9 +343,9 @@
    "muted-info": "Anda tidak akan pernah dinotifikasi semua perubahan di panel ini",
    "my-boards": "Panel saya",
    "name": "Nama",
-    "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 cards in Recycle Bin.",
+    "no-archived-lists": "No lists in Recycle Bin.",
+    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
    "no-results": "Tidak ada hasil",
    "normal": "Normal",
    "normal-desc": "Bisa tampilkan dan edit kartu. Tidak bisa ubah setting",
@@ -457,7 +425,7 @@
    "uploaded-avatar": "Avatar diunggah",
    "username": "Nama Pengguna",
    "view-it": "Lihat",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
    "watch": "Amati",
    "watching": "Mengamati",
    "watching-info": "Anda akan diberitahu semua perubahan di panel ini",
@@ -465,9 +433,6 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Tingkat dasar",
    "welcome-list2": "Tingkat lanjut",
-    "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
-    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Apa yang mau Anda lakukan?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -493,16 +458,16 @@
    "send-smtp-test": "Send a test email to yourself",
    "invitation-code": "Kode Undangan",
    "email-invite-register-subject": "__inviter__ mengirim undangan ke Anda",
-    "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": "Halo __user__,\n\n__inviter__ mengundang Anda untuk berkolaborasi menggunakan Wekan.\n\nMohon ikuti tautan berikut:\n__url__\n\nDan kode undangan Anda adalah: __icode__\n\nTerima kasih.",
+    "email-smtp-test-subject": "SMTP Test Email From Wekan",
    "email-smtp-test-text": "You have successfully sent an email",
    "error-invitation-code-not-exist": "Kode undangan tidak ada",
    "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)",
+    "Wekan_version": "Wekan version",
    "Node_version": "Node version",
    "OS_Arch": "OS Arch",
    "OS_Cpus": "OS CPU Count",
@@ -513,13 +478,10 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
-    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -534,10 +496,6 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "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.",
@@ -576,25 +534,23 @@
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
    "r-no-rules": "No rules",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
    "r-removed-from": "Removed from",
    "r-the-board": "the board",
    "r-list": "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-archived": "Moved to Recycle Bin",
+    "r-unarchived": "Restored from Recycle Bin",
    "r-a-card": "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-list-name": "List name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
    "r-name": "name",
+    "r-is": "is",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -608,15 +564,14 @@
    "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-archive": "Move to Recycle Bin",
+    "r-unarchive": "Restore from Recycle Bin",
    "r-card": "card",
    "r-add": "Tambah",
    "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",
@@ -637,13 +592,10 @@
    "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-add-label": "Tambahkan label",
+    "r-d-archive": "Move card to Recycle Bin",
+    "r-d-unarchive": "Restore card from Recycle Bin",
+    "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",
@@ -654,27 +606,12 @@
    "r-d-check-of-list": "of checklist",
    "r-d-add-checklist": "Add checklist",
    "r-d-remove-checklist": "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-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": "Metode Autentikasi",
-    "authentication-type": "Tipe Autentikasi",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
    "custom-product-name": "Custom Product Name",
-    "layout": "Layout",
-    "hide-logo": "Sembunyikan 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"
+    "layout": "Layout"
 }
Author	SHA1	Message	Date
Lauri Ojansivu	09a95dfef6	v1.69.2	2018-11-05 15:46:43 +02:00
Lauri Ojansivu	ea141f62d7	Update meteor	2018-11-05 15:43:35 +02:00