Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,36 @@
+# v2.03 2019-01-25 Wekan release
+
+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:

Stackerfile.yml

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

client/components/boards/boardBody.js

@@ -35,6 +35,37 @@ BlazeComponent.extendComponent({
     this._isDragging = false;
     // Used to set the overlay
     this.mouseHasEnterCardDetails = false;
+
+    // fix swimlanes sort field if there are null values
+    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
+    if (nullSortSwimlanes.count() > 0) {
+      const swimlanes = currentBoardData.swimlanes();
+      let count = 0;
+      swimlanes.forEach((s) => {
+        Swimlanes.update(s._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
+
+    // fix lists sort field if there are null values
+    const nullSortLists = currentBoardData.nullSortLists();
+    if (nullSortLists.count() > 0) {
+      const lists = currentBoardData.lists();
+      let count = 0;
+      lists.forEach((l) => {
+        Lists.update(l._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
   },
   onRendered() {
     const boardComponent = this;

client/components/cards/cardDetails.jade

@@ -234,7 +234,7 @@ template(name="cardDetailsActionsPopup")
       li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
       li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
       li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
-      li: a.js-set-card-color {{_ 'setCardColor-title'}}
+      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
     hr
     ul.pop-over-list
       li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -337,14 +337,12 @@ template(name="cardMorePopup")
     a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}
 
 template(name="setCardColorPopup")
-  p.quiet
-    span.clearfix
-  label {{_ "select-color"}}
   form.edit-label
     .palette-colors: each colors
-      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
-        if(isSelected color)
-          i.fa.fa-check
+      unless $eq color 'white'
+        span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+          if(isSelected color)
+            i.fa.fa-check
     button.primary.confirm.js-submit {{_ 'save'}}
     button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
 

client/components/cards/cardDetails.js

@@ -27,7 +27,6 @@ BlazeComponent.extendComponent({
   onCreated() {
     this.currentBoard = Boards.findOne(Session.get('currentBoard'));
     this.isLoaded = new ReactiveVar(false);
-    this.currentColor = new ReactiveVar(this.data().color);
     const boardBody =  this.parentComponent().parentComponent();
     //in Miniview parent is Board, not BoardBody.
     if (boardBody !== null) {
@@ -601,6 +600,9 @@ BlazeComponent.extendComponent({
   },
 
   isSelected(color) {
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    }
     return this.currentColor.get() === color;
   },
 

client/components/cards/cardDetails.styl

@@ -144,16 +144,20 @@ input[type="submit"].attachment-add-link-submit
 card-details-color(background, color...)
   background: background !important
   if color
-    color: color //overwrite text for better visibility
+    color: color !important //overwrite text for better visibility
+
+.card-details-white
+  card-details-color(unset, #000) //Black text for better visibility
+  border: 1px solid #eee
 
 .card-details-green
   card-details-color(#3cb500, #ffffff) //White text for better visibility
 
 .card-details-yellow
-  card-details-color(#fad900)
+  card-details-color(#fad900, #000) //Black text for better visibility
 
 .card-details-orange
-  card-details-color(#ff9f19)
+  card-details-color(#ff9f19, #000) //Black text for better visibility
 
 .card-details-red
   card-details-color(#eb4646, #ffffff) //White text for better visibility
@@ -165,7 +169,7 @@ card-details-color(background, color...)
   card-details-color(#0079bf, #ffffff) //White text for better visibility
 
 .card-details-pink
-  card-details-color(#ff78cb)
+  card-details-color(#ff78cb, #000) //Black text for better visibility
 
 .card-details-sky
   card-details-color(#00c2e0, #ffffff) //White text for better visibility
@@ -174,19 +178,19 @@ card-details-color(background, color...)
   card-details-color(#4d4d4d, #ffffff) //White text for better visibility
 
 .card-details-lime
-  card-details-color(#51e898)
+  card-details-color(#51e898, #000) //Black text for better visibility
 
 .card-details-silver
-  card-details-color(#c0c0c0)
+  card-details-color(#c0c0c0, #000) //Black text for better visibility
 
 .card-details-peachpuff
-  card-details-color(#ffdab9)
+  card-details-color(#ffdab9, #000) //Black text for better visibility
 
 .card-details-crimson
   card-details-color(#dc143c, #ffffff) //White text for better visibility
 
 .card-details-plum
-  card-details-color(#dda0dd)
+  card-details-color(#dda0dd, #000) //Black text for better visibility
 
 .card-details-darkgreen
   card-details-color(#006400, #ffffff) //White text for better visibility
@@ -198,7 +202,7 @@ card-details-color(background, color...)
   card-details-color(#ff00ff, #ffffff) //White text for better visibility
 
 .card-details-gold
-  card-details-color(#ffd700)
+  card-details-color(#ffd700, #000) //Black text for better visibility
 
 .card-details-navy
   card-details-color(#000080, #ffffff) //White text for better visibility
@@ -210,10 +214,10 @@ card-details-color(background, color...)
   card-details-color(#8b4513, #ffffff) //White text for better visibility
 
 .card-details-paleturquoise
-  card-details-color(#afeeee)
+  card-details-color(#afeeee, #000) //Black text for better visibility
 
 .card-details-mistyrose
-  card-details-color(#ffe4e1)
+  card-details-color(#ffe4e1, #000) //Black text for better visibility
 
 .card-details-indigo
   card-details-color(#4b0082, #ffffff) //White text for better visibility

client/components/cards/minicard.js

@@ -3,10 +3,6 @@
 // });
 
 BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentColor = new ReactiveVar(this.data().color);
-  },
-
   template() {
     return 'minicard';
   },

client/components/lists/list.styl

@@ -10,7 +10,6 @@
   // transparent, because that won't work during a list drag.
   background: darken(white, 13%)
   border-left: 1px solid darken(white, 20%)
-  border-bottom: 1px solid #CCC
   padding: 0
   float: left
 
@@ -44,11 +43,23 @@
       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
-  margin: 20px 12px 4px
+  padding: 20px 12px 4px
   position: relative
   min-height: 20px
+  background-color: #e4e4e4;
+  border-bottom: 6px solid #e4e4e4;
+
 
   &.ui-sortable-handle
     cursor: grab
@@ -68,16 +79,17 @@
     text-overflow: ellipsis
     word-wrap: break-word
 
+
   .list-header-watch-icon
     padding-left: 10px
     color: #a6a6a6
 
   .list-header-menu
     position: absolute
-    padding: 7px
+    padding: 27px 19px
     margin-top: 1px
-    top: -@padding
-    right: -@padding
+    top: -7px
+    right: -7px
 
   .list-header-plus-icon
     color: #a6a6a6
@@ -198,3 +210,82 @@
 .search-card-results
   max-height: 250px
   overflow: hidden
+
+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

client/components/lists/listHeader.jade

@@ -1,5 +1,7 @@
 template(name="listHeader")
-  .list-header.js-list-header
+  .list-header.js-list-header(
+    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
+    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
     +inlinedForm
       +editListTitleForm
     else
@@ -49,6 +51,9 @@ template(name="listActionPopup")
     li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
   unless currentUser.isCommentOnly
     hr
+    ul.pop-over-list
+      li: a.js-set-color-list {{_ 'set-color-list'}}
+    hr
     ul.pop-over-list
       if cards.count
         li: a.js-select-cards {{_ 'list-select-cards'}}
@@ -111,3 +116,13 @@ template(name="wipLimitErrorPopup")
     p {{_ 'wipLimitErrorPopup-dialog-pt1'}}
     p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
     button.full.js-back-view(type="submit") {{_ 'cancel'}}
+
+template(name="setListColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      // note: we use the swimlane palette to have more than just the border
+      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}

client/components/lists/listHeader.js

@@ -1,3 +1,8 @@
+let listsColors;
+Meteor.startup(() => {
+  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
   canSeeAddCard() {
     const list = Template.currentData();
@@ -72,6 +77,7 @@ Template.listActionPopup.helpers({
 
 Template.listActionPopup.events({
   'click .js-list-subscribe' () {},
+  'click .js-set-color-list': Popup.open('setListColor'),
   'click .js-select-cards' () {
     const cardIds = this.allCards().map((card) => card._id);
     MultiSelection.add(cardIds);
@@ -154,3 +160,34 @@ Template.listMorePopup.events({
     Utils.goBoardId(this.boardId);
   }),
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentList = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentList.color);
+  },
+
+  colors() {
+    return listsColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentList.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentList.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setListColorPopup');

client/components/rules/actions/cardActions.jade

@@ -39,32 +39,15 @@ template(name="cardActions")
     div.trigger-content
       div.trigger-text
         | {{{_'r-set-color'}}}
-      div.trigger-dropdown
-        select(id="color-action")
-          option(value="white")         {{{_'color-white'}}}
-          option(value="green")         {{{_'color-green'}}}
-          option(value="yellow")        {{{_'color-yellow'}}}
-          option(value="orange")        {{{_'color-orange'}}}
-          option(value="red")           {{{_'color-red'}}}
-          option(value="purple")        {{{_'color-purple'}}}
-          option(value="blue")          {{{_'color-blue'}}}
-          option(value="sky")           {{{_'color-sky'}}}
-          option(value="lime")          {{{_'color-lime'}}}
-          option(value="pink")          {{{_'color-pink'}}}
-          option(value="black")         {{{_'color-black'}}}
-          option(value="silver")        {{{_'color-silver'}}}
-          option(value="peachpuff")     {{{_'color-peachpuff'}}}
-          option(value="crimson")       {{{_'color-crimson'}}}
-          option(value="plum")          {{{_'color-plum'}}}
-          option(value="darkgreen")     {{{_'color-darkgreen'}}}
-          option(value="slateblue")     {{{_'color-slateblue'}}}
-          option(value="magenta")       {{{_'color-magenta'}}}
-          option(value="gold")          {{{_'color-gold'}}}
-          option(value="navy")          {{{_'color-navy'}}}
-          option(value="gray")          {{{_'color-gray'}}}
-          option(value="saddlebrown")   {{{_'color-saddlebrown'}}}
-          option(value="paleturquoise") {{{_'color-paleturquoise'}}}
-          option(value="mistyrose")     {{{_'color-mistyrose'}}}
-          option(value="indigo")        {{{_'color-indigo'}}}
+        button.trigger-button.trigger-button-color.card-details-green.js-show-color-palette(id="color-action")
+          | {{{_'color-green'}}}
     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'}}

client/components/rules/actions/cardActions.js

@@ -1,3 +1,8 @@
+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('allRules');
@@ -112,10 +117,22 @@ BlazeComponent.extendComponent({
           boardId,
         });
       },
+      'click .js-show-color-palette'(event){
+        const funct = Popup.open('setCardActionsColor');
+        const colorButton = this.find('#color-action');
+        if (colorButton.value === '') {
+          colorButton.value = 'green';
+        }
+        funct.call(this, event);
+      },
       'click .js-set-color-action' (event) {
         const ruleName = this.data().ruleName.get();
         const trigger = this.data().triggerVar.get();
-        const selectedColor = this.find('#color-action').value;
+        const colorButton = this.find('#color-action');
+        if (colorButton.value === '') {
+          colorButton.value = 'green';
+        }
+        const selectedColor = colorButton.value;
         const boardId = Session.get('currentBoard');
         const desc = Utils.getTriggerActionDesc(event, this);
         const triggerId = Triggers.insert(trigger);
@@ -136,3 +153,34 @@ BlazeComponent.extendComponent({
   },
 
 }).register('cardActions');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentAction = this.currentData();
+    this.colorButton = Popup.getOpenerComponent().find('#color-action');
+    this.currentColor = new ReactiveVar(this.colorButton.value);
+  },
+
+  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.colorButton.classList.remove(`card-details-${ this.colorButton.value }`);
+        this.colorButton.value = this.currentColor.get();
+        this.colorButton.innerText = `${TAPi18n.__(`color-${ this.currentColor.get() }`)}`;
+        this.colorButton.classList.add(`card-details-${ this.colorButton.value }`);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardActionsColorPopup');

client/components/rules/rules.styl

@@ -174,6 +174,15 @@
           top:30px
         .trigger-button.trigger-button-person
           right:-40px
+        .trigger-button.trigger-button-color
+          top: unset
+          position: unset
+          transform: unset
+          font-size: 16px
+          width:auto
+          padding-left: 10px
+          padding-right: 10px
+          height:40px
       .trigger-item.trigger-item-mail
         height:300px
   

client/components/swimlanes/swimlaneHeader.jade

@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header
+  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
     +inlinedForm
       +editSwimlaneTitleForm
     else
@@ -8,6 +8,7 @@ template(name="swimlaneHeader")
         = title
       .swimlane-header-menu
         unless currentUser.isCommentOnly
+          a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
           a.fa.fa-navicon.js-open-swimlane-menu
 
 template(name="editSwimlaneTitleForm")
@@ -19,5 +20,25 @@ template(name="editSwimlaneTitleForm")
 
 template(name="swimlaneActionPopup")
   unless currentUser.isCommentOnly
+    ul.pop-over-list
+       li: a.js-set-swimlane-color {{_ 'select-color'}}
+    hr
     ul.pop-over-list
       li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+
+template(name="swimlaneAddPopup")
+  unless currentUser.isCommentOnly
+    form
+      input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
+        autocomplete="off" autofocus)
+      .edit-controls.clearfix
+        button.primary.confirm(type="submit") {{_ 'add'}}
+
+template(name="setSwimlaneColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}

client/components/swimlanes/swimlaneHeader.js

@@ -1,3 +1,10 @@
+const { calculateIndexData } = Utils;
+
+let swimlaneColors;
+Meteor.startup(() => {
+  swimlaneColors = Swimlanes.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
   editTitle(evt) {
     evt.preventDefault();
@@ -11,15 +18,82 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
+      'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
       submit: this.editTitle,
     }];
   },
 }).register('swimlaneHeader');
 
 Template.swimlaneActionPopup.events({
+  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
   'click .js-close-swimlane' (evt) {
     evt.preventDefault();
     this.archive();
     Popup.close();
   },
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  },
+
+  events() {
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
+        const titleInput = this.find('.swimlane-name-input');
+        const title = titleInput.value.trim();
+        const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
+
+        if (title) {
+          Swimlanes.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: sortValue.base,
+          });
+
+          titleInput.value = '';
+          titleInput.focus();
+        }
+        // XXX ideally, we should move the popup to the newly
+        // created swimlane so a user can add more than one swimlane
+        // with a minimum of interactions
+        Popup.close();
+      },
+    }];
+  },
+}).register('swimlaneAddPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentSwimlane.color);
+  },
+
+  colors() {
+    return swimlaneColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentSwimlane.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentSwimlane.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setSwimlaneColorPopup');

client/components/swimlanes/swimlanes.jade

@@ -1,21 +1,22 @@
 template(name="swimlane")
   .swimlane.js-lists.js-swimlane
     +swimlaneHeader
-    if isMiniScreen
-      if currentList
-        +list(currentList)
+    .swimlane.list-group.js-lists
+      if isMiniScreen
+        if currentList
+          +list(currentList)
+        else
+          each currentBoard.lists
+            +miniList(this)
+          if currentUser.isBoardMember
+            +addListForm
       else
         each currentBoard.lists
-          +miniList(this)
+          +list(this)
+          if currentCardIsInThisList _id ../_id
+            +cardDetails(currentCard)
         if currentUser.isBoardMember
           +addListForm
-    else
-      each currentBoard.lists
-        +list(this)
-        if currentCardIsInThisList _id ../_id
-          +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        +addListAndSwimlaneForm
 
 template(name="listsGroup")
   .swimlane.list-group.js-lists
@@ -35,34 +36,9 @@ template(name="listsGroup")
       if currentUser.isBoardMember
         +addListForm
 
-template(name="addListAndSwimlaneForm")
-  .list.list-composer.js-list-composer
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-list'}}
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-swimlane'}}
-
 template(name="addListForm")
   .list.list-composer.js-list-composer
-    .list-header
+    .list-header-add
       +inlinedForm(autoclose=false)
         input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
           autocomplete="off" autofocus)

client/components/swimlanes/swimlanes.js

@@ -175,48 +175,6 @@ BlazeComponent.extendComponent({
   },
 }).register('addListForm');
 
-BlazeComponent.extendComponent({
-  // Proxy
-  open() {
-    this.childComponents('inlinedForm')[0].open();
-  },
-
-  events() {
-    return [{
-      submit(evt) {
-        evt.preventDefault();
-        let titleInput = this.find('.list-name-input');
-        if (titleInput) {
-          const title = titleInput.value.trim();
-          if (title) {
-            Lists.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.list').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        } else {
-          titleInput = this.find('.swimlane-name-input');
-          const title = titleInput.value.trim();
-          if (title) {
-            Swimlanes.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.swimlane').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        }
-      },
-    }];
-  },
-}).register('addListAndSwimlaneForm');
-
 Template.swimlane.helpers({
   canSeeAddList() {
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();

client/components/swimlanes/swimlanes.styl

@@ -5,7 +5,7 @@
   // transparent, because that won't work during a swimlane drag.
   background: darken(white, 13%)
   display: flex
-  flex-direction: row
+  flex-direction: column
   overflow: 0;
   max-height: 100%
 
@@ -27,20 +27,15 @@
   .swimlane-header-wrap
     display: flex;
     flex-direction: row;
-    flex: 0 0 50px;
-    padding-bottom: 30px;
-    border-bottom: 1px solid #CCC
+    flex: 0 0 24px;
+    background-color: #ccc;
 
     .swimlane-header
-      -ms-writing-mode: tb-rl;
-      writing-mode: vertical-rl;
-      transform: rotate(180deg);
       font-size: 14px;
-      line-height: 50px;
-      margin-top: 50px;
+      padding: 5px 5px
       font-weight: bold;
       min-height: 9px;
-      width: 50px;
+      width: 100%;
       overflow: hidden;
       -o-text-overflow: ellipsis;
       text-overflow: ellipsis;
@@ -49,7 +44,93 @@
 
     .swimlane-header-menu
       position: absolute
-      padding: 20px 20px
+      padding: 5px 5px
+
+    .swimlane-header-plus-icon
+      margin-left: 5px
+      margin-right: 10px
 
 .list-group
+  flex-direction: row
   height: 100%
+
+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

i18n/ar.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "نقل بطاقات هذه القائمة",
     "list-select-cards": "تحديد بطاقات هذه القائمة",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "قائمة الإجراءات",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "المزيد",
     "link-list": "رابط إلى هذه القائمة",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/bg.i18n.json

@@ -11,10 +11,10 @@
     "act-createCustomField": "създаде собствено поле __customField__",
     "act-createList": "добави __list__ към __board__",
     "act-addBoardMember": "добави __member__ към __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
+    "act-archivedBoard": "__board__ е преместен в Архива",
+    "act-archivedCard": "__card__ е преместена в Архива",
+    "act-archivedList": "__list__ е преместен в Архива",
+    "act-archivedSwimlane": "__swimlane__ е преместен в Архива",
     "act-importBoard": "импортира __board__",
     "act-importCard": "импортира __card__",
     "act-importList": "импортира __list__",
@@ -23,13 +23,13 @@
     "act-removeBoardMember": "премахна __member__ от __board__",
     "act-restoredCard": "възстанови __card__ в __board__",
     "act-unjoinMember": "премахна __member__ от __card__",
-    "act-withBoardTitle": "__board__",
+    "act-withBoardTitle": "__board__    ",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Действия",
     "activities": "Действия",
     "activity": "Дейности",
     "activity-added": "добави %s към %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s е преместена в Архива",
     "activity-attached": "прикачи %s към %s",
     "activity-created": "създаде %s",
     "activity-customfield-created": "създаде собствено поле %s",
@@ -48,14 +48,14 @@
     "activity-checklist-added": "добави списък със задачи към %s",
     "activity-checklist-removed": "премахна списък със задачи от %s",
     "activity-checklist-completed": "завърши списък със задачи %s на %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
     "activity-checklist-item-added": "добави точка към '%s' в/във %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
     "add": "Добави",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "завърши чеклиста %s",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
     "add-attachment": "Добави прикачен файл",
     "add-board": "Добави Табло",
     "add-card": "Добави карта",
@@ -79,18 +79,18 @@
     "and-n-other-card_plural": "И __count__ други карти",
     "apply": "Приложи",
     "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "Премести в Архива",
+    "archive-all": "Премести всички в Архива",
+    "archive-board": "Премести Таблото в Архива",
+    "archive-card": "Премести Картата в Архива",
+    "archive-list": "Премести Списъка в Архива",
+    "archive-swimlane": "Премести Коридора в Архива",
+    "archive-selection": "Премести избраното в Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото в Архива?",
     "archived-items": "Архив",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Табла в Архива",
     "restore-board": "Възстанови Таблото",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "Няма Табла в Архива.",
     "archives": "Архив",
     "assign-member": "Възложи на член от екипа",
     "attached": "прикачен",
@@ -118,12 +118,12 @@
     "board-view-lists": "Списъци",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Тази карта е преместена в Архива.",
+    "board-archived": "Това табло е преместено в Архива.",
     "card-comments-title": "Тази карта има %s коментар.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Можете да преместите картата в Архива, за да я премахнете от Таблото и така да запазите активността в него.",
     "card-due": "Готова за",
     "card-due-on": "Готова за",
     "card-spent": "Изработено време",
@@ -166,7 +166,7 @@
     "clipboard": "Клипборда или с драг & дроп",
     "close": "Затвори",
     "close-board": "Затвори Таблото",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
     "color-black": "черно",
     "color-blue": "синьо",
     "color-crimson": "crimson",
@@ -190,7 +190,7 @@
     "color-silver": "silver",
     "color-sky": "светло синьо",
     "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-white": "бяло",
     "color-yellow": "жълто",
     "unset-color": "Unset",
     "comment": "Коментирай",
@@ -331,17 +331,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Премести всички карти от този списък в Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
     "list-move-cards": "Премести всички карти в този списък",
     "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Импорт на карта от Trello",
     "listMorePopup-title": "Още",
     "link-list": "Връзка към този списък",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
     "lists": "Списъци",
     "swimlanes": "Коридори",
     "log-out": "Изход",
@@ -361,9 +363,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Моите табла",
     "name": "Име",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "Няма карти в Архива.",
+    "no-archived-lists": "Няма списъци в Архива.",
+    "no-archived-swimlanes": "Няма коридори в Архива.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -443,7 +445,7 @@
     "uploaded-avatar": "Качихте аватар",
     "username": "Потребителско име",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "внимание: тази карта е в списък в Архива",
     "watch": "Наблюдавай",
     "watching": "Наблюдава",
     "watching-info": "You will be notified of any change in this board",
@@ -462,7 +464,7 @@
     "disable-self-registration": "Disable Self-Registration",
     "invite": "Покани",
     "invite-people": "Покани хора",
-    "to-boards": "To board(s)",
+    "to-boards": "в табло/а",
     "email-addresses": "Имейл адреси",
     "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
     "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
@@ -496,7 +498,7 @@
     "OS_Totalmem": "ОС Общо памет",
     "OS_Type": "Тип ОС",
     "OS_Uptime": "OS Ъптайм",
-    "days": "days",
+    "days": "дни",
     "hours": "часа",
     "minutes": "минути",
     "seconds": "секунди",
@@ -517,16 +519,19 @@
     "card-end-on": "Завършена на",
     "editCardReceivedDatePopup-title": "Промени датата на получаване",
     "editCardEndDatePopup-title": "Промени датата на завършване",
-    "setCardColor-title": "Set color",
-    "assigned-by": "Assigned By",
-    "requested-by": "Requested By",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
     "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
-    "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
     "default-subtasks-board": "Подзадачи за табло __board__",
     "default": "по подразбиране",
-    "queue": "Queue",
+    "queue": "Опашка",
     "subtask-settings": "Настройки на Подзадачите",
     "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
     "show-subtasks-field": "Картата може да има подзадачи",
@@ -541,40 +546,40 @@
     "parent-card": "Карта-източник",
     "source-board": "Source board",
     "no-parent": "Не показвай източника",
-    "activity-added-label": "added label '%s' to %s",
-    "activity-removed-label": "removed label '%s' from %s",
-    "activity-delete-attach": "deleted an attachment from %s",
-    "activity-added-label-card": "added label '%s'",
-    "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен файл от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения файл",
     "r-rule": "Правило",
-    "r-add-trigger": "Add trigger",
-    "r-add-action": "Add action",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
     "r-board-rules": "Правила за таблото",
     "r-add-rule": "Добави правилото",
     "r-view-rule": "Виж правилото",
     "r-delete-rule": "Изтрий правилото",
     "r-new-rule-name": "Заглавие за новото правило",
     "r-no-rules": "Няма правила",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
-    "r-removed-from": "Removed from",
-    "r-the-board": "the board",
-    "r-list": "list",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
     "set-filter": "Set Filter",
     "r-moved-to": "Moved to",
     "r-moved-from": "Moved from",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
-    "r-a-card": "a card",
+    "r-archived": "Преместено в Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
     "r-when-a-label-is": "When a label is",
     "r-when-the-label-is": "When the label is",
     "r-list-name": "list name",
     "r-when-a-member": "When a member is",
     "r-when-the-member": "When the member",
-    "r-name": "name",
+    "r-name": "име",
     "r-when-a-attach": "When an attachment",
     "r-when-a-checklist": "When a checklist is",
     "r-when-the-checklist": "When the checklist",
@@ -584,13 +589,13 @@
     "r-when-the-item": "When the checklist item",
     "r-checked": "Checked",
     "r-unchecked": "Unchecked",
-    "r-move-card-to": "Move card to",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
-    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
-    "r-card": "card",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести в Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
     "r-add": "Добави",
     "r-remove": "Remove",
     "r-label": "label",
@@ -617,8 +622,8 @@
     "r-d-send-email-to": "to",
     "r-d-send-email-subject": "subject",
     "r-d-send-email-message": "message",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
+    "r-d-archive": "Премести картата в Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
     "r-d-add-label": "Add label",
     "r-d-remove-label": "Remove label",
     "r-create-card": "Create new card",
@@ -632,14 +637,14 @@
     "r-d-check-one": "Check item",
     "r-d-uncheck-one": "Uncheck item",
     "r-d-check-of-list": "of checklist",
-    "r-d-add-checklist": "Add checklist",
-    "r-d-remove-checklist": "Remove checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
     "r-by": "by",
-    "r-add-checklist": "Add checklist",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
     "r-board-note": "Note: leave a field empty to match every possible value.",
     "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
     "r-when-a-card-is-moved": "When a card is moved to another list",

i18n/br.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Muioc’h",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ca.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Mou totes les fitxes d'aquesta llista",
     "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Accions de la llista",
     "swimlaneActionPopup-title": "Accions de Carril de Natació",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "importa una fitxa de Trello",
     "listMorePopup-title": "Més",
     "link-list": "Enllaça a aquesta llista",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assignat Per",
     "requested-by": "Demanat Per",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/cs.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Přesunout všechny karty v tomto sloupci",
     "list-select-cards": "Vybrat všechny karty v tomto sloupci",
+    "set-color-list": "Set Color",
     "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",
@@ -517,7 +519,10 @@
     "card-end-on": "Končí v",
     "editCardReceivedDatePopup-title": "Změnit datum přijetí",
     "editCardEndDatePopup-title": "Změnit datum konce",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "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.",

i18n/da.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/de.i18n.json

@@ -169,30 +169,30 @@
     "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Archiv\" in der Kopfzeile der Startseite anklicken.",
     "color-black": "schwarz",
     "color-blue": "blau",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "Karminrot",
+    "color-darkgreen": "Dunkelgrün",
+    "color-gold": "Gold",
+    "color-gray": "Grau",
     "color-green": "grün",
-    "color-indigo": "indigo",
+    "color-indigo": "Indigo",
     "color-lime": "hellgrün",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "Magentarot",
+    "color-mistyrose": "Altrosa",
+    "color-navy": "Marineblau",
     "color-orange": "orange",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "Blasses Türkis",
+    "color-peachpuff": "Pfirsich",
     "color-pink": "pink",
-    "color-plum": "plum",
+    "color-plum": "Pflaume",
     "color-purple": "lila",
     "color-red": "rot",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "Sattelbraun",
+    "color-silver": "Silber",
     "color-sky": "himmelblau",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "Schieferblau",
+    "color-white": "Weiß",
     "color-yellow": "gelb",
-    "unset-color": "Unset",
+    "unset-color": "Nicht festgelegt",
     "comment": "Kommentar",
     "comment-placeholder": "Kommentar schreiben",
     "comment-only": "Nur Kommentare",
@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archiv\".",
     "list-move-cards": "Alle Karten in dieser Liste verschieben",
     "list-select-cards": "Alle Karten in dieser Liste auswählen",
+    "set-color-list": "Setze Farbe",
     "listActionPopup-title": "Listenaktionen",
     "swimlaneActionPopup-title": "Swimlaneaktionen",
+    "swimlaneAddPopup-title": "Füge eine Swimlane unterhalb hinzu",
     "listImportCardPopup-title": "Eine Trello-Karte importieren",
     "listMorePopup-title": "Mehr",
     "link-list": "Link zu dieser Liste",
@@ -483,7 +485,7 @@
     "error-notAuthorized": "Sie sind nicht berechtigt diese Seite zu sehen.",
     "outgoing-webhooks": "Ausgehende Webhooks",
     "outgoingWebhooksPopup-title": "Ausgehende Webhooks",
-    "boardCardTitlePopup-title": "Kartentitel-Filter",
+    "boardCardTitlePopup-title": "Kartentitelfilter",
     "new-outgoing-webhook": "Neuer ausgehender Webhook",
     "no-name": "(Unbekannt)",
     "Node_version": "Node-Version",
@@ -517,7 +519,10 @@
     "card-end-on": "Endet am",
     "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
     "editCardEndDatePopup-title": "Enddatum ändern",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Farbe festlegen",
+    "setCardActionsColorPopup-title": "Wähle eine Farbe",
+    "setSwimlaneColorPopup-title": "Wähle eine Farbe",
+    "setListColorPopup-title": "Wähle eine Farbe",
     "assigned-by": "Zugewiesen von",
     "requested-by": "Angefordert von",
     "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.",
@@ -596,7 +601,7 @@
     "r-label": "Label",
     "r-member": "Mitglied",
     "r-remove-all": "Entferne alle Mitglieder von der Karte",
-    "r-set-color": "Set color to",
+    "r-set-color": "Farbe festlegen auf",
     "r-checklist": "Checkliste",
     "r-check-all": "Alle markieren",
     "r-uncheck-all": "Alle abwählen",

i18n/el.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Περισσότερα",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/en-GB.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/en.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/eo.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Movu ĉiujn kartojn en tiu listo.",
     "list-select-cards": "Elektu ĉiujn kartojn en tiu listo.",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Pli",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/es-AR.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Mueve todas las tarjetas en esta lista",
     "list-select-cards": "Selecciona todas las tarjetas en esta lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Listar Acciones",
     "swimlaneActionPopup-title": "Acciones de la Calle",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importar una tarjeta Trello",
     "listMorePopup-title": "Mas",
     "link-list": "Enlace a esta lista",
@@ -517,7 +519,10 @@
     "card-end-on": "Termina en",
     "editCardReceivedDatePopup-title": "Cambiar fecha de recepción",
     "editCardEndDatePopup-title": "Cambiar fecha de término",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/es.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Esto eliminará del tablero todas las tarjetas en esta lista. Para ver las tarjetas en el Archivo y recuperarlas al tablero haga click en \"Menu\" > \"Archivo\"",
     "list-move-cards": "Mover todas las tarjetas de esta lista",
     "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Acciones de la lista",
     "swimlaneActionPopup-title": "Acciones del carril de flujo",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importar una tarjeta de Trello",
     "listMorePopup-title": "Más",
     "link-list": "Enlazar a esta lista",
@@ -517,7 +519,10 @@
     "card-end-on": "Finalizado el",
     "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
     "editCardEndDatePopup-title": "Cambiar la fecha de finalización",
-    "setCardColor-title": "Cambiar color",
+    "setCardColorPopup-title": "Cambiar color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a 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.",

i18n/eu.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Lekuz aldatu zerrendako txartel guztiak",
     "list-select-cards": "Aukeratu zerrenda honetako txartel guztiak",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Zerrendaren ekintzak",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Inportatu Trello txartel bat",
     "listMorePopup-title": "Gehiago",
     "link-list": "Lotura zerrenda honetara",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/fa.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "این کارتباعث حذف تمامی کارت های این لیست از برد می شود . برای مشاهده کارت ها در آرشیو و برگرداندن آنها به برد بر بروی \"Menu\">\"Archive\" کلیک نمایید",
     "list-move-cards": "انتقال تمام کارت های این لیست",
     "list-select-cards": "انتخاب تمام کارت های این لیست",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "لیست اقدامات",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "وارد کردن کارت Trello",
     "listMorePopup-title": "بیشتر",
     "link-list": "پیوند به این فهرست",
@@ -517,7 +519,10 @@
     "card-end-on": "پایان در",
     "editCardReceivedDatePopup-title": "تغییر تاریخ رسید",
     "editCardEndDatePopup-title": "تغییر تاریخ پایان",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "محول شده توسط",
     "requested-by": "تقاضا شده توسط",
     "board-delete-notice": "حذف دائمی است شما تمام لیست ها، کارت ها و اقدامات مرتبط با این برد را از دست خواهید داد.",

i18n/fi.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi Arkistossa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Arkisto”.",
     "list-move-cards": "Siirrä kaikki kortit tässä listassa",
     "list-select-cards": "Valitse kaikki kortit tässä listassa",
+    "set-color-list": "Aseta väri",
     "listActionPopup-title": "Listaa toimet",
     "swimlaneActionPopup-title": "Swimlane toimet",
+    "swimlaneAddPopup-title": "Lisää Swimlane alle",
     "listImportCardPopup-title": "Tuo Trello kortti",
     "listMorePopup-title": "Lisää",
     "link-list": "Linkki tähän listaan",
@@ -517,7 +519,10 @@
     "card-end-on": "Loppuu",
     "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
     "editCardEndDatePopup-title": "Vaihda loppumispäivää",
-    "setCardColor-title": "Aseta väri",
+    "setCardColorPopup-title": "Aseta väri",
+    "setCardActionsColorPopup-title": "Valitse väri",
+    "setSwimlaneColorPopup-title": "Valitse väri",
+    "setListColorPopup-title": "Valitse väri",
     "assigned-by": "Tehtävänantaja",
     "requested-by": "Pyytäjä",
     "board-delete-notice": "Poistaminen on lopullista. Menetät kaikki listat, kortit ja toimet tällä taululla.",

i18n/fr.i18n.json

@@ -192,7 +192,7 @@
     "color-slateblue": "bleu ardoise",
     "color-white": "blanc",
     "color-yellow": "jaune",
-    "unset-color": "Unset",
+    "unset-color": "Enlever",
     "comment": "Commenter",
     "comment-placeholder": "Écrire un commentaire",
     "comment-only": "Commentaire uniquement",
@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes archivées et les renvoyer vers le tableau, cliquez sur « Menu » puis « Archives ».",
     "list-move-cards": "Déplacer toutes les cartes de cette liste",
     "list-select-cards": "Sélectionner toutes les cartes de cette liste",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Actions sur la liste",
     "swimlaneActionPopup-title": "Actions du couloir",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importer une carte Trello",
     "listMorePopup-title": "Plus",
     "link-list": "Lien vers cette liste",
@@ -517,7 +519,10 @@
     "card-end-on": "Se termine le",
     "editCardReceivedDatePopup-title": "Modifier la date de réception",
     "editCardEndDatePopup-title": "Modifier la date de fin",
-    "setCardColor-title": "Définir la couleur",
+    "setCardColorPopup-title": "Définir la couleur",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "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.",

i18n/gl.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Máis",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/he.i18n.json

@@ -186,10 +186,10 @@
     "color-plum": "שזיף",
     "color-purple": "סגול",
     "color-red": "אדום",
-    "color-saddlebrown": "saddlebrown",
+    "color-saddlebrown": "חום אוכף",
     "color-silver": "כסף",
     "color-sky": "תכלת",
-    "color-slateblue": "slateblue",
+    "color-slateblue": "צפחה כחולה",
     "color-white": "לבן",
     "color-yellow": "צהוב",
     "unset-color": "בטל הגדרה",
@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "כל הכרטיסים מרשימה זו יוסרו מהלוח. לצפייה בכרטיסים השמורים בארכיון ולהחזירם ללוח, ניתן ללחוץ על „תפריט” > „פריטים בארכיון”.",
     "list-move-cards": "העברת כל הכרטיסים שברשימה זו",
     "list-select-cards": "בחירת כל הכרטיסים שברשימה זו",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "פעולות רשימה",
     "swimlaneActionPopup-title": "פעולות על מסלול",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "יבוא כרטיס מ־Trello",
     "listMorePopup-title": "עוד",
     "link-list": "קישור לרשימה זו",
@@ -517,7 +519,10 @@
     "card-end-on": "מועד הסיום",
     "editCardReceivedDatePopup-title": "החלפת מועד הקבלה",
     "editCardEndDatePopup-title": "החלפת מועד הסיום",
-    "setCardColor-title": "הגדרת צבע",
+    "setCardColorPopup-title": "הגדרת צבע",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "הוקצה על ידי",
     "requested-by": "התבקש על ידי",
     "board-delete-notice": "מחיקה היא לצמיתות. כל הרשימות, הכרטיבים והפעולות שקשורים בלוח הזה ילכו לאיבוד.",

i18n/hi.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "स्थानांतरित संपूर्ण कार्ड अंदर में  यह list",
     "list-select-cards": "Select संपूर्ण कार्ड अंदर में  यह list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "सूची Actions",
     "swimlaneActionPopup-title": "तैरन Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import एक Trello कार्ड",
     "listMorePopup-title": "More",
     "link-list": "Link तक  यह list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose संपूर्ण lists, कार्ड और actions associated साथ में  यह बोर्ड.",

i18n/hu.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "A listán lévő összes kártya áthelyezése",
     "list-select-cards": "A listán lévő összes kártya kiválasztása",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Műveletek felsorolása",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trello kártya importálása",
     "listMorePopup-title": "Több",
     "link-list": "Összekapcsolás ezzel a listával",
@@ -517,7 +519,10 @@
     "card-end-on": "Befejeződik ekkor",
     "editCardReceivedDatePopup-title": "Érkezési dátum megváltoztatása",
     "editCardEndDatePopup-title": "Befejezési dátum megváltoztatása",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/hy.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/id.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Pindah semua kartu ke daftar ini",
     "list-select-cards": "Pilih semua kartu di daftar ini",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Daftar Tindakan",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Impor dari Kartu Trello",
     "listMorePopup-title": "Lainnya",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ig.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/it.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Sposta tutte le schede in questa lista",
     "list-select-cards": "Selezione tutte le schede in questa lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Azioni disponibili",
     "swimlaneActionPopup-title": "Azioni corsia",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importa una scheda di Trello",
     "listMorePopup-title": "Altro",
     "link-list": "Link a questa lista",
@@ -517,7 +519,10 @@
     "card-end-on": "Termina il",
     "editCardReceivedDatePopup-title": "Cambia data ricezione",
     "editCardEndDatePopup-title": "Cambia data finale",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assegnato da",
     "requested-by": "Richiesto da",
     "board-delete-notice": "L'eliminazione è permanente. Tutte le azioni, liste e schede associate a questa bacheca andranno perse.",

i18n/ja.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "リストの全カードを移動する",
     "list-select-cards": "リストの全カードを選択",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "操作一覧",
     "swimlaneActionPopup-title": "スイムレーン操作",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trelloのカードをインポート",
     "listMorePopup-title": "さらに見る",
     "link-list": "このリストへのリンク",
@@ -517,7 +519,10 @@
     "card-end-on": "終了日",
     "editCardReceivedDatePopup-title": "受付日の変更",
     "editCardEndDatePopup-title": "終了日の変更",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ka.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "გადაიტანე ყველა ბარათი ამ სიაში",
     "list-select-cards": "მონიშნე ყველა ბარათი ამ სიაში",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "მოქმედებების სია",
     "swimlaneActionPopup-title": "ბილიკის მოქმედებები",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trello ბარათის იმპორტი",
     "listMorePopup-title": "მეტი",
     "link-list": "დააკავშირეთ ამ ჩამონათვალთან",
@@ -517,7 +519,10 @@
     "card-end-on": "დასრულდება : ",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "შეცვალეთ საბოლოო თარიღი",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "უფლებამოსილების გამცემი ",
     "requested-by": "მომთხოვნი",
     "board-delete-notice": "წაშლის შემთხვევაში თქვენ დაკარგავთ ამ დაფასთან ასოცირებულ ყველა მონაცემს მათ შორის : ჩამონათვალს, ბარათებს და მოქმედებებს. ",

i18n/km.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ko.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "목록에 있는 모든 카드를 이동",
     "list-select-cards": "목록에 있는 모든 카드를 선택",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "동작 목록",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trello 카드 가져 오기",
     "listMorePopup-title": "더보기",
     "link-list": "이 리스트에 링크",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/lv.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/mn.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/nb.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Mer",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/nl.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Verplaats alle kaarten in deze lijst",
     "list-select-cards": "Selecteer alle kaarten in deze lijst",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Lijst acties",
     "swimlaneActionPopup-title": "Swimlane handelingen",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importeer een Trello kaart",
     "listMorePopup-title": "Meer",
     "link-list": "Link naar deze lijst",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/pl.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "To usunie wszystkie karty z tej listy z tej tablicy. Aby przejrzeć karty w Archiwum i przywrócić na tablicę, kliknij \"Menu\" > \"Archiwizuj\".",
     "list-move-cards": "Przenieś wszystkie karty z tej listy",
     "list-select-cards": "Zaznacz wszystkie karty z tej listy",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Lista akcji",
     "swimlaneActionPopup-title": "Opcje diagramu czynności",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Zaimportuj kartę z Trello",
     "listMorePopup-title": "Więcej",
     "link-list": "Podepnij do tej listy",
@@ -517,7 +519,10 @@
     "card-end-on": "Kończy się",
     "editCardReceivedDatePopup-title": "Zmień datę odebrania",
     "editCardEndDatePopup-title": "Zmień datę ukończenia",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Przypisane przez",
     "requested-by": "Zlecone przez",
     "board-delete-notice": "Usuwanie jest permanentne. Stracisz wszystkie listy, kart oraz czynności przypisane do tej tablicy.",

i18n/pt-BR.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Isto removerá todos os cartões desta lista para o quadro. Para visualizar cartões arquivados e trazê-los de volta para o quadro, clique em “Menu” > “Arquivo-morto”.",
     "list-move-cards": "Mover todos os cartões desta lista",
     "list-select-cards": "Selecionar todos os cartões nesta lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Listar Ações",
     "swimlaneActionPopup-title": "Ações de Raia",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importe um cartão do Trello",
     "listMorePopup-title": "Mais",
     "link-list": "Vincular a esta lista",
@@ -517,7 +519,10 @@
     "card-end-on": "Termina em",
     "editCardReceivedDatePopup-title": "Modificar data de recebimento",
     "editCardEndDatePopup-title": "Mudar data de fim",
-    "setCardColor-title": "Definir cor",
+    "setCardColorPopup-title": "Definir cor",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Atribuído por",
     "requested-by": "Solicitado por",
     "board-delete-notice": "Excluir é permanente. Você perderá todas as listas, cartões e ações associados nesse quadro.",

i18n/pt.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Mais",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ro.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ru.i18n.json

@@ -169,30 +169,30 @@
     "close-board-pop": "Вы сможете восстановить доску, нажав \"Архив\" в заголовке домашней страницы.",
     "color-black": "черный",
     "color-blue": "синий",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "малиновый",
+    "color-darkgreen": "темно-зеленый",
+    "color-gold": "золотой",
+    "color-gray": "серый",
     "color-green": "зеленый",
-    "color-indigo": "indigo",
+    "color-indigo": "индиго",
     "color-lime": "лимоновый",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "маджента",
+    "color-mistyrose": "тускло-розовый",
+    "color-navy": "темно-синий",
     "color-orange": "оранжевый",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "бледно-бирюзовый",
+    "color-peachpuff": "персиковый",
     "color-pink": "розовый",
-    "color-plum": "plum",
+    "color-plum": "сливовый",
     "color-purple": "фиолетовый",
     "color-red": "красный",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "кожано-коричневый",
+    "color-silver": "серебристый",
     "color-sky": "голубой",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "серо-голубой",
+    "color-white": "белый",
     "color-yellow": "желтый",
-    "unset-color": "Unset",
+    "unset-color": "Убрать",
     "comment": "Добавить комментарий",
     "comment-placeholder": "Написать комментарий",
     "comment-only": "Только комментирование",
@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "Это действие удалит все карточки из этого списка с доски. Чтобы просмотреть карточки в Архиве и вернуть их на доску, нажмите “Меню” > “Архив”.",
     "list-move-cards": "Переместить все карточки в этом списке",
     "list-select-cards": "Выбрать все карточки в этом списке",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Список действий",
     "swimlaneActionPopup-title": "Действия с дорожкой",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Импортировать Trello карточку",
     "listMorePopup-title": "Поделиться",
     "link-list": "Ссылка на список",
@@ -496,7 +498,7 @@
     "OS_Totalmem": "Общая память",
     "OS_Type": "Тип ОС",
     "OS_Uptime": "Время работы",
-    "days": "days",
+    "days": "дней",
     "hours": "часы",
     "minutes": "минуты",
     "seconds": "секунды",
@@ -517,7 +519,10 @@
     "card-end-on": "Завершится до",
     "editCardReceivedDatePopup-title": "Изменить дату получения",
     "editCardEndDatePopup-title": "Изменить дату завершения",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Задать цвет",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Поручил",
     "requested-by": "Запросил",
     "board-delete-notice": "Удаление является постоянным. Вы потеряете все списки, карты и действия, связанные с этой доской.",
@@ -596,7 +601,7 @@
     "r-label": "метку",
     "r-member": "участника",
     "r-remove-all": "Удалить всех участников из карточки",
-    "r-set-color": "Set color to",
+    "r-set-color": "Сменить цвет на",
     "r-checklist": "контрольный список",
     "r-check-all": "Отметить все",
     "r-uncheck-all": "Снять все",

i18n/sr.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/sv.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Flytta alla kort i denna lista",
     "list-select-cards": "Välj alla kort i denna lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Liståtgärder",
     "swimlaneActionPopup-title": "Simbana-åtgärder",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importera ett Trello kort",
     "listMorePopup-title": "Mera",
     "link-list": "Länk till den här listan",
@@ -517,7 +519,10 @@
     "card-end-on": "Slutar den",
     "editCardReceivedDatePopup-title": "Ändra mottagningsdatum",
     "editCardEndDatePopup-title": "Ändra slutdatum",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Tilldelad av",
     "requested-by": "Efterfrågad av",
     "board-delete-notice": "Borttagningen är permanent. Du kommer förlora alla listor, kort och händelser kopplade till den här anslagstavlan.",

i18n/sw.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/ta.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/th.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "ย้ายการ์ดทั้งหมดในรายการนี้",
     "list-select-cards": "เลือกการ์ดทั้งหมดในรายการนี้",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "รายการการดำเนิน",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "นำเข้าการ์ด Trello",
     "listMorePopup-title": "เพิ่มเติม",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/tr.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Listedeki tüm kartları taşı",
     "list-select-cards": "Listedeki tüm kartları seç",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Liste İşlemleri",
     "swimlaneActionPopup-title": "Kulvar İşlemleri",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Bir Trello kartını içeri aktar",
     "listMorePopup-title": "Daha",
     "link-list": "Listeye doğrudan bağlantı",
@@ -517,7 +519,10 @@
     "card-end-on": "Bitiş zamanı",
     "editCardReceivedDatePopup-title": "Giriş tarihini değiştir",
     "editCardEndDatePopup-title": "Bitiş tarihini değiştir",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "renk ayarla",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Atamayı yapan",
     "requested-by": "Talep Eden",
     "board-delete-notice": "Silme kalıcıdır. Bu kartla ilişkili tüm listeleri, kartları ve işlemleri kaybedeceksiniz.",

i18n/uk.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/vi.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

i18n/zh-CN.i18n.json

@@ -2,7 +2,7 @@
     "accept": "接受",
     "act-activity-notify": "活动通知",
     "act-addAttachment": "添加附件 __attachment__ 至卡片 __card__",
-    "act-addSubtask": "添加清单 __checklist__ 到__card__",
+    "act-addSubtask": "添加子任务 __checklist__ 到__card__",
     "act-addChecklist": "添加清单 __checklist__ 到 __card__",
     "act-addChecklistItem": "向  __card__ 中的清单 __checklist__ 添加 __checklistItem__",
     "act-addComment": "在 __card__ 发布评论: __comment__",
@@ -169,30 +169,30 @@
     "close-board-pop": "您可以通过主页头部的“归档”按钮，来恢复看板。",
     "color-black": "黑色",
     "color-blue": "蓝色",
-    "color-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "深红",
+    "color-darkgreen": "墨绿",
+    "color-gold": "金",
+    "color-gray": "灰",
     "color-green": "绿色",
-    "color-indigo": "indigo",
+    "color-indigo": "靛蓝",
     "color-lime": "绿黄",
-    "color-magenta": "magenta",
-    "color-mistyrose": "mistyrose",
-    "color-navy": "navy",
+    "color-magenta": "洋红",
+    "color-mistyrose": "玫瑰红",
+    "color-navy": "藏青",
     "color-orange": "橙色",
-    "color-paleturquoise": "paleturquoise",
-    "color-peachpuff": "peachpuff",
+    "color-paleturquoise": "宝石绿",
+    "color-peachpuff": "桃红",
     "color-pink": "粉红",
-    "color-plum": "plum",
+    "color-plum": "紫红",
     "color-purple": "紫色",
     "color-red": "红色",
-    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-saddlebrown": "棕褐",
+    "color-silver": "银",
     "color-sky": "天蓝",
-    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-slateblue": "石板蓝",
+    "color-white": "白",
     "color-yellow": "黄色",
-    "unset-color": "Unset",
+    "unset-color": "复原",
     "comment": "评论",
     "comment-placeholder": "添加评论",
     "comment-only": "仅能评论",
@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "将移动看板中列表的所有卡片，查看或回复归档中的卡片，点击“菜单”->“归档”",
     "list-move-cards": "移动列表中的所有卡片",
     "list-select-cards": "选择列表中的所有卡片",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "列表操作",
     "swimlaneActionPopup-title": "泳道图操作",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "导入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "关联到这个列表",
@@ -517,7 +519,10 @@
     "card-end-on": "终止于",
     "editCardReceivedDatePopup-title": "修改接收日期",
     "editCardEndDatePopup-title": "修改终止日期",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "设置颜色",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "分配人",
     "requested-by": "需求人",
     "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。",
@@ -596,7 +601,7 @@
     "r-label": "标签",
     "r-member": "成员",
     "r-remove-all": "从卡片移除所有成员",
-    "r-set-color": "Set color to",
+    "r-set-color": "设置颜色",
     "r-checklist": "清单",
     "r-check-all": "勾选所有",
     "r-uncheck-all": "取消勾选所有",

i18n/zh-TW.i18n.json

@@ -335,8 +335,10 @@
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "移動清單中的所有卡片",
     "list-select-cards": "選擇清單中的所有卡片",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "清單操作",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "匯入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "連結到這個清單",
@@ -517,7 +519,10 @@
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
     "editCardEndDatePopup-title": "Change end date",
-    "setCardColor-title": "Set color",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
     "assigned-by": "Assigned By",
     "requested-by": "Requested By",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",

models/boards.js

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

models/cards.js

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

models/lists.js

@@ -92,6 +92,21 @@ Lists.attachSchema(new SimpleSchema({
     type: Boolean,
     defaultValue: false,
   },
+  color: {
+    /**
+     * the color of the list
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
 }));
 
 Lists.allow({
@@ -148,6 +163,12 @@ Lists.helpers({
       return list.wipLimit[option] ? list.wipLimit[option] : 0; // Necessary check to avoid exceptions for the case where the doc doesn't have the wipLimit field yet set
     }
   },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
 });
 
 Lists.mutations({
@@ -174,6 +195,17 @@ Lists.mutations({
   setWipLimit(limit) {
     return { $set: { 'wipLimit.value': limit } };
   },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });
 
 Meteor.methods({
@@ -314,9 +346,11 @@ if (Meteor.isServer) {
     try {
       Authentication.checkUserId( req.userId);
       const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
       const id = Lists.insert({
         title: req.body.title,
         boardId: paramBoardId,
+        sort: board.lists().count(),
       });
       JsonRoutes.sendResult(res, {
         code: 200,

models/swimlanes.js

@@ -49,6 +49,21 @@ Swimlanes.attachSchema(new SimpleSchema({
     // XXX We should probably provide a default
     optional: true,
   },
+  color: {
+    /**
+     * the color of the swimlane
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
   updatedAt: {
     /**
      * when was the swimlane last edited
@@ -93,6 +108,12 @@ Swimlanes.helpers({
   board() {
     return Boards.findOne(this.boardId);
   },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
 });
 
 Swimlanes.mutations({
@@ -107,6 +128,17 @@ Swimlanes.mutations({
   restore() {
     return { $set: { archived: false } };
   },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });
 
 Swimlanes.hookOptions.after.update = { fetchPrevious: false };
@@ -224,9 +256,11 @@ if (Meteor.isServer) {
     try {
       Authentication.checkUserId( req.userId);
       const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
       const id = Swimlanes.insert({
         title: req.body.title,
         boardId: paramBoardId,
+        sort: board.swimlanes().count(),
       });
       JsonRoutes.sendResult(res, {
         code: 200,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.02.0",
+  "version": "v2.03.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 204,
+    appVersion = 205,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.02.0~2019-01-22"),
+    appMarketingVersion = (defaultText = "2.03.0~2019-01-25"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,