From 9e4d01e24411f701b53101d02e208b781b282bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 29 Jan 2016 12:39:56 +0100
Subject: [PATCH 001/155] Fix menu in IE10

---
 app/styles/modules/common/nav.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 4472d51a..338e23ab 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -2,7 +2,9 @@ $label-arrow-wh: 12px;
 
 tg-project-menu {
     background-position: 0 -300px;
-    min-height: $main-height;
+    display: inline-block;
+    height: $main-height;
+    min-height: 95%;
     min-width: 50px;
     padding: 1rem 0;
     position: relative;

From a46f192dab3c64a172815294df156b60fb2766b5 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 29 Jan 2016 12:49:36 +0100
Subject: [PATCH 002/155] fix logout e2e ie

---
 e2e/suites/auth/auth.e2e.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/e2e/suites/auth/auth.e2e.js b/e2e/suites/auth/auth.e2e.js
index 52f15d91..9cac8f62 100644
--- a/e2e/suites/auth/auth.e2e.js
+++ b/e2e/suites/auth/auth.e2e.js
@@ -72,7 +72,9 @@ describe('auth', function() {
 
             let url = await browser.getCurrentUrl();
 
-            expect(url).to.be.equal(browser.params.glob.host + 'login');
+            await browser.wait(async () => {
+                return url === browser.params.glob.host + 'discover';
+            }, 2000);
         });
 
         describe("register", function() {

From 7f8376d35f552cfba40516263a39b52a80657ac3 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 29 Jan 2016 12:58:22 +0100
Subject: [PATCH 003/155] discover projects lazy pagination

---
 app/modules/resources/projects-resource.service.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/modules/resources/projects-resource.service.coffee b/app/modules/resources/projects-resource.service.coffee
index 4385b90c..d18fc96e 100644
--- a/app/modules/resources/projects-resource.service.coffee
+++ b/app/modules/resources/projects-resource.service.coffee
@@ -30,7 +30,7 @@ Resource = (urlsService, http, paginateResponseService) ->
         if !pagination
             httpOptions = {
                 headers: {
-                    "x-disable-pagination": "1"
+                    "x-lazy-pagination": true
                 }
             }
 

From b7943c1a88eb4ae9fffc6a1b0c86ee72160e25b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 29 Jan 2016 13:37:44 +0100
Subject: [PATCH 004/155] Assigned to fixes

---
 app/coffee/modules/common/components.coffee     | 1 +
 app/partials/common/components/assigned-to.jade | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index 32b61689..dece6008 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -304,6 +304,7 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $qqueue, $template
                 isUnassigned: isUnassigned
                 isEditable: isEditable()
                 isIocaine: isIocaine
+                fullNameVisible: !(isUnassigned && !$currentUserService.isAuthenticated())
             }
             html = $compile(template(ctx))($scope)
             $el.html(html)
diff --git a/app/partials/common/components/assigned-to.jade b/app/partials/common/components/assigned-to.jade
index 1c23647b..25b4b52b 100644
--- a/app/partials/common/components/assigned-to.jade
+++ b/app/partials/common/components/assigned-to.jade
@@ -19,7 +19,7 @@
             class!="user-assigned <% if (isEditable) { %>editable<% }; %>"
         )
             span.assigned-name
-                <% if (isEditable && isUnassigned) { %>
+                <% if (fullNameVisible) { %>
                 <%- fullName %>
                 <% }; %>
                 <% if (isEditable && !isUnassigned) { %>

From 9431b158fe703431aff0a992a1a2e760f7b153db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 29 Jan 2016 14:05:04 +0100
Subject: [PATCH 005/155] Fix navigation bar in IE-chrome

---
 app/styles/modules/common/nav.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 338e23ab..5f49450c 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -3,7 +3,6 @@ $label-arrow-wh: 12px;
 tg-project-menu {
     background-position: 0 -300px;
     display: inline-block;
-    height: $main-height;
     min-height: 95%;
     min-width: 50px;
     padding: 1rem 0;

From 601e329d7193a0c56758403c9a9950add9a813ea Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Sat, 30 Jan 2016 16:47:06 +0100
Subject: [PATCH 006/155] Fixing total sprints and points fields

---
 app/partials/admin/admin-project-profile.jade | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 235202c9..48803421 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -73,7 +73,6 @@ div.wrapper(
                         ng-model="project.description"
                         data-required="true"
                     )
-
                 fieldset
                     label(for="tags") {{ 'ADMIN.PROJECT_PROFILE.TAGS' | translate }}
                     div.tags-block(
@@ -81,6 +80,31 @@ div.wrapper(
                         tg-lb-tag-line
                         ng-model="project.tags"
                     )
+
+                fieldset
+                    label(for="project-sprints") {{ 'ADMIN.PROJECT_PROFILE.NUMBER_SPRINTS' | translate }}
+                    input(
+                        type="number"
+                        name="total_milestones"
+                        min="0"
+                        placeholder="{{'ADMIN.PROJECT_PROFILE.NUMBER_SPRINTS' | translate}}"
+                        id="project-sprints"
+                        ng-model="project.total_milestones"
+                        data-type="digits"
+                    )
+
+                fieldset
+                    label(for="total-story-points") {{ 'ADMIN.PROJECT_PROFILE.NUMBER_US_POINTS' | translate }}
+                    input(
+                        type="number"
+                        name="total_story_points"
+                        min="0"
+                        placeholder="{{'ADMIN.PROJECT_PROFILE.NUMBER_US_POINTS' | translate}}"
+                        id="total-story-points"
+                        ng-model="project.total_story_points"
+                        data-type="digits"
+                    )
+
                 fieldset.looking-for-people
                     .looking-for-people-selector
                         span {{ 'ADMIN.PROJECT_PROFILE.RECRUITING' | translate }}
@@ -119,7 +143,7 @@ div.wrapper(
                             label.trans-button(for="private-project") {{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT' | translate }}
                                 span(title="{{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT_DESC' | translate }}")
                                     include ../../svg/help.svg
-                                    
+
                         div.privacy-option
                             input.privacy-project(
                                 type="radio"

From f151b2a7b996d58bff38380c4293a03ef7ea34ba Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Sun, 31 Jan 2016 18:06:11 +0100
Subject: [PATCH 007/155] Fixing decimal places on backlog

---
 app/partials/includes/components/summary.jade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/partials/includes/components/summary.jade b/app/partials/includes/components/summary.jade
index e81b0b05..26913101 100644
--- a/app/partials/includes/components/summary.jade
+++ b/app/partials/includes/components/summary.jade
@@ -4,14 +4,14 @@ div.summary
     div.data
         span.number(ng-bind="stats.completedPercentage + '%'")
 
-    div.summary-stats(ng-if="stats.total_points")
+    div.summary-stats(ng-if="stats.total_points | number:2")
         span.number(ng-bind="stats.total_points") --
         span.description(translate="BACKLOG.SUMMARY.PROJECT_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.defined_points") --
+        span.number(ng-bind="stats.defined_points | number:2") --
         span.description(translate="BACKLOG.SUMMARY.DEFINED_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.closed_points") --
+        span.number(ng-bind="stats.closed_points | number:2") --
         span.description(translate="BACKLOG.SUMMARY.CLOSED_POINTS")
     div.summary-stats
         span.number(ng-bind="stats.speed | number:0") --

From 45e9bbc7ee914a4dfb0c4c466296dc1ecac419cb Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 29 Jan 2016 13:45:11 +0100
Subject: [PATCH 008/155] fix public e2e

---
 e2e/suites/public/public.e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/suites/public/public.e2e.js b/e2e/suites/public/public.e2e.js
index c5f5118c..f0fb86f4 100644
--- a/e2e/suites/public/public.e2e.js
+++ b/e2e/suites/public/public.e2e.js
@@ -12,7 +12,7 @@ describe('Public', async function(){
 
         await utils.common.waitLoader();
 
-        $$('.privacy-settings input').get(0).click();
+        $$('.project-privacy-settings label').get(0).click();
 
         $('button[type="submit"]').click();
 

From 747a190f33d3f3a7681f9fcc49b101024cc10666 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 1 Feb 2016 07:48:56 +0100
Subject: [PATCH 009/155] logout redirect to discover - fix e2e

---
 e2e/utils/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index 2b041457..f84b2b09 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -161,7 +161,7 @@ common.logout = async function() {
 
     return browser.driver.wait(async function() {
         let url =  await browser.driver.getCurrentUrl();
-        return url === browser.params.glob.host + 'login';
+        return url === browser.params.glob.host + 'discover';
     }, 10000);
 };
 

From 3e9dee18f26d8354bfd488dd3a5678946752ab32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 1 Feb 2016 09:57:23 +0100
Subject: [PATCH 010/155] Fix all release bugs

---
 app/locales/taiga/locale-en.json              |  1 -
 app/modules/attachments/attachments.scss      |  8 ++++-
 .../attachments-full/attachments-full.jade    |  5 ---
 .../attachments-simple.jade                   |  5 ---
 .../project-logo-src.directive.coffee         |  2 +-
 .../discover-search/discover-search.scss      |  2 +-
 app/partials/admin/admin-project-profile.jade |  5 +--
 app/partials/common/tag/tag-line.jade         |  5 +--
 app/partials/user/user-profile.jade           |  5 +--
 .../dependencies/mixins/profile-form.scss     | 17 ++++------
 .../dependencies/mixins/project-card.scss     |  1 +
 app/styles/layout/ticket-detail.scss          |  8 +++--
 app/styles/modules/common/assigned-to.scss    | 33 +++++++++++--------
 13 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index fdf60757..bb4f3709 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -373,7 +373,6 @@
         "DEPRECATED_FILE": "Deprecated?",
         "ADD": "Add new attachment. {{maxFileSizeMsg}}",
         "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Max. size:  {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ show deprecated atachments",
         "HIDE_DEPRECATED": "- hide deprecated atachments",
         "COUNT_DEPRECATED": "({{ counter }} deprecated)",
diff --git a/app/modules/attachments/attachments.scss b/app/modules/attachments/attachments.scss
index b110a0c4..4d193053 100644
--- a/app/modules/attachments/attachments.scss
+++ b/app/modules/attachments/attachments.scss
@@ -20,7 +20,7 @@
     }
     label {
         cursor: pointer;
-        margin-left: 1rem;
+        margin-left: .25rem;
         &.add-attachment-button {
             background: $gray;
             border: 0;
@@ -54,6 +54,12 @@
             width: 1.6rem;
         }
     }
+    .size-info {
+        @extend %light;
+        @extend %small;
+        color: $gray;
+        padding-left: 1rem;
+    }
     input {
         display: none;
     }
diff --git a/app/modules/components/attachments-full/attachments-full.jade b/app/modules/components/attachments-full/attachments-full.jade
index 0e3852b4..9968d9fa 100644
--- a/app/modules/components/attachments-full/attachments-full.jade
+++ b/app/modules/components/attachments-full/attachments-full.jade
@@ -20,11 +20,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
                 tg-check-permission="modify_{{vm.type}}"
                 title!="{{'ATTACHMENT.ADD' | translate}}"
             )
-                span.size-info(
-                    ng-if="vm.maxFileSize",
-                    translate="ATTACHMENT.MAX_FILE_SIZE",
-                    translate-values="{ 'maxFileSize': vm.maxFileSize}"
-                )
 
                 label.add-attachment-button(for="add-attach")
                     include ../../../svg/add.svg
diff --git a/app/modules/components/attachments-simple/attachments-simple.jade b/app/modules/components/attachments-simple/attachments-simple.jade
index d40aca41..461f5ba8 100644
--- a/app/modules/components/attachments-simple/attachments-simple.jade
+++ b/app/modules/components/attachments-simple/attachments-simple.jade
@@ -4,11 +4,6 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
     .attachments-header 
         h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")]
         .add-attach(title!="{{'ATTACHMENT.ADD' | translate}}")
-            span.size-info(
-                translate="ATTACHMENT.MAX_FILE_SIZE"
-                translate-values="{ 'maxFileSize': vm.maxFileSizeFormated}"
-                ng-if="vm.maxFileSize"
-            )
             label.add-attachment-button(for="add-attach")
                 include ../../../svg/add.svg
             input(
diff --git a/app/modules/components/project-logo-src/project-logo-src.directive.coffee b/app/modules/components/project-logo-src/project-logo-src.directive.coffee
index 2b7b8804..861930e0 100644
--- a/app/modules/components/project-logo-src/project-logo-src.directive.coffee
+++ b/app/modules/components/project-logo-src/project-logo-src.directive.coffee
@@ -51,7 +51,7 @@ ProjectLogoSrcDirective = ($parse) ->
 
             return if not project
 
-            projectLogo = project.get('logo_small_url')
+            projectLogo = project.get('logo_big_url')
 
             if projectLogo
                 el.attr("src", projectLogo)
diff --git a/app/modules/discover/discover-search/discover-search.scss b/app/modules/discover/discover-search/discover-search.scss
index 3e27631c..9cc13527 100644
--- a/app/modules/discover/discover-search/discover-search.scss
+++ b/app/modules/discover/discover-search/discover-search.scss
@@ -81,7 +81,7 @@
     }
     .project-statistics {
         display: flex;
-        flex-basis: 140px;
+        flex-basis: 300px;
         justify-content: flex-end;
         svg {
             @include svg-size(.8rem);
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 48803421..c786f932 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -35,11 +35,8 @@ div.wrapper(
                         id="logo-field"
                         tg-project-logo-model="logoAttachment"
                     )
-                p.image-help
-                    span {{ 'ADMIN.PROJECT_PROFILE.LOGO_HELP' | translate }}
-                    span.size-info.hidden(tg-bo-html="maxFileSizeMsg")
 
-                a.button-green.change.js-change-logo(
+                a.button-green.change-image.js-change-logo(
                     href="#"
                     title="{{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}"
                 ) {{'ADMIN.PROJECT_PROFILE.CHANGE_LOGO' | translate}}
diff --git a/app/partials/common/tag/tag-line.jade b/app/partials/common/tag/tag-line.jade
index d6bc320a..06040a9e 100644
--- a/app/partials/common/tag/tag-line.jade
+++ b/app/partials/common/tag/tag-line.jade
@@ -3,5 +3,6 @@ a(href="#", class="add-tag hidden", title="{{'COMMON.TAGS.ADD' | translate}}")
     span.icon.icon-plus
     span.add-tag-text(translate="COMMON.TAGS.ADD")
 
-input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input hidden")
-a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden")
+span.add-tag-input
+    input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input hidden")
+    a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden")
diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade
index 8cab43ea..2eb62e65 100644
--- a/app/partials/user/user-profile.jade
+++ b/app/partials/user/user-profile.jade
@@ -27,11 +27,8 @@ div.wrapper(
                         id="avatar-field"
                         tg-avatar-model="avatarAttachment"
                     )
-                p.image-help
-                    span {{ 'USER_PROFILE.IMAGE_HELP' | translate }}
-                    span.size-info.hidden(tg-bo-html="maxFileSizeMsg")
 
-                a.button-green.change.js-change-avatar(
+                a.button-green.change-image.js-change-avatar(
                     href="#"
                     title="{{'USER_PROFILE.CHANGE_PHOTO' | translate}}"
                 ) {{'USER_PROFILE.CHANGE_PHOTO' | translate}}
diff --git a/app/styles/dependencies/mixins/profile-form.scss b/app/styles/dependencies/mixins/profile-form.scss
index afdbbe2b..b19d7365 100644
--- a/app/styles/dependencies/mixins/profile-form.scss
+++ b/app/styles/dependencies/mixins/profile-form.scss
@@ -18,14 +18,13 @@
         .image {
             width: 100%;
         }
-        .loading-spinner {
-
-        }
     }
-
+    .change-image {
+        display: block;
+    }
     .image-container {
         position: relative;
-        margin-bottom: 0;
+        margin-bottom: .5rem;
     }
     .loading-overlay {
         display: none;
@@ -46,14 +45,10 @@
         border: 0;
         transform-origin: center center;
     }
-    .image-help {
-        @extend %xsmall;
-        line-height: 1rem;
-        margin-bottom: .5rem;
-        text-align: center;
-    }
     .use-default-image {
         @extend %xsmall;
+        display: block;
+        margin-top: .25rem;
         text-align: center;
         &:hover {
             color: $red;
diff --git a/app/styles/dependencies/mixins/project-card.scss b/app/styles/dependencies/mixins/project-card.scss
index ae606573..2d1102e8 100644
--- a/app/styles/dependencies/mixins/project-card.scss
+++ b/app/styles/dependencies/mixins/project-card.scss
@@ -51,6 +51,7 @@
     .project-card-logo {
         display: inline-block;
         flex-basis: 50px;
+        flex-shrink: 0;
         width: 50px;
         height: 50px;
         margin-right: .5rem;
diff --git a/app/styles/layout/ticket-detail.scss b/app/styles/layout/ticket-detail.scss
index a2d5bedd..b71fbed5 100644
--- a/app/styles/layout/ticket-detail.scss
+++ b/app/styles/layout/ticket-detail.scss
@@ -10,10 +10,11 @@
     .us-title {
         @extend %large;
         @extend %text;
-        align-items: center;
+        align-items: flex-start;
         background: $whitish;
         display: flex;
         flex: 1;
+        flex-direction: column;
         padding: .5rem;
         position: relative;
         transition: all .2s linear;
@@ -57,10 +58,11 @@
             align-content: center;
             align-items: center;
             display: flex;
+            width: 100%;
         }
         input {
             background: $white;
-            flex-grow: 9;
+            flex-grow: 1;
         }
         .save-container {
             flex-grow: 1;
@@ -74,6 +76,7 @@
             flex: 1;
             margin-bottom: 0;
             max-width: 92%;
+            width: 100%;
         }
         .us-title-text:hover {
             .icon-edit {
@@ -91,6 +94,7 @@
         .us-name {
             color: $gray;
             display: inline-block;
+            flex-grow: 1;
             line-height: 2.2rem;
             padding-right: 1rem;
             width: 100%;
diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss
index a30a5e48..f4b2ccf7 100644
--- a/app/styles/modules/common/assigned-to.scss
+++ b/app/styles/modules/common/assigned-to.scss
@@ -60,20 +60,6 @@
         .assigned-to-options {
             display: inline-block;
         }
-        .user-assigned,
-        .assign-to-me {
-            color: $primary;
-            cursor: default;
-            &:hover {
-                cursor: pointer;
-            }
-            .icon {
-                vertical-align: middle;
-            }
-            > span {
-                @include ellipsis(80%);
-            }
-        }
         .icon-delete {
             color: $gray-light;
             opacity: 0;
@@ -85,4 +71,23 @@
             }
         }
     }
+    .user-assigned,
+    .assign-to-me {
+        cursor: default;
+        &:hover {
+            color: currentColor;
+        }
+        &.editable {
+            color: $primary;
+            &:hover {
+                cursor: pointer;
+            }
+        }
+        .icon {
+            vertical-align: middle;
+        }
+        > span {
+            @include ellipsis(80%);
+        }
+    }
 }

From fa62ad3abf6864be27385143f117d8dd5db726c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 1 Feb 2016 20:06:03 +0100
Subject: [PATCH 011/155] Fix #3839: Add meta data to the new discover pages

---
 app/locales/taiga/locale-ca.json              | 82 ++++++++++---------
 app/locales/taiga/locale-de.json              |  4 +
 app/locales/taiga/locale-en.json              |  4 +
 app/locales/taiga/locale-es.json              |  4 +
 app/locales/taiga/locale-fi.json              |  4 +
 app/locales/taiga/locale-fr.json              |  4 +
 app/locales/taiga/locale-it.json              |  4 +
 app/locales/taiga/locale-nl.json              |  4 +
 app/locales/taiga/locale-pl.json              |  4 +
 app/locales/taiga/locale-pt-br.json           |  4 +
 app/locales/taiga/locale-ru.json              |  4 +
 app/locales/taiga/locale-sv.json              | 18 ++--
 app/locales/taiga/locale-tr.json              |  4 +
 app/locales/taiga/locale-zh-hant.json         |  4 +
 .../discover-home.controller.coffee           |  9 +-
 .../discover-home.controller.spec.coffee      | 29 ++++++-
 .../discover-search.controller.coffee         | 10 ++-
 .../discover-search.controller.spec.coffee    | 27 ++++++
 18 files changed, 172 insertions(+), 51 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index 0f324f4c..f8dfd9cc 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Si",
         "NO": "No",
-        "OR": "or",
+        "OR": "o",
         "LOADING": "Carregant...",
         "LOADING_PROJECT": "Carregant projecte...",
         "DATE": "DD MMM YYYY",
@@ -19,11 +19,11 @@
         "TAG_LINE": "La teua eïna de gestió de projectes àgil, gratuita i de codi obert ",
         "TAG_LINE_2": "ESTIMA EL TEU PROJECTE",
         "BLOCK": "Bloquejar",
-        "BLOCK_TITLE": "Block this item for example if it has a dependency that can not be satisfied",
+        "BLOCK_TITLE": "Bloqueja aquest element si té una dependència que no pot ser satisfeta",
         "BLOCKED": "Bloquejat",
         "UNBLOCK": "Desbloquejar",
-        "UNBLOCK_TITLE": "Unblock this item",
-        "BLOCKED_NOTE": "Why is this blocked?",
+        "UNBLOCK_TITLE": "Desbloquejar aquest element",
+        "BLOCKED_NOTE": "Per qué està bloquejat?",
         "BLOCKED_REASON": "Per favor, explica la raó",
         "CREATED_BY": "Creat per {{fullDisplayName}}",
         "FROM": "de",
@@ -169,7 +169,7 @@
             "UNWATCH": "Unwatch",
             "WATCHERS": "Watchers",
             "BUTTON_TITLE": "Watch/Unwatch this item",
-            "COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}"
+            "COUNTER_TITLE": "{total, plural, one{un seguidor} other{# seguidors}}"
         },
         "VOTE_BUTTON": {
             "UPVOTE": "Upvote",
@@ -282,9 +282,9 @@
         "HEADER": "Ja tinc un compte de Taiga",
         "PLACEHOLDER_AUTH_NAME": "Nom d'usuari i correu electrònic (sensible a majúscules i minúscules)",
         "LINK_FORGOT_PASSWORD": "L'has oblidat?",
-        "TITLE_LINK_FORGOT_PASSWORD": "Did you forget your password?",
+        "TITLE_LINK_FORGOT_PASSWORD": "Has oblidat la contrasenya?",
         "ACTION_ENTER": "Entrar",
-        "ACTION_SIGN_IN": "Login",
+        "ACTION_SIGN_IN": "Entrar",
         "PLACEHOLDER_AUTH_PASSWORD": "Contrasenya (sensible a majúscules i minúscules)"
     },
     "LOGIN_FORM": {
@@ -352,11 +352,11 @@
         "PAGE_TITLE": "Home - Taiga",
         "PAGE_DESCRIPTION": "La home de Taiga amb els teus projectes principals, totes les històries d'usuari, tasques i incidències que tens assignades i aquelles que estàs Watching",
         "EMPTY_WORKING_ON": "<strong>Sembla buit, no?</strong> Comenceu a treballar amb Taiga i voràs ací les históries, tasques e incidències en les que estás treballant.",
-        "EMPTY_WATCHING": "<strong>Follow</strong> User Stories, Tasks, Issues in your projects and be notified about its changes :)",
+        "EMPTY_WATCHING": "<strong>Segueix</strong> históries, tasques e incidéncies en els teus project i rep notificacions quan canvien :)",
         "EMPTY_PROJECT_LIST": "No tens cap projecte encara",
         "WORKING_ON_SECTION": "En Progrés",
         "WATCHING_SECTION": "Observant",
-        "DASHBOARD": "Projects Dashboard"
+        "DASHBOARD": "Panell principal"
     },
     "PROJECTS": {
         "PAGE_TITLE": "Els meus projectes - Taiga",
@@ -366,13 +366,13 @@
     "ATTACHMENT": {
         "SECTION_NAME": "Adjunts",
         "TITLE": "{{ fileName }} pujat el {{ date }}",
-        "LIST_VIEW_MODE": "List view mode",
-        "GALLERY_VIEW_MODE": "Gallery view mode",
+        "LIST_VIEW_MODE": "Vista de llista",
+        "GALLERY_VIEW_MODE": "Galeria",
         "DESCRIPTION": "Escriu una descripció curta",
         "DEPRECATED": "(obsolet)",
         "DEPRECATED_FILE": "Obsolet?",
         "ADD": "Afegeix un nou adjunt. {{maxFileSizeMsg}}",
-        "DROP": "Drop attachments here!",
+        "DROP": "Deixa els adjunts ací",
         "MAX_FILE_SIZE": "[Max. grandària:  {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ mostra els adjunts obsolets",
         "HIDE_DEPRECATED": "- Amagar els adjunts obsolets",
@@ -453,11 +453,11 @@
             "NUMBER_US_POINTS": "Nombre de punts d'històries (0 per a una quantitat indeterminada)",
             "TAGS": "Etiquetes",
             "DESCRIPTION": "Descripció",
-            "RECRUITING": "Is this project looking for people?",
-            "RECRUITING_MESSAGE": "Who are you looking for?",
-            "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
+            "RECRUITING": "Este projecte busca col·laboracions?",
+            "RECRUITING_MESSAGE": "A qui estàs buscant?",
+            "RECRUITING_PLACEHOLDER": "Defineix els perfils que estàs buscant",
             "PUBLIC_PROJECT": "Projecte públic",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
+            "PUBLIC_PROJECT_DESC": "Els usuaris podràn trobar i vore el teu projecte",
             "PRIVATE_PROJECT": "Projecte privat",
             "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
@@ -690,9 +690,9 @@
                 "ACTIVITY_TAB": "Timeline",
                 "ACTIVITY_TAB_TITLE": "Mostra tota la activitat d'aquest usuari",
                 "PROJECTS_TAB": "Projectes",
-                "PROJECTS_TAB_TITLE": "List of all projects in which the user is a member",
-                "LIKES_TAB": "Likes",
-                "LIKES_TAB_TITLE": "List all likes made by this user",
+                "PROJECTS_TAB_TITLE": "Mostra tots els projects del que el usuari es administrador",
+                "LIKES_TAB": "Favorits",
+                "LIKES_TAB_TITLE": "Mostra tots els favorits del usuari",
                 "VOTES_TAB": "Vots",
                 "VOTES_TAB_TITLE": "List all votes made by this user",
                 "WATCHED_TAB": "Watched",
@@ -703,7 +703,7 @@
         },
         "PROFILE_SIDEBAR": {
             "TITLE": "El teu perfil",
-            "DESCRIPTION": "People can see everything you do and what you are working on. Add a nice bio to give an enhanced version of your information.",
+            "DESCRIPTION": "La gent pot vore tot el que fas i en qué estàs treballant. Afegix una bio interessant per a donar una millor versió de la teua informació.",
             "ADD_INFO": "Edita la bio"
         },
         "PROFILE_FAVS": {
@@ -718,7 +718,7 @@
             "FILTER_TYPE_TASK_TITLES": "Mostra només tasquest",
             "FILTER_TYPE_ISSUES": "Incidències",
             "FILTER_TYPE_ISSUES_TITLE": "Mostra només incidències",
-            "EMPTY_TITLE": "It looks like there's nothing to show here."
+            "EMPTY_TITLE": "Sembla que no hi ha res que mostrar"
         }
     },
     "PROJECT": {
@@ -727,10 +727,10 @@
         "SECTION_PROJECTS": "Projectes",
         "HELP": "Reordena els teus projectes per a establir els més utilitzats en les primeres posicions. <br/> Els 10 millors projectes apareixeran en la llista de projectes de la barra de navegació superior",
         "PRIVATE": "Projecte privat",
-        "LOOKING_FOR_PEOPLE": "This project is looking for people",
-        "FANS_COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}",
-        "WATCHERS_COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
-        "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "LOOKING_FOR_PEOPLE": "Este projecte busca col·laboracions",
+        "FANS_COUNTER_TITLE": "{total, plural, one{un fan} other{# fans}}",
+        "WATCHERS_COUNTER_TITLE": "{total, plural, one{un seguidor} other{# seguidors}}",
+        "MEMBERS_COUNTER_TITLE": "{total, plural, one{un membre} other{# membres}}",
         "STATS": {
             "PROJECT": "punts<br/> projecte",
             "DEFINED": "punts<br/> definits",
@@ -753,7 +753,7 @@
             "PLACEHOLDER_SEARCH": "Cerca en...",
             "ACTION_CREATE_PROJECT": "Crear projecte",
             "ACTION_IMPORT_PROJECT": "Importar projecte",
-            "MANAGE_PROJECTS": "Manage projects",
+            "MANAGE_PROJECTS": "Gestiona els projectes",
             "TITLE_CREATE_PROJECT": "Crear projecte",
             "TITLE_IMPORT_PROJECT": "Importar projecte",
             "TITLE_PRVIOUS_PROJECT": "Mostra projectes previs",
@@ -797,14 +797,14 @@
             "LIKE": "M'agrada",
             "LIKED": "T'agrada",
             "UNLIKE": "No t'agrada",
-            "BUTTON_TITLE": "Like or unlike this project",
-            "COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}"
+            "BUTTON_TITLE": "Favoriteja o desfavoriteja aquest projecte",
+            "COUNTER_TITLE": "{total, plural, un{un fan} altres{# fans}}"
         },
         "WATCH_BUTTON": {
             "BUTTON_TITLE": "Segueix este projecte i edita les notificacions",
             "WATCH": "Segueix",
             "WATCHING": "Observant",
-            "COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
+            "COUNTER_TITLE": "{total, plural, one{un seguidor} other{# seguidors}}",
             "OPTIONS": {
                 "NOTIFY_ALL": "Receive all notifications",
                 "NOTIFY_ALL_TITLE": "Receive all notifications for this project",
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Escriu un nou comentari ací",
         "SHOW_DELETED": "Mostra el comentari esborrat.",
         "HIDE_DELETED": "Amaga el comentari esborrat",
-        "DELETE": "Delete comment",
+        "DELETE": "Esborrar comentari",
         "RESTORE": "Resturar comentari."
     },
     "ACTIVITY": {
@@ -976,12 +976,12 @@
         "CUSTOMIZE_GRAPH": "Edita el teu gràfic de backlog",
         "CUSTOMIZE_GRAPH_TEXT": "Per a tindre un gràfic que t'ajude a seguir la evolució del projecte deus de editar els punts i els sprints per mig del",
         "CUSTOMIZE_GRAPH_ADMIN": "Admin",
-        "CUSTOMIZE_GRAPH_TITLE": "Set up the points and sprints through the Admin",
+        "CUSTOMIZE_GRAPH_TITLE": "Estableix els punts i els sprints al Admin",
         "MOVE_US_TO_CURRENT_SPRINT": "Envia al Sprint",
-        "MOVE_US_TO_LATEST_SPRINT": "Move to latest Sprint",
+        "MOVE_US_TO_LATEST_SPRINT": "Posar a l'ultim sprint",
         "SHOW_FILTERS": "Mostra filtres",
         "SHOW_TAGS": "Mostra etiquetes",
-        "EMPTY": "The backlog is empty!",
+        "EMPTY": "El backlog està buit!",
         "CREATE_NEW_US": "Crea una nova US",
         "CREATE_NEW_US_EMPTY_HELP": "Potser vols crear una nova història d'usuari",
         "EXCESS_OF_POINTS": "Excés de punts",
@@ -1066,8 +1066,8 @@
         "TITLE_ACTION_ADD_BULK": "Afegeix noves històries d'usuari en grup",
         "TITLE_ACTION_ASSIGN": "Assignar tasca",
         "TITLE_ACTION_EDIT": "Editar tasca",
-        "PLACEHOLDER_CARD_TITLE": "This could be a task",
-        "PLACEHOLDER_CARD_TEXT": "Split Stories into tasks to track them separately",
+        "PLACEHOLDER_CARD_TITLE": "Açó podría ser una tasca",
+        "PLACEHOLDER_CARD_TEXT": "Divideix les históries per a poder gertionar-les separadament",
         "TABLE": {
             "COLUMN": "Història d'usuari",
             "TITLE_ACTION_FOLD": "Plegar columna",
@@ -1135,7 +1135,7 @@
     },
     "ISSUES": {
         "PAGE_TITLE": "Incidències - {{projectName}}",
-        "PAGE_DESCRIPTION": "The issues list panel of the project {{projectName}}: {{projectDescription}}",
+        "PAGE_DESCRIPTION": "El panell d'incidències de {{projectName}}: {{projectDescription}}",
         "LIST_SECTION_NAME": "Incidències",
         "SECTION_NAME": "Detalls d'incidència",
         "ACTION_NEW_ISSUE": "+ NOVA INCIDÈNCIA",
@@ -1224,7 +1224,7 @@
     },
     "SEARCH": {
         "PAGE_TITLE": "Cerca - {{projectName}}",
-        "PAGE_DESCRIPTION": "Search anything, user stories, issues, tasks or wiki pages, in the project {{projectName}}: {{projectDescription}}",
+        "PAGE_DESCRIPTION": "Busca qualsevol cosa al projecte {{projectName}}: {{projectDescription}}",
         "FILTER_USER_STORIES": "Històries d'usuari",
         "FILTER_ISSUES": "Incidències",
         "FILTER_TASKS": "Tasca",
@@ -1236,7 +1236,7 @@
     },
     "TEAM": {
         "PAGE_TITLE": "Equip - {{projectName}}",
-        "PAGE_DESCRIPTION": "The team panel to show all the members of the project {{projectName}}: {{projectDescription}}",
+        "PAGE_DESCRIPTION": "El panell d'equip mostra tots els membres del projecte {{projectName}}: {{projectDescription}}",
         "SECTION_NAME": "Equip",
         "APP_TITLE": "EQUIP - {{projectName}}",
         "PLACEHOLDER_INPUT_SEARCH": "Busca per nom complet...",
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1453,7 +1455,7 @@
         "MOST_LIKED": "Most liked",
         "MOST_LIKED_EMPTY": "There are no LIKED projects yet",
         "VIEW_MORE": "View more",
-        "RECRUITING": "This project is looking for people",
+        "RECRUITING": "Este projecte busca col·laborados",
         "FEATURED": "Featured Projects",
         "EMPTY": "There are no projects to show with this search criteria.<br> Try again!",
         "FILTERS": {
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Escriu algo...",
             "ACTION_TITLE": "Cerca",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index dbb49707..d29610f4 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Geben sie etwas ein...",
             "ACTION_TITLE": "Suche",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index bb4f3709..8480026f 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1448,6 +1448,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1470,6 +1472,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Type something...",
             "ACTION_TITLE": "Search",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index 227d8fa8..b5c07e2f 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Descubre proyectos",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un proyecto público por descubrir} other{# proyectos público por descubrir}}\n",
         "MOST_ACTIVE": "Más activos",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Borrar filtros"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Escribe algo...",
             "ACTION_TITLE": "Buscar",
             "RESULTS": "Resultados de búsqueda"
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index 8058e3cb..0ab3626e 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Type something...",
             "ACTION_TITLE": "Hae",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index a9ebd4cc..249be795 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Découvrir les projets",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un projet public à découvrir} other{# projets publics à découvrir}}",
         "MOST_ACTIVE": "les plus actifs",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Effacer les filtres"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Écrivez quelque chose...",
             "ACTION_TITLE": "Rechercher",
             "RESULTS": "Résultats de la recherche"
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index f4d13625..17f45748 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Scopri progetti",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un progetto pubblico da scoprire} other{# progetti pubblici da scoprire}}",
         "MOST_ACTIVE": "Più attivi",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Cancella filtri"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Inserisci testo...",
             "ACTION_TITLE": "Cerca",
             "RESULTS": "Risultati della ricerca"
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index b111c148..c1807b09 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Typ iets...",
             "ACTION_TITLE": "Zoek",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index 4cf96bd1..d12e6d95 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Type something...",
             "ACTION_TITLE": "Szukaj",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index 6f19a2cf..d4754245 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Descobrir projetos",
         "DISCOVER_SUBTITLE": "{projects, plural, um{One public project to discover} outro{# public projects to discover}}",
         "MOST_ACTIVE": "Mais ativo",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Limpar filtros"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Digite algo...",
             "ACTION_TITLE": "Procurar",
             "RESULTS": "Resultado de pesquisa."
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index fc476136..ac2e7076 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Введите что-нибудь...",
             "ACTION_TITLE": "Поиск",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index 73ffabf5..d8f2115c 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Ja",
         "NO": "Nej",
-        "OR": "or",
+        "OR": "eller",
         "LOADING": "Laddar ...",
         "LOADING_PROJECT": "Laddar projekt...",
         "DATE": "YYYY-MM-DD",
@@ -454,16 +454,16 @@
             "TAGS": "Etiketter",
             "DESCRIPTION": "Beskrivning",
             "RECRUITING": "Is this project looking for people?",
-            "RECRUITING_MESSAGE": "Who are you looking for?",
+            "RECRUITING_MESSAGE": "Vem letar du efter?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Publika projekt",
             "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Privata projekt",
             "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
-            "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
+            "PRIVATE_OR_PUBLIC": "Vad är skillnaden mellan publika och privata projekt?",
             "DELETE": "Ta bort projekt",
-            "LOGO_HELP": "The image will be scaled to 80x80px.",
-            "CHANGE_LOGO": "Change logo",
+            "LOGO_HELP": "Bilden kommer skalas till 80x80px.",
+            "CHANGE_LOGO": "Ändra logga",
             "ACTION_USE_DEFAULT_LOGO": "Use default image"
         },
         "REPORTS": {
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Skriv en ny kommentar här",
         "SHOW_DELETED": "Visa raderade kommentarer",
         "HIDE_DELETED": "Dölj raderade kommentarer",
-        "DELETE": "Delete comment",
+        "DELETE": "Ta bort kommentar",
         "RESTORE": "Hämta tillbaka tidigare kommentarer"
     },
     "ACTIVITY": {
@@ -1284,7 +1284,7 @@
         }
     },
     "USER_PROFILE": {
-        "IMAGE_HELP": "The image will be scaled to 80x80px.",
+        "IMAGE_HELP": "Bilden kommer skalas till 80x80px.",
         "ACTION_CHANGE_IMAGE": "Ändra",
         "ACTION_USE_GRAVATAR": "Use default image",
         "ACTION_DELETE_ACCOUNT": "Ta bort Taiga-kontot",
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Discover projects",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "Most active",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Clear filters"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Skriv något ...",
             "ACTION_TITLE": "Sök",
             "RESULTS": "Search results"
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index 37122c6a..b96d15a3 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Proje keşfedin",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Keşfedilecek bir açık proje} other{Keşfedilecek # açık proje}}",
         "MOST_ACTIVE": "En hareketli",
@@ -1468,6 +1470,8 @@
             "CLEAR": "Filtreleri kaldır"
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Birşeyler yazın...",
             "ACTION_TITLE": "Ara",
             "RESULTS": "Arama sonuçları"
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index 8b3e88be..3bfd36b7 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -1446,6 +1446,8 @@
         }
     },
     "DISCOVER": {
+        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "發現更多專案",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
         "MOST_ACTIVE": "最活躍",
@@ -1468,6 +1470,8 @@
             "CLEAR": "清除過濾器 "
         },
         "SEARCH": {
+            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "輸入文字",
             "ACTION_TITLE": "搜尋",
             "RESULTS": "搜尋結果"
diff --git a/app/modules/discover/discover-home/discover-home.controller.coffee b/app/modules/discover/discover-home/discover-home.controller.coffee
index d9d249d6..01c4ea56 100644
--- a/app/modules/discover/discover-home/discover-home.controller.coffee
+++ b/app/modules/discover/discover-home/discover-home.controller.coffee
@@ -20,10 +20,15 @@
 class DiscoverHomeController
     @.$inject = [
         '$tgLocation',
-        '$tgNavUrls'
+        '$tgNavUrls',
+        'tgAppMetaService',
+        '$translate'
     ]
 
-    constructor: (@location, @navUrls) ->
+    constructor: (@location, @navUrls, @appMetaService, @translate) ->
+        title = @translate.instant("DISCOVER.PAGE_TITLE")
+        description = @translate.instant("DISCOVER.PAGE_DESCRIPTION")
+        @appMetaService.setAll(title, description)
 
     onSubmit: (q) ->
         url = @navUrls.resolve('discover-search')
diff --git a/app/modules/discover/discover-home/discover-home.controller.spec.coffee b/app/modules/discover/discover-home/discover-home.controller.spec.coffee
index 0318c6ba..7dd156c9 100644
--- a/app/modules/discover/discover-home/discover-home.controller.spec.coffee
+++ b/app/modules/discover/discover-home/discover-home.controller.spec.coffee
@@ -22,6 +22,19 @@ describe "DiscoverHomeController", ->
     $controller = null
     mocks = {}
 
+    _mockTranslate = () ->
+        mocks.translate = {}
+        mocks.translate.instant = sinon.stub()
+
+        $provide.value "$translate", mocks.translate
+
+    _mockAppMetaService = () ->
+        mocks.appMetaService = {
+            setAll: sinon.spy()
+        }
+
+        $provide.value "tgAppMetaService", mocks.appMetaService
+
     _mockLocation = ->
         mocks.location = {}
 
@@ -40,6 +53,8 @@ describe "DiscoverHomeController", ->
         module (_$provide_) ->
             $provide = _$provide_
 
+            _mockTranslate()
+            _mockAppMetaService()
             _mockLocation()
             _mockNavUrls()
 
@@ -54,6 +69,18 @@ describe "DiscoverHomeController", ->
         _mocks()
         _setup()
 
+    it "initialize meta data", () ->
+        mocks.translate.instant
+            .withArgs('DISCOVER.PAGE_TITLE')
+            .returns('meta-title')
+        mocks.translate.instant
+            .withArgs('DISCOVER.PAGE_DESCRIPTION')
+            .returns('meta-description')
+
+        ctrl = $controller('DiscoverHome')
+
+        expect(mocks.appMetaService.setAll.calledWithExactly("meta-title", "meta-description")).to.be.true
+
     it "onSubmit redirect to discover search", () ->
         mocks.navUrls.resolve = sinon.stub().withArgs('discover-search').returns('url')
 
@@ -68,4 +95,4 @@ describe "DiscoverHomeController", ->
 
         ctrl.onSubmit('query')
 
-        expect(pathSpy).to.have.been.calledWith('url');
+        expect(pathSpy).to.have.been.calledWith('url')
diff --git a/app/modules/discover/discover-search/discover-search.controller.coffee b/app/modules/discover/discover-search/discover-search.controller.coffee
index 0744a9ad..0f1aa4ac 100644
--- a/app/modules/discover/discover-search/discover-search.controller.coffee
+++ b/app/modules/discover/discover-search/discover-search.controller.coffee
@@ -21,10 +21,12 @@ class DiscoverSearchController
     @.$inject = [
         '$routeParams',
         'tgDiscoverProjectsService',
-        '$route'
+        '$route',
+        'tgAppMetaService',
+        '$translate'
     ]
 
-    constructor: (@routeParams, @discoverProjectsService, @route) ->
+    constructor: (@routeParams, @discoverProjectsService, @route, @appMetaService, @translate) ->
         @.page = 1
 
         taiga.defineImmutableProperty @, "searchResult", () => return @discoverProjectsService.searchResult
@@ -38,6 +40,10 @@ class DiscoverSearchController
         @.loadingList = false
         @.loadingPagination = false
 
+        title = @translate.instant("DISCOVER.SEARCH.PAGE_TITLE")
+        description = @translate.instant("DISCOVER.SEARCH.PAGE_DESCRIPTION")
+        @appMetaService.setAll(title, description)
+
     fetch: () ->
         @.page = 1
 
diff --git a/app/modules/discover/discover-search/discover-search.controller.spec.coffee b/app/modules/discover/discover-search/discover-search.controller.spec.coffee
index 6c05d661..cd98acb1 100644
--- a/app/modules/discover/discover-search/discover-search.controller.spec.coffee
+++ b/app/modules/discover/discover-search/discover-search.controller.spec.coffee
@@ -22,6 +22,19 @@ describe "DiscoverSearch", ->
     $controller = null
     mocks = {}
 
+    _mockTranslate = () ->
+        mocks.translate = {}
+        mocks.translate.instant = sinon.stub()
+
+        $provide.value "$translate", mocks.translate
+
+    _mockAppMetaService = () ->
+        mocks.appMetaService = {
+            setAll: sinon.spy()
+        }
+
+        $provide.value "tgAppMetaService", mocks.appMetaService
+
     _mockRouteParams = ->
         mocks.routeParams = {}
 
@@ -46,6 +59,8 @@ describe "DiscoverSearch", ->
         module (_$provide_) ->
             $provide = _$provide_
 
+            _mockTranslate()
+            _mockAppMetaService()
             _mockRoute()
             _mockRouteParams()
             _mockDiscoverProjects()
@@ -65,6 +80,18 @@ describe "DiscoverSearch", ->
 
         _setup()
 
+    it "initialize meta data", () ->
+        mocks.translate.instant
+            .withArgs('DISCOVER.SEARCH.PAGE_TITLE')
+            .returns('meta-title')
+        mocks.translate.instant
+            .withArgs('DISCOVER.SEARCH.PAGE_DESCRIPTION')
+            .returns('meta-description')
+
+        ctrl = $controller('DiscoverSearch')
+
+        expect(mocks.appMetaService.setAll.calledWithExactly("meta-title", "meta-description")).to.be.true
+
     it "initialize search params", () ->
         mocks.routeParams.text = 'text'
         mocks.routeParams.filter = 'filter'

From 449626de1e02d3d984abe82219f8f27006582748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 2 Feb 2016 08:35:42 +0100
Subject: [PATCH 012/155] Fix attachments header element position in FF

---
 app/modules/attachments/attachments.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/modules/attachments/attachments.scss b/app/modules/attachments/attachments.scss
index 4d193053..e8f12d61 100644
--- a/app/modules/attachments/attachments.scss
+++ b/app/modules/attachments/attachments.scss
@@ -3,8 +3,7 @@
 }
 
 .attachments-header {
-    align-content: space-between;
-    align-items: center;
+    align-content: center;
     background: $whitish;
     display: flex;
     justify-content: space-between;

From ec5876a84e47c0d1b48a5f19286aa10c57ce0e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 2 Feb 2016 08:38:54 +0100
Subject: [PATCH 013/155] Fix related tasks  header element position in FF

---
 app/styles/modules/common/related-tasks.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss
index 26867eec..86c437a3 100644
--- a/app/styles/modules/common/related-tasks.scss
+++ b/app/styles/modules/common/related-tasks.scss
@@ -4,7 +4,7 @@
 }
 
 .related-tasks-header {
-    align-content: space-between;
+    align-content: center;
     align-items: center;
     background: $whitish;
     display: flex;

From f40b9acc92ce0554d4a10162e3e3c8ecfb62207d Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 1 Feb 2016 08:41:11 +0100
Subject: [PATCH 014/155] reload US if the status has changed

---
 app/coffee/modules/userstories/detail.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index 08468dc8..997ca0bb 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -94,6 +94,10 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
     initializeEventHandlers: ->
         @scope.$on "related-tasks:update", =>
             @scope.tasks = _.clone(@scope.tasks, false)
+            allClosed = _.every @scope.tasks, (task) -> return task.is_closed
+
+            if @scope.us.is_closed != allClosed
+                @.loadUs()
 
         @scope.$on "attachment:create", =>
             @analytics.trackEvent("attachment", "create", "create attachment on userstory", 1)

From 6e2ba7943ef0b858f2287113de6bf20edaa4f417 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 09:20:50 +0100
Subject: [PATCH 015/155] fix custom-themes compile

---
 gulpfile.js  | 23 +++++++++++------------
 package.json |  1 +
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index bb3d9a71..8e8056d6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,6 +27,7 @@ var gulp = require("gulp"),
     del = require("del"),
     livereload = require('gulp-livereload'),
     gulpFilter = require('gulp-filter'),
+    addsrc = require('gulp-add-src');
     coffeelint = require('gulp-coffeelint');
 
 var argv = require('minimist')(process.argv.slice(2));
@@ -70,10 +71,10 @@ paths.locales = paths.app + "locales/**/*.json";
 
 paths.sass = [
     paths.app + "**/*.scss",
-    "!" + paths.app + "/styles/bourbon/**/*.scss",
-    "!" + paths.app + "/styles/dependencies/**/*.scss",
-    "!" + paths.app + "/styles/extras/**/*.scss",
-    "!" + paths.app + "/themes/**/variables.scss",
+    "!" + paths.app + "styles/bourbon/**/*.scss",
+    "!" + paths.app + "styles/dependencies/**/*.scss",
+    "!" + paths.app + "styles/extras/**/*.scss",
+    "!" + paths.app + "themes/**/*.scss",
 ];
 
 paths.sass_watch = paths.sass.concat(themes.current.customScss);
@@ -85,7 +86,8 @@ paths.styles_dependencies = [
 
 paths.css = [
     paths.tmp + "styles/**/*.css",
-    paths.tmp + "modules/**/*.css"
+    paths.tmp + "modules/**/*.css",
+    paths.tmp + "custom.css"
 ];
 
 paths.css_order = [
@@ -101,7 +103,7 @@ paths.css_order = [
     paths.tmp + "styles/modules/**/*.css",
     paths.tmp + "modules/**/*.css",
     paths.tmp + "styles/shame/*.css",
-    paths.tmp + "themes/**/*.css"
+    paths.tmp + "custom.css"
 ];
 
 paths.coffee = [
@@ -259,9 +261,8 @@ gulp.task("clear-sass-cache", function() {
 });
 
 gulp.task("sass-compile", [], function() {
-    var sassFiles = paths.sass.concat(themes.current.customScss);
-
-    return gulp.src(sassFiles)
+    return gulp.src(paths.sass)
+        .pipe(addsrc.append(themes.current.customScss))
         .pipe(plumber())
         .pipe(insert.prepend('@import "dependencies";'))
         .pipe(cached("sass"))
@@ -292,9 +293,7 @@ gulp.task("css-lint-app", function() {
 });
 
 gulp.task("app-css", function() {
-    var cssFiles = paths.css.concat(themes.current.customCss);
-
-    return gulp.src(cssFiles)
+    return gulp.src(paths.css)
         .pipe(order(paths.css_order, {base: '.'}))
         .pipe(concat("theme-" + themes.current.name + ".css"))
         .pipe(autoprefixer({
diff --git a/package.json b/package.json
index 7d326400..708e20fb 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "express": "^4.12.0",
     "glob": "^5.0.14",
     "gulp": "^3.8.11",
+    "gulp-add-src": "^0.2.0",
     "gulp-angular-templatecache": "^1.5.0",
     "gulp-autoprefixer": "^3.0.1",
     "gulp-cache": "^0.3.0",

From ba575bf78ffce57b96f9ab60221d40afa2715a40 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 09:26:29 +0100
Subject: [PATCH 016/155] remove links in discover when is loading

---
 .../components/highlighted/highlighted.jade         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/modules/discover/components/highlighted/highlighted.jade b/app/modules/discover/components/highlighted/highlighted.jade
index a7606e77..1b438058 100644
--- a/app/modules/discover/components/highlighted/highlighted.jade
+++ b/app/modules/discover/components/highlighted/highlighted.jade
@@ -49,9 +49,10 @@
                         span.statistics-num {{ ::project.get('members').size }}
             p.project-description {{ ::project.get('description') | limitTo:150 }}{{ ::project.get('description').length < 150 ? '' : '...'}}
 
-    a.view-more-projects.button-green(
-        ng-if="highlighted"
-        tg-nav="discover-search"
-        tg-nav-get-params="{\"order_by\": \"{{orderBy}}\"}"
-        href="#"
-    ) {{ 'DISCOVER.VIEW_MORE' | translate }}
+    div(ng-if="!loading")
+        a.view-more-projects.button-green(
+            ng-if="highlighted"
+            tg-nav="discover-search"
+            tg-nav-get-params="{\"order_by\": \"{{orderBy}}\"}"
+            href="#"
+        ) {{ 'DISCOVER.VIEW_MORE' | translate }}

From 1c841720c1fdf456e80c3b76f5945019ca2037dc Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 12:11:23 +0100
Subject: [PATCH 017/155] fix backlog role filters

---
 app/coffee/modules/backlog/main.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 62f6fc2a..d2ea8d2a 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -882,7 +882,7 @@ UsRolePointsSelectorDirective = ($rootscope, $template, $compile, $translate) ->
 
     return {link: link}
 
-module.directive("tgUsRolePointsSelector", ["$rootScope", "$tgTemplate", "$compile", UsRolePointsSelectorDirective])
+module.directive("tgUsRolePointsSelector", ["$rootScope", "$tgTemplate", "$compile", "$translate", UsRolePointsSelectorDirective])
 
 
 UsPointsDirective = ($tgEstimationsService, $repo, $tgTemplate) ->

From 6450a290a373ec045edfa74ce32bfac9346762ce Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 12:42:07 +0100
Subject: [PATCH 018/155] backlog role filters e2e

---
 e2e/helpers/backlog-helper.js |  6 ++++++
 e2e/suites/backlog.e2e.js     | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/e2e/helpers/backlog-helper.js b/e2e/helpers/backlog-helper.js
index b6021bc2..6f04d662 100644
--- a/e2e/helpers/backlog-helper.js
+++ b/e2e/helpers/backlog-helper.js
@@ -197,3 +197,9 @@ helper.getSprintsTitles = function() {
 helper.goBackFilters = function() {
     return $$('.filters-step-cat .breadcrumb a').first().click();
 };
+
+helper.fiterRole = async function(value) {
+    let rolePointsSelector = $('div[tg-us-role-points-selector]');
+
+    return utils.popover.open(rolePointsSelector, value);
+};
diff --git a/e2e/suites/backlog.e2e.js b/e2e/suites/backlog.e2e.js
index 1d7fd0d5..d964de6a 100644
--- a/e2e/suites/backlog.e2e.js
+++ b/e2e/suites/backlog.e2e.js
@@ -354,6 +354,16 @@ describe('backlog', function() {
         expect(count).to.be.equal(4);
     });
 
+    it('role filters', async function() {
+        await backlogHelper.fiterRole(1);
+
+        utils.common.takeScreenshot('backlog', 'backlog-role-filters');
+
+        let usPoints = await backlogHelper.getUsPoints(0);
+
+        expect(usPoints).to.match(/\d+\s\/\s\d+/);
+    });
+
     describe('milestones', function() {
         it('create', async function() {
             backlogHelper.openNewMilestone();

From dcc60c73fd001992a5fc7681844c641504c1d8f6 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 13:06:15 +0100
Subject: [PATCH 019/155] prevent save icon dissapear in details

---
 app/coffee/modules/common/loading.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/common/loading.coffee b/app/coffee/modules/common/loading.coffee
index 2c128ba9..aec1069e 100644
--- a/app/coffee/modules/common/loading.coffee
+++ b/app/coffee/modules/common/loading.coffee
@@ -61,12 +61,12 @@ TgLoadingService = ($compile) ->
                 target = service.settings.target
                 service.settings.classes.map (className) -> target.removeClass(className)
 
+                if not target.hasClass('loading') && !service.settings.template
+                    service.settings.template = target.html()
+
                 # The loader is shown after that quantity of milliseconds
                 timeoutId = setTimeout (->
                     if not target.hasClass('loading')
-                        if !service.settings.template
-                            service.settings.template = target.html()
-
                         target.addClass('loading')
 
                         target.html(spinner)

From f5b8655c05f7009df92965c48cac240b6549cdc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 2 Feb 2016 19:51:09 +0100
Subject: [PATCH 020/155] Issue #3856: Show if I am a member of a project in
 discover and project lists

---
 .../discover/components/featured-projects/featured-projects.jade | 1 +
 app/modules/discover/components/highlighted/highlighted.jade     | 1 +
 app/modules/discover/discover-search/discover-search.jade        | 1 +
 app/modules/home/projects/home-project-list.jade                 | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/modules/discover/components/featured-projects/featured-projects.jade b/app/modules/discover/components/featured-projects/featured-projects.jade
index ec1de366..53c3514b 100644
--- a/app/modules/discover/components/featured-projects/featured-projects.jade
+++ b/app/modules/discover/components/featured-projects/featured-projects.jade
@@ -46,6 +46,7 @@
                         include ../../../../svg/eye.svg
                         span {{::project.get('total_watchers')}}
                     span.statistic(
+                        ng-class="{'active': project.get('i_am_member')}"
                         title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                     )
                         include ../../../../svg/team.svg
diff --git a/app/modules/discover/components/highlighted/highlighted.jade b/app/modules/discover/components/highlighted/highlighted.jade
index 1b438058..96031ebf 100644
--- a/app/modules/discover/components/highlighted/highlighted.jade
+++ b/app/modules/discover/components/highlighted/highlighted.jade
@@ -43,6 +43,7 @@
                         include ../../../../svg/eye.svg
                         span {{::project.get('total_watchers')}}
                     span.statistic(
+                        ng-class="{'active': project.get('i_am_member')}"
                         title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                     )
                         include ../../../../svg/team.svg
diff --git a/app/modules/discover/discover-search/discover-search.jade b/app/modules/discover/discover-search/discover-search.jade
index e7629e0b..937e45fa 100644
--- a/app/modules/discover/discover-search/discover-search.jade
+++ b/app/modules/discover/discover-search/discover-search.jade
@@ -64,6 +64,7 @@ div(tg-discover-search)
                             include ../../../svg/eye.svg
                             span {{::project.get('total_watchers')}}
                         span.statistic(
+                            ng-class="{'active': project.get('i_am_member')}"
                             title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                         )
                             include ../../../svg/team.svg
diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index 53336204..a66a41c2 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -45,6 +45,7 @@ section.home-project-list(ng-if="vm.projects.size")
                     include ../../../svg/eye.svg
                     span {{::project.get('total_watchers')}}
                 span.statistic(
+                    ng-class="{'active': project.get('i_am_member')}"
                     title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                 )
                     include ../../../svg/team.svg

From f3d0b49d943cdd042ef3031ecf24ffb0a02e4540 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Mon, 25 Jan 2016 10:00:55 +0100
Subject: [PATCH 021/155] Issue 3744 New bulk insert of US assigns a 0 value to
 Points, but default should be '?' (or whatever is predefined), not '0'

---
 app/coffee/modules/common/estimation.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/common/estimation.coffee b/app/coffee/modules/common/estimation.coffee
index 6cf8417f..0db8bf62 100644
--- a/app/coffee/modules/common/estimation.coffee
+++ b/app/coffee/modules/common/estimation.coffee
@@ -161,7 +161,7 @@ EstimationsService = ($template, $qqueue, $repo, $confirm, $q) ->
             values = _.map(@us.points, (v, k) => @pointsById[v]?.value)
 
             if values.length == 0
-                return "0"
+                return "?"
 
             notNullValues = _.filter(values, (v) -> v?)
             if notNullValues.length == 0

From 78ebcdfbb55795704fe06aa6649f900f5ebac65c Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 3 Feb 2016 08:58:31 +0100
Subject: [PATCH 022/155] change password validation

---
 app/coffee/modules/user-settings/change-password.coffee | 5 +++++
 app/partials/user/user-change-password.jade             | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/app/coffee/modules/user-settings/change-password.coffee b/app/coffee/modules/user-settings/change-password.coffee
index 4f38b575..a08acb8c 100644
--- a/app/coffee/modules/user-settings/change-password.coffee
+++ b/app/coffee/modules/user-settings/change-password.coffee
@@ -63,9 +63,14 @@ module.controller("UserChangePasswordController", UserChangePasswordController)
 
 UserChangePasswordDirective = ($rs, $confirm, $loading, $translate) ->
     link = ($scope, $el, $attrs, ctrl) ->
+        form = new checksley.Form($el.find("form"))
+
         submit = debounce 2000, (event) =>
             event.preventDefault()
 
+            if not form.validate()
+                return
+
             if $scope.newPassword1 != $scope.newPassword2
                 $confirm.notify('error', $translate.instant("CHANGE_PASSWORD.ERROR_PASSWORD_MATCH"))
                 return
diff --git a/app/partials/user/user-change-password.jade b/app/partials/user/user-change-password.jade
index 5b5e0b5d..60d7eaf1 100644
--- a/app/partials/user/user-change-password.jade
+++ b/app/partials/user/user-change-password.jade
@@ -17,6 +17,7 @@ div.wrapper(
             fieldset
                 label(for="current-password", translate="CHANGE_PASSWORD.FIELD_CURRENT_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="password"
                     id="current-password"
@@ -28,6 +29,7 @@ div.wrapper(
             fieldset
                 label(for="new-password", translate="CHANGE_PASSWORD.FIELD_NEW_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="new-password"
                     id="new-password"
@@ -39,6 +41,7 @@ div.wrapper(
             fieldset
                 label(for="retype-password", translate="CHANGE_PASSWORD.FIELD_RETYPE_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="retype-password"
                     id="retype-password"

From a8da4d66a81ee14b8669a04a3624fb6f0fa7daf2 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 3 Feb 2016 09:16:55 +0100
Subject: [PATCH 023/155] remove previous validation lightbox errors

---
 app/coffee/modules/backlog/lightboxes.coffee | 3 +++
 app/coffee/modules/common/lightboxes.coffee  | 8 ++++++++
 app/coffee/modules/issues/lightboxes.coffee  | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee
index 72cd04e5..99c1ebd0 100644
--- a/app/coffee/modules/backlog/lightboxes.coffee
+++ b/app/coffee/modules/backlog/lightboxes.coffee
@@ -36,8 +36,11 @@ CreateEditSprint = ($repo, $confirm, $rs, $rootscope, lightboxService, $loading,
     link = ($scope, $el, attrs) ->
         hasErrors = false
         createSprint = true
+        form = null
 
         resetSprint = () ->
+            form.reset() if form
+
             $scope.sprint = {
                 project: null
                 name: null
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 57f688b7..82f640b0 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -268,6 +268,7 @@ module.directive("tgBlockingMessageInput", ["$log", "$tgTemplate", "$compile", B
 
 CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope, lightboxService, $loading, $translate, $confirm, $q, attachmentsService) ->
     link = ($scope, $el, attrs) ->
+        form = null
         $scope.createEditUs = {}
         $scope.isNew = true
 
@@ -285,6 +286,7 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope, lightboxService,
             attachmentsToDelete = attachmentsToDelete.push(attachment)
 
         $scope.$on "usform:new", (ctx, projectId, status, statusList) ->
+            form.reset() if form
             $scope.isNew = true
             $scope.usStatusList = statusList
             $scope.attachments = Immutable.List()
@@ -312,6 +314,8 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope, lightboxService,
             lightboxService.open($el)
 
         $scope.$on "usform:edit", (ctx, us, attachments) ->
+            form.reset() if form
+
             $scope.us = us
             $scope.attachments = Immutable.fromJS(attachments)
             $scope.isNew = false
@@ -431,7 +435,11 @@ module.directive("tgLbCreateEditUserstory", [
 
 CreateBulkUserstoriesDirective = ($repo, $rs, $rootscope, lightboxService, $loading) ->
     link = ($scope, $el, attrs) ->
+        form = null
+
         $scope.$on "usform:bulk", (ctx, projectId, status) ->
+            form.reset() if form
+
             $scope.new = {
                 projectId: projectId
                 statusId: status
diff --git a/app/coffee/modules/issues/lightboxes.coffee b/app/coffee/modules/issues/lightboxes.coffee
index de23b12e..298ca7f6 100644
--- a/app/coffee/modules/issues/lightboxes.coffee
+++ b/app/coffee/modules/issues/lightboxes.coffee
@@ -39,6 +39,8 @@ CreateIssueDirective = ($repo, $confirm, $rootscope, lightboxService, $loading,
         $scope.attachments = Immutable.List()
 
         $scope.$on "issueform:new", (ctx, project)->
+            form.reset()
+
             attachmentsToAdd = Immutable.List()
 
             $el.find(".tag-input").val("")
@@ -116,7 +118,11 @@ module.directive("tgLbCreateIssue", ["$tgRepo", "$tgConfirm", "$rootScope", "lig
 
 CreateBulkIssuesDirective = ($repo, $rs, $confirm, $rootscope, $loading, lightboxService) ->
     link = ($scope, $el, attrs) ->
+        form = null
+
         $scope.$on "issueform:bulk", (ctx, projectId, status)->
+            form.reset() if form
+
             lightboxService.open($el)
             $scope.new = {
                 projectId: projectId

From 12328d3ddbe19ab09e0ec2d094e76f7de801f191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 2 Feb 2016 12:42:27 +0100
Subject: [PATCH 024/155] Fix #3846: Exclude private projects in discover
 section

---
 .../services/discover-projects.service.coffee  | 18 +++++++++++++-----
 .../discover-projects.service.spec.coffee      | 15 ++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/modules/discover/services/discover-projects.service.coffee b/app/modules/discover/services/discover-projects.service.coffee
index f53808e3..df61d507 100644
--- a/app/modules/discover/services/discover-projects.service.coffee
+++ b/app/modules/discover/services/discover-projects.service.coffee
@@ -25,6 +25,10 @@ class DiscoverProjectsService extends taiga.Service
         "tgProjectsService"
     ]
 
+    _discoverParams = {
+        discover_mode: true
+    }
+
     constructor: (@rs, @projectsService) ->
         @._mostLiked = Immutable.List()
         @._mostActive = Immutable.List()
@@ -42,7 +46,8 @@ class DiscoverProjectsService extends taiga.Service
         taiga.defineImmutableProperty @, "projectsCount", () => return @._projectsCount
 
     fetchMostLiked: (params) ->
-        return @rs.projects.getProjects(params, false)
+        _params = _.extend({}, _discoverParams, params)
+        return @rs.projects.getProjects(_params, false)
             .then (result) =>
                 data = result.data.slice(0, 5)
 
@@ -52,7 +57,8 @@ class DiscoverProjectsService extends taiga.Service
                 @._mostLiked = projects
 
     fetchMostActive: (params) ->
-        return @rs.projects.getProjects(params, false)
+        _params = _.extend({}, _discoverParams, params)
+        return @rs.projects.getProjects(_params, false)
             .then (result) =>
                 data = result.data.slice(0, 5)
 
@@ -62,9 +68,10 @@ class DiscoverProjectsService extends taiga.Service
                 @._mostActive = projects
 
     fetchFeatured: () ->
-        params = {is_featured: true}
+        _params = _.extend({}, _discoverParams)
+        _params.is_featured = true
 
-        return @rs.projects.getProjects(params, false)
+        return @rs.projects.getProjects(_params, false)
             .then (result) =>
                 data = result.data.slice(0, 4)
 
@@ -81,7 +88,8 @@ class DiscoverProjectsService extends taiga.Service
             @._projectsCount = discover.getIn(['projects', 'total'])
 
     fetchSearch: (params) ->
-        return @rs.projects.getProjects(params)
+        _params = _.extend({}, _discoverParams, params)
+        return @rs.projects.getProjects(_params)
             .then (result) =>
                 @._nextSearchPage = !!result.headers('X-Pagination-Next')
 
diff --git a/app/modules/discover/services/discover-projects.service.spec.coffee b/app/modules/discover/services/discover-projects.service.spec.coffee
index 97adbd0c..75c13e43 100644
--- a/app/modules/discover/services/discover-projects.service.spec.coffee
+++ b/app/modules/discover/services/discover-projects.service.spec.coffee
@@ -62,7 +62,7 @@ describe "tgDiscoverProjectsService", ->
         _inject()
 
     it "fetch most liked", (done) ->
-        params = {test: 1}
+        params = {test: 1, discover_mode: true}
 
         mocks.resources.projects.getProjects.withArgs(sinon.match(params), false).promise().resolve({
             data: [
@@ -80,12 +80,12 @@ describe "tgDiscoverProjectsService", ->
             result = discoverProjectsService._mostLiked.toJS()
 
             expect(result).to.have.length(5)
-            expect(result[0].decorate).to.be.ok;
+            expect(result[0].decorate).to.be.ok
 
             done()
 
     it "fetch most active", (done) ->
-        params = {test: 1}
+        params = {test: 1, discover_mode: true}
 
         mocks.resources.projects.getProjects.withArgs(sinon.match(params), false).promise().resolve({
             data: [
@@ -103,12 +103,13 @@ describe "tgDiscoverProjectsService", ->
             result = discoverProjectsService._mostActive.toJS()
 
             expect(result).to.have.length(5)
-            expect(result[0].decorate).to.be.ok;
+            expect(result[0].decorate).to.be.ok
 
             done()
 
     it "fetch featured", (done) ->
-        mocks.resources.projects.getProjects.withArgs(sinon.match({is_featured: true}), false).promise().resolve({
+        params = {is_featured: true, discover_mode: true}
+        mocks.resources.projects.getProjects.withArgs(sinon.match(params), false).promise().resolve({
             data: [
                 {id: 1},
                 {id: 2},
@@ -124,7 +125,7 @@ describe "tgDiscoverProjectsService", ->
             result = discoverProjectsService._featured.toJS()
 
             expect(result).to.have.length(4)
-            expect(result[0].decorate).to.be.ok;
+            expect(result[0].decorate).to.be.ok
 
             done()
 
@@ -148,7 +149,7 @@ describe "tgDiscoverProjectsService", ->
             done()
 
     it "fetch search", (done) ->
-        params = {test: 1}
+        params = {test: 1, discover_mode: true}
 
         result = {
             headers: sinon.stub(),

From 562e1c7ddd23bcbc0a9da3818ed24d3ae98bc21b Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 2 Feb 2016 14:56:53 +0100
Subject: [PATCH 025/155] hide comments & activity if no content

---
 app/coffee/modules/common/history.coffee      | 38 ++++++++++++++-----
 .../services/check-permissions.service.coffee |  2 +
 app/partials/common/history/history-base.jade |  6 +++
 app/styles/modules/common/history.scss        |  3 ++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee
index ef90a356..c650b092 100644
--- a/app/coffee/modules/common/history.coffee
+++ b/app/coffee/modules/common/history.coffee
@@ -88,7 +88,7 @@ class HistoryController extends taiga.Controller
         return @rs.history.undeleteComment(type, objectId, activityId).then => @.loadHistory(type, objectId)
 
 
-HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $compile, $navUrls, $rootScope) ->
+HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $compile, $navUrls, $rootScope, checkPermissionsService) ->
     templateChangeDiff = $template.get("common/history/history-change-diff.html", true)
     templateChangePoints = $template.get("common/history/history-change-points.html", true)
     templateChangeGeneric = $template.get("common/history/history-change-generic.html", true)
@@ -343,6 +343,30 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
 
         # Render into DOM (operations with dom mutability)
 
+        renderBase = ->
+            comments = $scope.comments or []
+            changes = $scope.history or []
+
+            historyVisible = !!changes.length
+            commentsVisible = (!!comments.length) || checkPermissionsService.check('modify_' + $attrs.type)
+
+            html = templateBase({
+                ngmodel: $attrs.ngModel,
+                type: $attrs.type,
+                mode: $attrs.mode,
+                historyVisible: historyVisible,
+                commentsVisible: commentsVisible
+            })
+
+            html = $compile(html)($scope)
+
+            $el.html(html)
+
+        rerender = ->
+            renderBase()
+            renderComments()
+            renderActivity()
+
         renderComments = ->
             comments = $scope.comments or []
             totalComments = comments.length
@@ -388,8 +412,8 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
 
         # Watchers
 
-        $scope.$watch("comments", renderComments)
-        $scope.$watch("history",  renderActivity)
+        $scope.$watch("comments", rerender)
+        $scope.$watch("history",  rerender)
 
         $scope.$on("object:updated", -> $ctrl.loadHistory(type, objectId))
 
@@ -467,14 +491,10 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
         $scope.$on "$destroy", ->
             $el.off()
 
-    templateFn = ($el, $attrs) ->
-        html = templateBase({ngmodel: $attrs.ngModel, type: $attrs.type, mode: $attrs.mode})
-
-        return html
+        renderBase()
 
     return {
         controller: HistoryController
-        template: templateFn
         restrict: "AE"
         link: link
         # require: ["ngModel", "tgHistory"]
@@ -482,4 +502,4 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
 
 
 module.directive("tgHistory", ["$log", "$tgLoading", "$tgQqueue", "$tgTemplate", "$tgConfirm", "$translate",
-                               "$compile", "$tgNavUrls", "$rootScope", HistoryDirective])
+                               "$compile", "$tgNavUrls", "$rootScope", "tgCheckPermissionsService", HistoryDirective])
diff --git a/app/modules/services/check-permissions.service.coffee b/app/modules/services/check-permissions.service.coffee
index 5cac0802..5ca652e3 100644
--- a/app/modules/services/check-permissions.service.coffee
+++ b/app/modules/services/check-permissions.service.coffee
@@ -27,6 +27,8 @@ class ChekcPermissionsService
     constructor: (@projectService) ->
 
     check: (permission) ->
+        return false if !@projectService.project
+
         return @projectService.project.get('my_permissions').indexOf(permission) != -1
 
 angular.module("taigaCommon").service("tgCheckPermissionsService", ChekcPermissionsService)
diff --git a/app/partials/common/history/history-base.jade b/app/partials/common/history/history-base.jade
index 5accec64..ceef5a7c 100644
--- a/app/partials/common/history/history-base.jade
+++ b/app/partials/common/history/history-base.jade
@@ -1,15 +1,21 @@
 include ../components/wysiwyg.jade
 
 section.history
+    <% if (commentsVisible || historyVisible) { %>
     ul.history-tabs
+        <% if (commentsVisible) { %>
         li
             a(href="#", class="active", data-section-class="history-comments")
                 span.icon.icon-comment
                 span.tab-title(translate="COMMENTS.TITLE")
+        <% } %>
+        <% if (historyVisible) { %>
         li
             a(href="#", data-section-class="history-activity")
                 span.icon.icon-issues
                 span.tab-title(translate="ACTIVITY.TITLE")
+        <% } %>
+    <% } %>
     section.history-comments
         .comments-list
         div(tg-editable-wysiwyg, ng-model!="<%- ngmodel %>")
diff --git a/app/styles/modules/common/history.scss b/app/styles/modules/common/history.scss
index 7145097e..96e4fdf4 100644
--- a/app/styles/modules/common/history.scss
+++ b/app/styles/modules/common/history.scss
@@ -49,6 +49,9 @@
         &:first-child {
             border-right: 1px solid $gray-light;
         }
+        &:last-child {
+            border-right: 0;
+        }
     }
     a {
         color: $gray-light;

From 74dfe60a34f3c9e295c73bfe20c9a18f47713845 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 4 Dec 2015 08:28:30 +0100
Subject: [PATCH 026/155] lodash 2 -> lodash 4

---
 app-loader/app-loader.coffee                   |  2 +-
 app/coffee/app.coffee                          |  2 +-
 app/coffee/modules/admin/project-values.coffee |  4 ++--
 app/coffee/modules/admin/roles.coffee          |  2 +-
 app/coffee/modules/admin/third-parties.coffee  |  2 +-
 app/coffee/modules/base/contrib.coffee         |  2 +-
 app/coffee/modules/base/urls.coffee            |  4 ++--
 app/coffee/modules/common/history.coffee       | 10 ++++++----
 app/coffee/modules/common/lightboxes.coffee    |  8 ++++----
 app/coffee/modules/common/tags.coffee          |  2 +-
 app/coffee/modules/controllerMixins.coffee     |  2 +-
 app/coffee/modules/events.coffee               |  2 +-
 app/coffee/utils.coffee                        | 15 +++++++++------
 bower.json                                     |  6 +++---
 e2e/shared/detail.js                           |  1 +
 e2e/suites/tasks/task-detail.e2e.js            |  2 +-
 gulpfile.js                                    |  3 +--
 run-e2e.js                                     |  2 ++
 18 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/app-loader/app-loader.coffee b/app-loader/app-loader.coffee
index 310f6df5..333e9860 100644
--- a/app-loader/app-loader.coffee
+++ b/app-loader/app-loader.coffee
@@ -53,7 +53,7 @@ loadPlugins = (plugins) ->
 
 promise = $.getJSON "/conf.json"
 promise.done (data) ->
-    window.taigaConfig = _.extend({}, window.taigaConfig, data)
+    window.taigaConfig = _.assign({}, window.taigaConfig, data)
 
 promise.always ->
     if window.taigaConfig.contribPlugins.length > 0
diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 54ff9b5d..0e8b6f37 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -586,7 +586,7 @@ init = ($log, $rootscope, $auth, $events, $analytics, $translate, $location, $na
 
     # Taiga Plugins
     $rootscope.contribPlugins = @.taigaContribPlugins
-    $rootscope.adminPlugins = _.where(@.taigaContribPlugins, {"type": "admin"})
+    $rootscope.adminPlugins = _.filter(@.taigaContribPlugins, {"type": "admin"})
 
     $rootscope.$on "$translateChangeEnd", (e, ctx) ->
         lang = ctx.language
diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index 2fb76093..dff5ae07 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -108,7 +108,7 @@ class ProjectValuesController extends taiga.Controller
     loadValues: =>
         return @rs[@scope.resource].listValues(@scope.projectId, @scope.type).then (values) =>
             @scope.values = values
-            @scope.maxValueOrder = _.max(values, "order").order
+            @scope.maxValueOrder = _.maxBy(values, "order").order
             return values
 
     moveValue: (ctx, itemValue, itemIndex) =>
@@ -436,7 +436,7 @@ class ProjectCustomAttributesController extends mixOf(taiga.Controller, taiga.Pa
     loadCustomAttributes: =>
         return @rs.customAttributes[@scope.type].list(@scope.projectId).then (customAttributes) =>
             @scope.customAttributes = customAttributes
-            @scope.maxOrder = _.max(customAttributes, "order").order
+            @scope.maxOrder = _.maxBy(customAttributes, "order").order
             return customAttributes
 
     createCustomAttribute: (attrValues) =>
diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index 59072640..d2689147 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -251,7 +251,7 @@ NewRoleDirective = ($tgrepo, $confirm) ->
                     project: $scope.projectId
                     name: target.val()
                     permissions: DEFAULT_PERMISSIONS
-                    order: _.max($scope.roles, (r) -> r.order).order + 1
+                    order: _.maxBy($scope.roles, (r) -> r.order).order + 1
                     computable: false
                 }
 
diff --git a/app/coffee/modules/admin/third-parties.coffee b/app/coffee/modules/admin/third-parties.coffee
index 484de9b7..ec778ff3 100644
--- a/app/coffee/modules/admin/third-parties.coffee
+++ b/app/coffee/modules/admin/third-parties.coffee
@@ -103,7 +103,7 @@ WebhookDirective = ($rs, $repo, $confirm, $loading, $translate) ->
             $rs.webhooklogs.list(webhook.id).then (webhooklogs) =>
                 for log in webhooklogs
                     log.validStatus = 200 <= log.status < 300
-                    log.prettySentHeaders = _.map(_.pairs(log.request_headers), ([header, value]) -> "#{header}: #{value}").join("\n")
+                    log.prettySentHeaders = _.map(_.toPairs(log.request_headers), ([header, value]) -> "#{header}: #{value}").join("\n")
                     log.prettySentData = JSON.stringify(log.request_data)
                     log.prettyDate = moment(log.created).format(prettyDate)
 
diff --git a/app/coffee/modules/base/contrib.coffee b/app/coffee/modules/base/contrib.coffee
index 9c66492f..3db5a643 100644
--- a/app/coffee/modules/base/contrib.coffee
+++ b/app/coffee/modules/base/contrib.coffee
@@ -36,7 +36,7 @@ class ContribController extends taiga.Controller
     ]
 
     constructor: (@rootScope, @scope, @params, @repo, @rs, @confirm) ->
-        @scope.currentPlugin = _.first(_.where(@rootScope.adminPlugins, {"slug": @params.plugin}))
+        @scope.currentPlugin = _.head(_.filter(@rootScope.adminPlugins, {"slug": @params.plugin}))
         @scope.projectSlug = @params.pslug
 
         promise = @.loadInitialData()
diff --git a/app/coffee/modules/base/urls.coffee b/app/coffee/modules/base/urls.coffee
index 44fdfaf6..e275390a 100644
--- a/app/coffee/modules/base/urls.coffee
+++ b/app/coffee/modules/base/urls.coffee
@@ -48,8 +48,8 @@ class UrlsService extends taiga.Service
         url = format(@.urls[name], args.slice(1))
 
         return format("%s/%s", [
-            _.str.rtrim(@.mainUrl, "/"),
-            _.str.ltrim(url, "/")
+            _.trimEnd(@.mainUrl, "/"),
+            _.trimStart(url, "/")
         ])
 
     resolveAbsolute: ->
diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee
index c650b092..bbc1beb4 100644
--- a/app/coffee/modules/common/history.coffee
+++ b/app/coffee/modules/common/history.coffee
@@ -370,10 +370,12 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
         renderComments = ->
             comments = $scope.comments or []
             totalComments = comments.length
-            if not showAllComments
-                comments = _.last(comments, 4)
 
-            comments = _.map(comments, (x) -> renderComment(x))
+            if not showAllComments
+                comments = _.takeRight(comments, 4)
+
+            comments = _.map comments, (x) -> renderComment(x)
+
             html = renderHistory(comments, totalComments)
             $el.find(".comments-list").html(html)
 
@@ -381,7 +383,7 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
             changes = $scope.history or []
             totalChanges = changes.length
             if not showAllActivity
-                changes = _.last(changes, 4)
+                changes = _.takeRight(changes, 4)
 
             changes = _.map(changes, (x) -> renderChange(x))
             html = renderHistory(changes, totalChanges)
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 82f640b0..21851035 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -513,7 +513,7 @@ AssignedToLightboxDirective = (lightboxService, lightboxKeyboardNavigationServic
             username = normalizeString(username)
             text = text.toUpperCase()
             text = normalizeString(text)
-            return _.contains(username, text)
+            return _.includes(username, text)
 
         render = (selected, text) ->
             users = _.clone($scope.activeUsers, true)
@@ -522,7 +522,7 @@ AssignedToLightboxDirective = (lightboxService, lightboxKeyboardNavigationServic
 
             ctx = {
                 selected: selected
-                users: _.first(users, 5)
+                users: _.slice(users, 0, 5)
                 showMore: users.length > 5
             }
 
@@ -608,7 +608,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS
 
                 username = user.full_name_display.toUpperCase()
                 text = text.toUpperCase()
-                return _.contains(username, text)
+                return _.includes(username, text)
 
             users = _.clone($scope.activeUsers, true)
             users = _.filter(users, _.partial(_filterUsers, text))
@@ -618,7 +618,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS
         render = (users) ->
             ctx = {
                 selected: false
-                users: _.first(users, 5)
+                users: _.head(users, 5)
                 showMore: users.length > 5
             }
 
diff --git a/app/coffee/modules/common/tags.coffee b/app/coffee/modules/common/tags.coffee
index 0b8c8dfb..c5ea64e4 100644
--- a/app/coffee/modules/common/tags.coffee
+++ b/app/coffee/modules/common/tags.coffee
@@ -38,7 +38,7 @@ TagsDirective = ->
 
     parser = (v) ->
         return [] if not v
-        result = _(v.split(",")).map((x) -> _.str.trim(x))
+        result = _(v.split(",")).map((x) -> _.trim(x))
 
         return result.value()
 
diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee
index 4bfda2d1..18724b4b 100644
--- a/app/coffee/modules/controllerMixins.coffee
+++ b/app/coffee/modules/controllerMixins.coffee
@@ -46,7 +46,7 @@ class PageMixin
         @scope.roles = _.sortBy(roles, "order")
         computableRoles = _(@scope.project.members).map("role").uniq().value()
         @scope.computableRoles = _(roles).filter("computable")
-                                         .filter((x) -> _.contains(computableRoles, x.id))
+                                         .filter((x) -> _.includes(computableRoles, x.id))
                                          .value()
     loadUsersAndRoles: ->
         promise = @q.all([
diff --git a/app/coffee/modules/events.coffee b/app/coffee/modules/events.coffee
index aed298b8..ef0bb491 100644
--- a/app/coffee/modules/events.coffee
+++ b/app/coffee/modules/events.coffee
@@ -59,7 +59,7 @@ class EventsService
         if not startswith(url, "ws:") and not startswith(url, "wss:")
             loc = @win.location
             scheme = if loc.protocol == "https:" then "wss:" else "ws:"
-            path = _.str.ltrim(url, "/")
+            path = _.trimStart(url, "/")
             url = "#{scheme}//#{loc.host}/#{path}"
 
         @.ws = new @win.WebSocket(url)
diff --git a/app/coffee/utils.coffee b/app/coffee/utils.coffee
index 6ced2cc5..443bac59 100644
--- a/app/coffee/utils.coffee
+++ b/app/coffee/utils.coffee
@@ -59,16 +59,19 @@ mixOf = (base, mixins...) ->
 
 
 trim = (data, char) ->
-    return _.str.trim(data, char)
+    return _.trim(data, char)
 
 
 slugify = (data) ->
-    return _.str.slugify(data)
-
+    return data.toString().toLowerCase().trim()
+        .replace(/\s+/g, '-')
+        .replace(/&/g, '-and-')
+        .replace(/[^\w\-]+/g, '')
+        .replace(/\-\-+/g, '-')
 
 unslugify = (data) ->
     if data
-        return _.str.capitalize(data.replace(/-/g, ' '))
+        return _.capitalize(data.replace(/-/g, ' '))
     return data
 
 
@@ -114,7 +117,7 @@ toString = (value) ->
 
 
 joinStr = (str, coll) ->
-    return _.str.join(str, coll)
+    return coll.join(str)
 
 
 debounce = (wait, func) ->
@@ -126,7 +129,7 @@ debounceLeading = (wait, func) ->
 
 
 startswith = (str1, str2) ->
-    return _.str.startsWith(str1, str2)
+    return _.startsWith(str1, str2)
 
 
 truncate = (str, maxLength, suffix="...") ->
diff --git a/bower.json b/bower.json
index 1846ba06..0ecb935a 100644
--- a/bower.json
+++ b/bower.json
@@ -47,7 +47,6 @@
     "tests"
   ],
   "dependencies": {
-    "lodash": "~2.4.2",
     "emoticons": "~0.1.7",
     "jquery-flot": "~0.8.2",
     "angular": "1.4.7",
@@ -83,10 +82,11 @@
     "eventemitter2": "~0.4.14",
     "immutable": "~3.7.6",
     "bluebird": "~2.10.2",
-    "intro.js": "~1.1.1"
+    "intro.js": "~1.1.1",
+    "lodash": "~4.0.0"
   },
   "resolutions": {
-    "lodash": "~2.4.2",
+    "lodash": "~4.0.0",
     "moment": "~2.10.6",
     "jquery": "~2.1.1",
     "angular": "1.4.7"
diff --git a/e2e/shared/detail.js b/e2e/shared/detail.js
index 5f6dc991..26d87fe4 100644
--- a/e2e/shared/detail.js
+++ b/e2e/shared/detail.js
@@ -65,6 +65,7 @@ shared.statusTesting = async function(status1 , status2) {
     await statusHelper.setStatus(1);
 
     let selectedStatus = await statusHelper.getSelectedStatus();
+
     expect(selectedStatus).to.be.equal(status1);
 
     // Status 2
diff --git a/e2e/suites/tasks/task-detail.e2e.js b/e2e/suites/tasks/task-detail.e2e.js
index f5907c96..26917e1e 100644
--- a/e2e/suites/tasks/task-detail.e2e.js
+++ b/e2e/suites/tasks/task-detail.e2e.js
@@ -33,7 +33,7 @@ describe('Task detail', function(){
 
     it('description edition', sharedDetail.descriptionTesting);
 
-    it('status edition', sharedDetail.statusTesting);
+    it('status edition', sharedDetail.bind(this, 'Ready', 'In progress'));
 
     describe('assigned to edition', sharedDetail.assignedToTesting);
 
diff --git a/gulpfile.js b/gulpfile.js
index 8e8056d6..8c50705a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -140,9 +140,8 @@ paths.coffee_order = [
 paths.libs = [
     paths.vendor + "bluebird/js/browser/bluebird.js",
     paths.vendor + "jquery/dist/jquery.js",
-    paths.vendor + "lodash/dist/lodash.js",
+    paths.vendor + "lodash/lodash.js",
     paths.vendor + "emoticons/lib/emoticons.js",
-    paths.vendor + "underscore.string/lib/underscore.string.js",
     paths.vendor + "messageformat/messageformat.js",
     paths.vendor + "angular/angular.js",
     paths.vendor + "angular-route/angular-route.js",
diff --git a/run-e2e.js b/run-e2e.js
index 33af48d8..e7f005f7 100644
--- a/run-e2e.js
+++ b/run-e2e.js
@@ -3,6 +3,8 @@ var child_process = require('child_process');
 var inquirer = require("inquirer");
 var Promise = require('bluebird');
 
+// npm run e2e -- -s userStories, auth
+
 var suites = [
     'auth',
     'public',

From ef8087774a519dd9b8aceec2c66102c5dd4c4b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 3 Feb 2016 13:30:19 +0100
Subject: [PATCH 027/155] Update CHECKOUT

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4adf2c47..3670fbcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog #
 
 
+## 2.0.0 ??? (unreleased)
+
+### Features
+- ...
+
+### Misc
+- Lots of small and not so small bugfixes.
+
+
 ## 1.10.0 Dryas Octopetala (2016-01-30)
 
 ### Features

From 3241a657dceec0d88677d99d5264f09d8f1cfb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 4 Feb 2016 16:47:32 +0100
Subject: [PATCH 028/155] [Loudash migration] Fix Team stats

---
 app/coffee/modules/team/main.coffee | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 2dd37f04..7e5733b8 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -110,15 +110,18 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
           @scope.stats.totals = @scope.totals
 
     _processStat: (stat) ->
-        max = _.max(stat)
-        min = _.min(stat)
-        singleStat = _.map stat, (value, key) ->
+        max = _.max(_.toArray(stat))
+        min = _.min(_.toArray(stat))
+
+        singleStat = Object()
+        for own key, value of stat
             if value == min
-                return [key, 0.1]
-            if value == max
-                return [key, 1]
-            return [key, (value * 0.5) / max]
-        singleStat = _.object(singleStat)
+                singleStat[key] = 0.1
+            else if value == max
+                singleStat[key] = 1
+            else
+                singleStat[key] = (value * 0.5) / max
+
         return singleStat
 
     _processStats: (stats) ->

From 6d2abd6bd8061c3df71764ab5d5a1d6251211f24 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 5 Feb 2016 08:43:35 +0100
Subject: [PATCH 029/155] fix add watchers lightbox

---
 app/coffee/modules/common/lightboxes.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 21851035..ed65d28f 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -618,7 +618,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS
         render = (users) ->
             ctx = {
                 selected: false
-                users: _.head(users, 5)
+                users: _.slice(users, 0, 5)
                 showMore: users.length > 5
             }
 

From acd1f7646b8e8aada5f78dd0eb185e461db0eb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 5 Feb 2016 12:41:45 +0100
Subject: [PATCH 030/155] Add space between related task name and ID

---
 app/styles/modules/common/related-tasks.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss
index 86c437a3..e3aa2231 100644
--- a/app/styles/modules/common/related-tasks.scss
+++ b/app/styles/modules/common/related-tasks.scss
@@ -124,6 +124,10 @@
             text-overflow: ellipsis;
             white-space: nowrap;
         }
+        svg,
+        span {
+            margin-right: .25rem;
+        }
         input {
             @extend %medium;
             margin-right: 1rem;

From 8e2fac39a7699db712f65910b74260e76d925c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 5 Feb 2016 12:47:40 +0100
Subject: [PATCH 031/155] Assign to me

---
 app/styles/modules/common/assigned-to.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss
index f4b2ccf7..71a41c07 100644
--- a/app/styles/modules/common/assigned-to.scss
+++ b/app/styles/modules/common/assigned-to.scss
@@ -73,7 +73,7 @@
     }
     .user-assigned,
     .assign-to-me {
-        cursor: default;
+        color: $primary;
         &:hover {
             color: currentColor;
         }

From 5b99971b7d5c5c2ed624528a81deb5bb9b30c993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 5 Feb 2016 13:03:33 +0100
Subject: [PATCH 032/155] Add autofocus in login page

---
 app/partials/includes/modules/login-form.jade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/partials/includes/modules/login-form.jade b/app/partials/includes/modules/login-form.jade
index 87615f94..bb62082d 100644
--- a/app/partials/includes/modules/login-form.jade
+++ b/app/partials/includes/modules/login-form.jade
@@ -5,6 +5,8 @@ div.login-form-container(tg-login)
                 type="text"
                 autocorrect="off"
                 autocapitalize="none"
+                autofocus
+                required
                 name="username"
                 data-required="true"
                 placeholder="{{'LOGIN_COMMON.PLACEHOLDER_AUTH_NAME' | translate}}"

From ce4d1dbcd77ba63648735f02610c421bf0235e70 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 5 Feb 2016 13:57:40 +0100
Subject: [PATCH 033/155] hide roles without users in team page

---
 app/coffee/modules/team/main.coffee | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 7e5733b8..3de5ade8 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -134,6 +134,11 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
         return promise.then (project) =>
             @.fillUsersAndRoles(project.members, project.roles)
             @.loadMembers()
+
+            userRoles = _.map @scope.users, (user) -> user.role
+
+            @scope.roles = _.filter @scope.roles, (role) -> userRoles.indexOf(role.id) != -1
+
             return @.loadMemberStats()
 
 module.controller("TeamController", TeamController)

From ef77d01f88b142440d728619e38e19ffdd63c707 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 5 Feb 2016 14:23:55 +0100
Subject: [PATCH 034/155] reset attachments on issue creation

---
 app/coffee/modules/issues/lightboxes.coffee | 3 ++-
 app/modules/attachments/attachments.scss    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/coffee/modules/issues/lightboxes.coffee b/app/coffee/modules/issues/lightboxes.coffee
index 298ca7f6..3be9bb6b 100644
--- a/app/coffee/modules/issues/lightboxes.coffee
+++ b/app/coffee/modules/issues/lightboxes.coffee
@@ -41,7 +41,7 @@ CreateIssueDirective = ($repo, $confirm, $rootscope, lightboxService, $loading,
         $scope.$on "issueform:new", (ctx, project)->
             form.reset()
 
-            attachmentsToAdd = Immutable.List()
+            resetAttachments()
 
             $el.find(".tag-input").val("")
 
@@ -71,6 +71,7 @@ CreateIssueDirective = ($repo, $confirm, $rootscope, lightboxService, $loading,
 
         resetAttachments = () ->
             attachmentsToAdd = Immutable.List()
+            $scope.attachments = Immutable.List()
 
         $scope.addAttachment = (attachment) ->
             attachmentsToAdd = attachmentsToAdd.push(attachment)
diff --git a/app/modules/attachments/attachments.scss b/app/modules/attachments/attachments.scss
index e8f12d61..59e2336d 100644
--- a/app/modules/attachments/attachments.scss
+++ b/app/modules/attachments/attachments.scss
@@ -12,6 +12,7 @@
         @extend %medium;
         @extend %bold;
         color: $grayer;
+        line-height: 36px;
         padding: 0 1rem;
     }
     .options {

From 04998040dc37f80af80f3a2587009850084d34a9 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Mon, 8 Feb 2016 07:43:20 +0100
Subject: [PATCH 035/155] Fixing number formatting in backlog

---
 app/partials/backlog/sprint-header.jade       | 4 ++--
 app/partials/includes/components/summary.jade | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/partials/backlog/sprint-header.jade b/app/partials/backlog/sprint-header.jade
index cd0b85fd..c1e636fb 100644
--- a/app/partials/backlog/sprint-header.jade
+++ b/app/partials/backlog/sprint-header.jade
@@ -9,8 +9,8 @@
     .sprint-date {{::estimatedDateRange}}
     ul
         li
-            span.number {{::closedPoints}}
+            span.number {{::closedPoints | number:2 | number}}
             span.description(translate="BACKLOG.CLOSED_POINTS")
         li
-            span.number {{::totalPoints}}
+            span.number {{::totalPoints | number:2 | number}}
             span.description(translate="BACKLOG.TOTAL_POINTS")
diff --git a/app/partials/includes/components/summary.jade b/app/partials/includes/components/summary.jade
index 26913101..81ba9d4b 100644
--- a/app/partials/includes/components/summary.jade
+++ b/app/partials/includes/components/summary.jade
@@ -4,14 +4,14 @@ div.summary
     div.data
         span.number(ng-bind="stats.completedPercentage + '%'")
 
-    div.summary-stats(ng-if="stats.total_points | number:2")
+    div.summary-stats(ng-if="stats.total_points | number:2 | number")
         span.number(ng-bind="stats.total_points") --
         span.description(translate="BACKLOG.SUMMARY.PROJECT_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.defined_points | number:2") --
+        span.number(ng-bind="stats.defined_points | number:2 | number") --
         span.description(translate="BACKLOG.SUMMARY.DEFINED_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.closed_points | number:2") --
+        span.number(ng-bind="stats.closed_points | number:2 | number") --
         span.description(translate="BACKLOG.SUMMARY.CLOSED_POINTS")
     div.summary-stats
         span.number(ng-bind="stats.speed | number:0") --

From b86644bef60e057b5abdfa1c71dad8ccfa4f5397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 8 Feb 2016 09:25:48 +0100
Subject: [PATCH 036/155] Graph icon size

---
 app/styles/components/summary.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss
index 3c25c075..7e789061 100644
--- a/app/styles/components/summary.scss
+++ b/app/styles/components/summary.scss
@@ -171,10 +171,10 @@ $summary-background: $grayer;
     margin-bottom: 1rem;
     padding: 2rem 6rem;
     svg {
+        @include svg-size(5rem);
         flex-basis: 5rem;
         flex-shrink: 0;
         margin-right: 1rem;
-        width: 5rem;
     }
     p {
         margin: 0;

From 5db31acf2052234940a33e95f15f4336e919634b Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 8 Feb 2016 14:58:05 +0100
Subject: [PATCH 037/155] merge to assign - lodash

---
 app/coffee/modules/base/http.coffee | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/coffee/modules/base/http.coffee b/app/coffee/modules/base/http.coffee
index 2144e3fb..a2af080d 100644
--- a/app/coffee/modules/base/http.coffee
+++ b/app/coffee/modules/base/http.coffee
@@ -47,12 +47,14 @@ class HttpService extends taiga.Service
         return headers
 
     request: (options) ->
-        options.headers = _.merge({}, options.headers or {}, @.headers())
+        options.headers = _.assign({}, options.headers or {}, @.headers())
+
+        console.log options
 
         return @http(options)
 
     get: (url, params, options) ->
-        options = _.merge({method: "GET", url: url}, options)
+        options = _.assign({method: "GET", url: url}, options)
         options.params = params if params
 
         # prevent duplicated http request
@@ -62,25 +64,27 @@ class HttpService extends taiga.Service
             @.cache.removeAll()
 
     post: (url, data, params, options) ->
-        options = _.merge({method: "POST", url: url}, options)
+        options = _.assign({method: "POST", url: url}, options)
+
         options.data = data if data
         options.params = params if params
+
         return @.request(options)
 
     put: (url, data, params, options) ->
-        options = _.merge({method: "PUT", url: url}, options)
+        options = _.assign({method: "PUT", url: url}, options)
         options.data = data if data
         options.params = params if params
         return @.request(options)
 
     patch: (url, data, params, options) ->
-        options = _.merge({method: "PATCH", url: url}, options)
+        options = _.assign({method: "PATCH", url: url}, options)
         options.data = data if data
         options.params = params if params
         return @.request(options)
 
     delete: (url, data, params, options) ->
-        options = _.merge({method: "DELETE", url: url}, options)
+        options = _.assign({method: "DELETE", url: url}, options)
         options.data = data if data
         options.params = params if params
         return @.request(options)

From 3f2040dcfea90003a6bc3d9e648be74162ecf3a1 Mon Sep 17 00:00:00 2001
From: Andrea Stagi <stagi.andrea@gmail.com>
Date: Wed, 27 Jan 2016 13:03:12 +0100
Subject: [PATCH 038/155] Add custom field url type

---
 CHANGELOG.md                                  |  2 +-
 app/coffee/app.coffee                         | 27 ++++++++++++-------
 .../modules/admin/project-values.coffee       |  7 +++--
 .../modules/common/custom-field-values.coffee | 18 ++++++++++---
 app/locales/taiga/locale-en.json              |  6 +++--
 .../custom-attribute-value-edit.jade          |  4 ++-
 .../custom-attribute-value.jade               |  5 ++++
 .../admin/admin-custom-attributes.jade        |  1 +
 app/styles/core/forms.scss                    |  1 +
 app/themes/high-contrast/custom.scss          |  1 +
 app/themes/material-design/custom.scss        |  1 +
 app/themes/taiga/custom.scss                  |  1 +
 12 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3670fbcb..67620f95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 ## 2.0.0 ??? (unreleased)
 
 ### Features
-- ...
+- Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).
 
 ### Misc
 - Lots of small and not so small bugfixes.
diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 0e8b6f37..5d782823 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -510,16 +510,6 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
 
     $httpProvider.interceptors.push("versionCheckHttpIntercept")
 
-    window.checksley.updateValidators({
-        linewidth: (val, width) ->
-            lines = taiga.nl2br(val).split("<br />")
-
-            valid = _.every lines, (line) ->
-                line.length < width
-
-            return valid
-    })
-
     $compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false)
 
     if localStorage.userInfo
@@ -577,6 +567,8 @@ i18nInit = (lang, $translate) ->
         maxcheck: $translate.instant("COMMON.FORM_ERRORS.MAX_CHECK")
         rangecheck: $translate.instant("COMMON.FORM_ERRORS.RANGE_CHECK")
         equalto: $translate.instant("COMMON.FORM_ERRORS.EQUAL_TO")
+        linewidth: $translate.instant("COMMON.FORM_ERRORS.LINEWIDTH") # Extra validator
+        pikaday: $translate.instant("COMMON.FORM_ERRORS.PIKADAY") # Extra validator
     }
     checksley.updateMessages('default', messages)
 
@@ -584,6 +576,21 @@ i18nInit = (lang, $translate) ->
 init = ($log, $rootscope, $auth, $events, $analytics, $translate, $location, $navUrls, appMetaService, projectService, loaderService, navigationBarService) ->
     $log.debug("Initialize application")
 
+    # Checksley - Extra validators
+    validators = {
+        linewidth: (val, width) ->
+            lines = taiga.nl2br(val).split("<br />")
+
+            valid = _.every lines, (line) ->
+                line.length < width
+
+            return valid
+        pikaday: (val) ->
+            prettyDate = $translate.instant("COMMON.PICKERDATE.FORMAT")
+            return moment(val, prettyDate).isValid()
+    }
+    checksley.updateValidators(validators)
+
     # Taiga Plugins
     $rootscope.contribPlugins = @.taigaContribPlugins
     $rootscope.adminPlugins = _.filter(@.taigaContribPlugins, {"type": "admin"})
diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index dff5ae07..de031bdc 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -381,6 +381,7 @@ module.directive("tgColorSelection", ColorSelectionDirective)
 TEXT_TYPE = "text"
 MULTILINE_TYPE = "multiline"
 DATE_TYPE = "date"
+URL_TYPE = "url"
 
 
 TYPE_CHOICES = [
@@ -395,6 +396,10 @@ TYPE_CHOICES = [
     {
         key: DATE_TYPE,
         name: "ADMIN.CUSTOM_FIELDS.FIELD_TYPE_DATE"
+    },
+    {
+        key: URL_TYPE,
+        name: "ADMIN.CUSTOM_FIELDS.FIELD_TYPE_URL"
     }
 ]
 
@@ -555,7 +560,6 @@ ProjectCustomAttributesDirective = ($log, $confirm, animationFrame, $translate)
 
         $el.on "click", ".js-add-custom-field-button", (event) ->
             event.preventDefault()
-
             showCreateForm()
 
         $el.on "click", ".js-create-custom-field-button", debounce 2000, (event) ->
@@ -567,7 +571,6 @@ ProjectCustomAttributesDirective = ($log, $confirm, animationFrame, $translate)
 
         $el.on "click", ".js-cancel-new-custom-field-button", (event) ->
             event.preventDefault()
-
             cancelCreate()
 
         $el.on "keyup", ".js-new-custom-field input", (event) ->
diff --git a/app/coffee/modules/common/custom-field-values.coffee b/app/coffee/modules/common/custom-field-values.coffee
index ad748350..8568cae5 100644
--- a/app/coffee/modules/common/custom-field-values.coffee
+++ b/app/coffee/modules/common/custom-field-values.coffee
@@ -34,6 +34,7 @@ module = angular.module("taigaCommon")
 TEXT_TYPE = "text"
 MULTILINE_TYPE = "multiline"
 DATE_TYPE = "date"
+URL_TYPE = "url"
 
 
 TYPE_CHOICES = [
@@ -48,6 +49,10 @@ TYPE_CHOICES = [
     {
         key: DATE_TYPE,
         name: "ADMIN.CUSTOM_FIELDS.FIELD_TYPE_DATE"
+    },
+    {
+        key: URL_TYPE,
+        name: "ADMIN.CUSTOM_FIELDS.FIELD_TYPE_URL"
     }
 ]
 
@@ -100,6 +105,7 @@ class CustomAttributesValuesController extends taiga.Controller
 
 CustomAttributesValuesDirective = ($templates, $storage) ->
     template = $templates.get("custom-attributes/custom-attributes-values.html", true)
+
     collapsedHash = (type) ->
         return generateHash(["custom-attributes-collapsed", type])
 
@@ -198,12 +204,14 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
         submit = debounce 2000, (event) =>
             event.preventDefault()
 
-            attributeValue.value = $el.find("input[name=value], textarea[name='value']").val()
+            form = $el.find("form").checksley()
+            return if not form.validate()
+
+            input = $el.find("input[name=value], textarea[name='value']")
+            attributeValue.value = input.val()
             if attributeValue.type is DATE_TYPE
                 if moment(attributeValue.value, prettyDate).isValid()
                     attributeValue.value = moment(attributeValue.value, prettyDate).format("YYYY-MM-DD")
-                else
-                    attributeValue.value = ""
 
             $scope.$apply ->
                 $ctrl.updateAttributeValue(attributeValue).then ->
@@ -217,6 +225,10 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
         render(attributeValue)
 
         ## Actions (on view mode)
+
+        $el.on "click", ".js-value-view-mode span a", (event) ->
+            event.stopPropagation()
+
         $el.on "click", ".js-value-view-mode", ->
             return if not isEditable()
             return if $selectedText.get().length
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 8480026f..3ab75a0d 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -65,7 +65,8 @@
             "MIN_CHECK": "You must select at least %s choices.",
             "MAX_CHECK": "You must select %s choices or less.",
             "RANGE_CHECK": "You must select between %s and %s choices.",
-            "EQUAL_TO": "This value should be the same."
+            "EQUAL_TO": "This value should be the same.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -494,7 +495,8 @@
             "ISSUE_ADD": "Add a custom field in issues",
             "FIELD_TYPE_TEXT": "Text",
             "FIELD_TYPE_MULTI": "Multi-line",
-            "FIELD_TYPE_DATE": "Date"
+            "FIELD_TYPE_DATE": "Date",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Project values - {{projectName}}",
diff --git a/app/partials/custom-attributes/custom-attribute-value-edit.jade b/app/partials/custom-attributes/custom-attribute-value-edit.jade
index f6869cba..1f90518e 100644
--- a/app/partials/custom-attributes/custom-attribute-value-edit.jade
+++ b/app/partials/custom-attributes/custom-attribute-value-edit.jade
@@ -14,7 +14,9 @@ form.custom-field-single.editable
         <% } else if (type=="multiline") { %>
         textarea#custom-field-value(name="value") <%- value %>
         <% } else if (type=="date") { %>
-        input#custom-field-value(name="value", type="text", value!="<%- value %>")
+        input#custom-field-value(name="value", type="text", data-pikaday, value!="<%- value %>")
+        <% } else if (type=="url") { %>
+        input#custom-field-value(name="value", type="url", data-type="url", value!="<%- value %>")
         <% } else { %>
         input#custom-field-value(name="value", type="text", value!="<%- value %>")
         <% } %>
diff --git a/app/partials/custom-attributes/custom-attribute-value.jade b/app/partials/custom-attributes/custom-attribute-value.jade
index f7ac5620..c89dbd06 100644
--- a/app/partials/custom-attributes/custom-attribute-value.jade
+++ b/app/partials/custom-attributes/custom-attribute-value.jade
@@ -9,7 +9,12 @@ div.custom-field-single
 
     div.custom-field-value.js-value-view-mode
         span
+            <% if (type=="url") { %>
+            a(href!="<%- value %>")
+                <%- value %>
+            <% } else { %>
             <%- value %>
+            <% } %>
 
     <% if (isEditable) { %>
     div.custom-field-options
diff --git a/app/partials/includes/modules/admin/admin-custom-attributes.jade b/app/partials/includes/modules/admin/admin-custom-attributes.jade
index 353ea45e..bb03c36c 100644
--- a/app/partials/includes/modules/admin/admin-custom-attributes.jade
+++ b/app/partials/includes/modules/admin/admin-custom-attributes.jade
@@ -32,6 +32,7 @@ section.custom-fields-table.basic-table
                             span(ng-switch-default, translate="ADMIN.CUSTOM_FIELDS.FIELD_TYPE_TEXT")
                             span(ng-switch-when="multiline", translate="ADMIN.CUSTOM_FIELDS.FIELD_TYPE_MULTI")
                             span(ng-switch-when="date", translate="ADMIN.CUSTOM_FIELDS.FIELD_TYPE_DATE")
+                            span(ng-switch-when="url", translate="ADMIN.CUSTOM_FIELDS.FIELD_TYPE_URL")
                         div.custom-options
                             div.custom-options-wrapper
                                 a.js-edit-custom-field-button.icon.icon-edit(
diff --git a/app/styles/core/forms.scss b/app/styles/core/forms.scss
index 1ef309d3..238bdbd8 100644
--- a/app/styles/core/forms.scss
+++ b/app/styles/core/forms.scss
@@ -8,6 +8,7 @@ fieldset {
 input[type="text"],
 input[type="number"],
 input[type="password"],
+input[type="url"],
 input[type="email"],
 input[type="date"],
 input[type="password"],
diff --git a/app/themes/high-contrast/custom.scss b/app/themes/high-contrast/custom.scss
index 0ad07c93..c566bacc 100644
--- a/app/themes/high-contrast/custom.scss
+++ b/app/themes/high-contrast/custom.scss
@@ -78,6 +78,7 @@ a {
 input[type="text"],
 input[type="number"],
 input[type="password"],
+input[type="url"],
 input[type="email"],
 input[type="date"],
 input[type="password"],
diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss
index e37abb23..7ada1f31 100644
--- a/app/themes/material-design/custom.scss
+++ b/app/themes/material-design/custom.scss
@@ -73,6 +73,7 @@ a {
 input[type="text"],
 input[type="number"],
 input[type="password"],
+input[type="url"],
 input[type="email"],
 input[type="date"],
 input[type="password"],
diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss
index 08adf274..7a5ad4d7 100644
--- a/app/themes/taiga/custom.scss
+++ b/app/themes/taiga/custom.scss
@@ -55,6 +55,7 @@ a {
 input[type="text"],
 input[type="number"],
 input[type="password"],
+input[type="url"],
 input[type="email"],
 input[type="date"],
 input[type="password"],

From 9a9150268748f42f396d1becb990cb01d7b6e882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 5 Feb 2016 15:55:10 +0100
Subject: [PATCH 039/155] [Refactor]  Remove directive tg-limit-line-length

---
 app/coffee/modules/common.coffee              | 20 -------------------
 app/locales/taiga/locale-en.json              |  1 +
 .../includes/modules/lightbox-issue-bulk.jade | 15 ++++++++++++--
 .../includes/modules/lightbox-task-bulk.jade  | 15 ++++++++++++--
 .../includes/modules/lightbox-us-bulk.jade    | 15 ++++++++++++--
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index 955861d0..86afc2ab 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -234,26 +234,6 @@ ProjectUrl = ($navurls) ->
 module.factory("$projectUrl", ["$tgNavUrls", ProjectUrl])
 
 
-#############################################################################
-## Limite line size in a text area
-#############################################################################
-
-LimitLineLengthDirective = () ->
-    link = ($scope, $el, $attrs) ->
-        maxColsPerLine = parseInt($el.attr("cols"))
-        $el.on "keyup", (event) ->
-            code = event.keyCode
-            lines = $el.val().split("\n")
-
-            _.each lines, (line, index) ->
-                lines[index] = line.substring(0, maxColsPerLine - 2)
-
-            $el.val(lines.join("\n"))
-
-    return {link:link}
-
-module.directive("tgLimitLineLength", LimitLineLengthDirective)
-
 #############################################################################
 ## Queue Q promises
 #############################################################################
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 3ab75a0d..86fee941 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -66,6 +66,7 @@
             "MAX_CHECK": "You must select %s choices or less.",
             "RANGE_CHECK": "You must select between %s and %s choices.",
             "EQUAL_TO": "This value should be the same.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
             "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
diff --git a/app/partials/includes/modules/lightbox-issue-bulk.jade b/app/partials/includes/modules/lightbox-issue-bulk.jade
index bef68aac..917fb5ee 100644
--- a/app/partials/includes/modules/lightbox-issue-bulk.jade
+++ b/app/partials/includes/modules/lightbox-issue-bulk.jade
@@ -3,6 +3,17 @@ a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
-        textarea(cols="200", wrap="off", tg-limit-line-length, ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}", ng-model="new.bulk", data-required="true", data-linewidth="200")
+        textarea(
+            cols="200"
+            wrap="off"
+            ng-model="new.bulk"
+            data-required="true"
+            data-linewidth="200"
+            ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}"
+        )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.SAVE' | translate}}"
+        translate="COMMON.SAVE"
+    )
diff --git a/app/partials/includes/modules/lightbox-task-bulk.jade b/app/partials/includes/modules/lightbox-task-bulk.jade
index f07ef517..5a1d4b1a 100644
--- a/app/partials/includes/modules/lightbox-task-bulk.jade
+++ b/app/partials/includes/modules/lightbox-task-bulk.jade
@@ -3,6 +3,17 @@ a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
-        textarea(cols="200", wrap="off", tg-limit-line-length, ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}", ng-model="form.data", data-required="true")
+        textarea(
+            cols="200"
+            wrap="off"
+            ng-model="form.data"
+            data-required="true"
+            data-linewidth="200"
+            ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}"
+        )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.SAVE' | translate}}"
+        translate="COMMON.SAVE"
+    )
diff --git a/app/partials/includes/modules/lightbox-us-bulk.jade b/app/partials/includes/modules/lightbox-us-bulk.jade
index e12442fd..4da92990 100644
--- a/app/partials/includes/modules/lightbox-us-bulk.jade
+++ b/app/partials/includes/modules/lightbox-us-bulk.jade
@@ -3,6 +3,17 @@ a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
-        textarea(cols="200", wrap="off", tg-limit-line-length,  ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}", ng-model="new.bulk", data-required="true", data-linewidth="200")
+        textarea(
+            cols="200"
+            wrap="off"
+            ng-model="new.bulk"
+            data-required="true"
+            data-linewidth="200"
+            ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}"
+        )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
\ No newline at end of file
+    button.button-green.submit-button(
+        type="submit",
+        title="{{'COMMON.SAVE' | translate}}",
+        translate="COMMON.SAVE"
+    )

From 7fec4f62b411d492d684086a6d36823236df718d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 13 Jan 2016 13:59:24 +0100
Subject: [PATCH 040/155] :art: :racehorse: SVG sprites

---
 CHANGELOG.md                                  |   1 +
 app/coffee/modules/admin/lightboxes.coffee    |  29 +-
 app/coffee/modules/admin/memberships.coffee   |   8 +-
 app/coffee/modules/admin/roles.coffee         |   7 +-
 app/coffee/modules/backlog/lightboxes.coffee  |   2 +-
 app/coffee/modules/backlog/main.coffee        |   2 +-
 app/coffee/modules/backlog/sprints.coffee     |   4 +-
 app/coffee/modules/common.coffee              |   8 +-
 app/coffee/modules/common/components.coffee   |   9 +-
 app/coffee/modules/common/confirm.coffee      |  36 +-
 .../modules/common/custom-field-values.coffee |  10 +-
 app/coffee/modules/common/tags.coffee         |  13 +-
 app/coffee/modules/issues/list.coffee         |  14 +-
 app/coffee/modules/related-tasks.coffee       |   4 +-
 app/index.jade                                |   1 +
 app/locales/taiga/locale-en.json              |   4 +-
 .../attachments/attachment-gallery.scss       |  99 ++---
 app/modules/attachments/attachment-list.scss  |  31 +-
 app/modules/attachments/attachments.scss      |  16 +-
 .../attachment/attachment-gallery.jade        |   3 +-
 .../components/attachment/attachment.jade     |  24 +-
 .../attachments-full/attachments-full.jade    |  14 +-
 .../attachments-simple.jade                   |  10 +-
 .../attachments-sortable.directive.coffee     |   2 +-
 .../live-announcement/live-announcement.jade  |   3 +-
 .../components/project-menu/project-menu.jade |  27 +-
 .../components/vote-button/vote-button.jade   |   6 +-
 .../watch-button/watch-button-ticket.jade     |  26 +-
 .../components/watch-button/watch-button.jade |  10 +-
 .../discover-home-order-by.jade               |   3 +-
 .../discover-search-bar.jade                  |   4 +-
 .../discover-search-bar.scss                  |  14 +-
 .../discover-search-list-header.jade          |   9 +-
 .../discover-search-list-header.scss          |   9 +-
 .../featured-projects/featured-projects.jade  |  15 +-
 .../components/highlighted/highlighted.jade   |  17 +-
 .../components/highlighted/highlighted.scss   |  25 +-
 .../components/most-active/most-active.jade   |   6 +-
 .../components/most-liked/most-liked.jade     |   6 +-
 .../discover-search/discover-search.jade      |  17 +-
 .../discover-search/discover-search.scss      |   9 +-
 .../home/projects/home-project-list.jade      |  23 +-
 .../home/projects/home-project-list.scss      |   4 +-
 .../dropdown-organization-list.jade           |  10 -
 .../dropdown-project-list.jade                |  13 +-
 .../navigation-bar/navigation-bar.jade        |   6 +-
 .../navigation-bar/navigation-bar.scss        |  21 +-
 .../profile/profile-bar/profile-bar.jade      |  17 -
 .../profile-contacts/profile-contacts.jade    |   3 +-
 .../profile/profile-favs/items/project.jade   |   8 +-
 .../profile/profile-favs/items/ticket.jade    |   8 +-
 .../profile/profile-favs/profile-favs.jade    |   3 +-
 .../profile/profile-favs/profile-favs.scss    |   2 +-
 .../profile/profile-hints/profile-hints.jade  |   3 +-
 .../profile-projects/profile-projects.jade    |  11 +-
 .../profile-tab/profile-tab.directive.coffee  |   1 +
 .../profile/profile-tabs/profile-tabs.jade    |   3 +-
 app/modules/profile/profile.jade              |   6 +-
 app/modules/profile/profile.scss              |   6 +-
 .../profile/styles/profile-content-tabs.scss  |  11 +-
 .../profile/styles/profile-sidebar.scss       |   5 +-
 .../like-project-button.jade                  |   3 +-
 .../watch-project-button.jade                 |  12 +-
 .../projects/listing/projects-listing.jade    |   9 +-
 .../projects/listing/styles/project-list.scss |  29 +-
 app/modules/projects/project/project.jade     |  11 +-
 .../user-timeline-attachment.jade             |   3 +-
 .../user-timeline/user-timeline.scss          |   5 +-
 app/partials/admin/admin-project-export.jade  |   3 +-
 app/partials/admin/admin-project-modules.jade |  15 +-
 app/partials/admin/admin-project-profile.jade |  16 +-
 app/partials/admin/admin-project-reports.jade |   3 +-
 app/partials/admin/admin-roles.jade           |  36 +-
 .../admin/admin-third-parties-bitbucket.jade  |   6 +-
 .../admin/admin-third-parties-github.jade     |   6 +-
 .../admin/admin-third-parties-gitlab.jade     |   6 +-
 .../admin/admin-third-parties-webhooks.jade   |  54 ++-
 app/partials/admin/project-csv.jade           |   9 +-
 app/partials/backlog/backlog.jade             |  10 +-
 app/partials/backlog/filter-selected.jade     |   3 +-
 app/partials/backlog/sprint-header.jade       |   7 +-
 .../common/components/add-button.jade         |   3 +-
 .../common/components/assigned-to.jade        |   9 +-
 .../common/components/block-button.jade       |   6 +-
 .../common/components/delete-button.jade      |   3 +-
 .../components/editable-description.jade      |   6 +-
 .../common/components/editable-subject.jade   |   6 +-
 app/partials/common/components/watchers.jade  |   4 +-
 app/partials/common/components/wysiwyg.jade   |   3 +-
 .../us-estimation-points-per-role.jade        |   3 +-
 .../estimation/us-estimation-total.jade       |   3 +-
 .../common/history/history-activity.jade      |   9 +-
 app/partials/common/history/history-base.jade |   6 +-
 .../history/history-deleted-comment.jade      |   3 +-
 app/partials/common/lightbox-feedback.jade    |   4 +-
 .../lightbox/lightbox-assigned-to-users.jade  |   3 +-
 .../common/lightbox/lightbox-assigned-to.jade |   5 +-
 .../lightbox/lightbox-attachment-preview.jade |   6 +-
 .../common/lightbox/lightbox-block.jade       |   4 +-
 .../common/lightbox/lightbox-users.jade       |   4 +-
 app/partials/common/tag/lb-tag-line-tags.jade |   3 +-
 app/partials/common/tag/lb-tag-line.jade      |   9 +-
 app/partials/common/tag/tag-line.jade         |   7 +-
 app/partials/common/tag/tags-line-tags.jade   |   3 +-
 .../wysiwyg/wysiwyg-markitup-preview.jade     |   3 +-
 .../custom-attribute-value-edit.jade          |   3 +-
 .../custom-attribute-value.jade               |  11 +-
 .../custom-attributes-values.jade             |   3 +-
 .../includes/components/addnewtask.jade       |  20 +-
 .../includes/components/addnewus.jade         |   3 +-
 .../includes/components/backlog-row.jade      |  19 +-
 .../components/notification-message.jade      |   9 +-
 .../includes/components/sprint-summary.jade   |   9 +-
 app/partials/includes/components/summary.jade |   3 +-
 .../includes/components/taskboard-task.jade   |  13 +-
 .../admin/admin-custom-attributes.jade        |  21 +-
 .../modules/admin/project-points.jade         |  39 +-
 .../modules/admin/project-status.jade         |  69 +++-
 .../includes/modules/admin/project-types.jade |  51 ++-
 .../modules/admin/project-us-status.jade      | 116 ++++--
 .../includes/modules/backlog-filters.jade     |  18 +-
 .../includes/modules/backlog-table.jade       |   3 +-
 .../includes/modules/colors-table.jade        |  21 -
 .../includes/modules/comment-activity.jade    |  17 -
 .../includes/modules/issues-filters.jade      |  30 +-
 .../includes/modules/issues-options.jade      |   3 +-
 .../includes/modules/issues-table.jade        |   9 +-
 .../includes/modules/kanban-table.jade        |  76 ++--
 .../includes/modules/lightbox-add-member.jade |   3 +-
 .../includes/modules/lightbox-ask-choice.jade |   5 +-
 .../modules/lightbox-create-issue.jade        |  50 ++-
 .../modules/lightbox-delete-project.jade      |   5 +-
 .../modules/lightbox-generic-ask.jade         |   8 +-
 .../modules/lightbox-generic-error.jade       |  15 +-
 .../modules/lightbox-generic-success.jade     |  15 +-
 .../includes/modules/lightbox-issue-bulk.jade |   9 +-
 .../modules/lightbox-sprint-add-edit.jade     |  65 ++-
 .../includes/modules/lightbox-task-bulk.jade  |   9 +-
 .../modules/lightbox-task-create-edit.jade    |  83 +++-
 .../includes/modules/lightbox-us-bulk.jade    |   8 +-
 .../modules/lightbox-us-create-edit.jade      |  90 ++++-
 .../includes/modules/search-filter.jade       |  12 +-
 app/partials/includes/modules/search-in.jade  |   9 +-
 app/partials/includes/modules/sprints.jade    |   6 +-
 .../includes/modules/taskboard-table.jade     |  50 ++-
 .../includes/modules/team/team-filters.jade   |   5 +-
 .../includes/modules/team/team-table.jade     |  11 +-
 app/partials/issue/iocaine-button.jade        |   3 +-
 app/partials/issue/issue-priority-button.jade |   3 +-
 app/partials/issue/issue-severity-button.jade |   3 +-
 app/partials/issue/issue-type-button.jade     |   3 +-
 app/partials/issue/issues-detail.jade         |   8 +-
 .../issue/issues-filters-selected.jade        |  15 +-
 app/partials/issue/issues-filters.jade        |   3 +-
 app/partials/issue/issues-status-button.jade  |   3 +-
 .../issue/promote-issue-to-us-button.jade     |   5 +-
 app/partials/kanban/kanban-task.jade          |   7 +-
 .../project/wizard-create-project.jade        |  53 ++-
 app/partials/search/lightbox-search.jade      |   5 +-
 .../task/related-task-create-form.jade        |  12 +-
 app/partials/task/related-task-row-edit.jade  |  12 +-
 app/partials/task/related-task-row.jade       |  16 +-
 app/partials/task/task-detail.jade            |   8 +-
 app/partials/team/leave-project.jade          |  10 +-
 app/partials/team/team-filter.jade            |  18 +-
 .../team/team-member-current-user.jade        |  17 +-
 app/partials/team/team-member-stats.jade      |  35 +-
 app/partials/team/team-members.jade           |   4 +-
 .../us/us-client-requirement-button.jade      |   3 +-
 app/partials/us/us-detail.jade                |   8 +-
 app/partials/us/us-status-button.jade         |   3 +-
 .../us/us-team-requirement-button.jade        |   3 +-
 .../lightbox/lightbox-delete-account.jade     |   3 +-
 app/partials/wiki/editable-wiki-content.jade  |  12 +-
 app/partials/wiki/wiki-nav.jade               |   3 +-
 app/partials/wiki/wiki.jade                   |   3 +-
 app/styles/components/buttons.scss            |  12 +-
 app/styles/components/editor-help.scss        |   9 +-
 app/styles/components/estimation.scss         |  14 +-
 app/styles/components/filter.scss             |  13 +-
 app/styles/components/kanban-task.scss        |  16 +-
 app/styles/components/markitup.scss           |   4 +
 .../components/notification-message.scss      |  16 +-
 app/styles/components/private.scss            |   4 +-
 app/styles/components/summary.scss            |  15 +-
 app/styles/components/tag.scss                |  24 +-
 app/styles/components/taskboard-task.scss     |  32 +-
 app/styles/components/track-btn.scss          |  36 +-
 app/styles/components/user-list.scss          |  24 +-
 app/styles/core/base.scss                     |   4 -
 app/styles/core/elements.scss                 |   4 -
 app/styles/core/forms.scss                    |   6 +-
 app/styles/core/typography.scss               | 185 ---------
 app/styles/dependencies/helpers.scss          |  16 +-
 app/styles/dependencies/mixins.scss           |  14 +-
 .../dependencies/mixins/project-card.scss     |  13 +-
 app/styles/layout/backlog.scss                |   4 +-
 app/styles/layout/ticket-detail.scss          |  27 +-
 app/styles/layout/wiki.scss                   |  33 +-
 app/styles/modules/admin/admin-common.scss    |   4 +-
 .../admin/admin-custom-attributes.scss        |  19 +-
 .../modules/admin/admin-functionalities.scss  |   8 +-
 .../modules/admin/admin-membership-table.scss |   6 +-
 app/styles/modules/admin/admin-roles.scss     |  27 +-
 .../admin/admin-third-parties-webhooks.scss   |  12 +-
 app/styles/modules/admin/project-csv.scss     |   6 +-
 app/styles/modules/admin/project-values.scss  |  18 +-
 app/styles/modules/backlog/backlog-table.scss |  77 ++--
 app/styles/modules/backlog/sprints.scss       |  49 ++-
 .../modules/backlog/taskboard-table.scss      |  27 +-
 app/styles/modules/common/assigned-to.scss    |  40 +-
 .../modules/common/category-config.scss       |  14 +-
 app/styles/modules/common/colors-table.scss   |  53 +--
 app/styles/modules/common/custom-fields.scss  |  30 +-
 app/styles/modules/common/history.scss        |  36 +-
 app/styles/modules/common/lightbox.scss       |  37 +-
 app/styles/modules/common/nav.scss            |   9 +-
 app/styles/modules/common/related-tasks.scss  |  79 ++--
 app/styles/modules/common/ticket-data.scss    |  16 +-
 app/styles/modules/common/wizard.scss         |   4 +-
 app/styles/modules/filters/filters.scss       |  16 +-
 app/styles/modules/issues/issues-table.scss   |  15 +-
 app/styles/modules/kanban/kanban-table.scss   |  51 +--
 app/styles/modules/search/search-filter.scss  |   9 +-
 app/styles/modules/search/search-in.scss      |   2 +-
 app/styles/modules/team/team-filters.scss     |  57 +--
 app/styles/modules/team/team-table.scss       |  24 +-
 app/styles/modules/wiki/wiki-nav.scss         |  15 +-
 app/svg/activity.svg                          |   5 -
 app/svg/add.svg                               |   3 -
 app/svg/attachment.svg                        |   3 -
 app/svg/check.svg                             |   5 -
 app/svg/client-requirement.svg                |   4 -
 app/svg/dashboard.svg                         |   5 -
 app/svg/discover.svg                          |   3 -
 app/svg/empty-project.svg                     |   7 -
 app/svg/eye.svg                               |   8 -
 app/svg/flag.svg                              |   1 -
 app/svg/gallery.svg                           |   3 -
 app/svg/graph.svg                             |   6 -
 app/svg/help.svg                              |   4 -
 app/svg/hide.svg                              |   6 -
 app/svg/iocaine.svg                           |   4 -
 app/svg/like.svg                              |   6 -
 app/svg/list.svg                              |   3 -
 app/svg/location.svg                          |   7 -
 app/svg/lock.svg                              |   3 -
 app/svg/organizations.svg                     |   5 -
 app/svg/project.svg                           |   3 -
 app/svg/projects.svg                          |   7 -
 app/svg/promote.svg                           |   3 -
 app/svg/recruit.svg                           |   4 -
 app/svg/remove.svg                            |   3 -
 app/svg/search.svg                            |   5 -
 app/svg/sprite.svg                            | 369 ++++++++++++++++++
 app/svg/team-requirement.svg                  |   4 -
 app/svg/team.svg                              |   4 -
 app/svg/timeline.svg                          |   3 -
 app/svg/trash.svg                             |   3 -
 app/svg/unlock.svg                            |   3 -
 app/svg/unwatch.svg                           |   4 -
 app/svg/upvote.svg                            |  14 -
 app/svg/watch.svg                             |   4 -
 app/themes/high-contrast/custom.scss          |   2 +-
 app/themes/material-design/custom.scss        |   2 +-
 app/themes/taiga/custom.scss                  |   2 +-
 266 files changed, 2513 insertions(+), 1689 deletions(-)
 delete mode 100644 app/modules/navigation-bar/dropdown-organization-list/dropdown-organization-list.jade
 delete mode 100644 app/partials/includes/modules/colors-table.jade
 delete mode 100644 app/partials/includes/modules/comment-activity.jade
 delete mode 100644 app/svg/activity.svg
 delete mode 100644 app/svg/add.svg
 delete mode 100644 app/svg/attachment.svg
 delete mode 100644 app/svg/check.svg
 delete mode 100644 app/svg/client-requirement.svg
 delete mode 100644 app/svg/dashboard.svg
 delete mode 100644 app/svg/discover.svg
 delete mode 100644 app/svg/empty-project.svg
 delete mode 100644 app/svg/eye.svg
 delete mode 100644 app/svg/flag.svg
 delete mode 100644 app/svg/gallery.svg
 delete mode 100644 app/svg/graph.svg
 delete mode 100644 app/svg/help.svg
 delete mode 100644 app/svg/hide.svg
 delete mode 100644 app/svg/iocaine.svg
 delete mode 100644 app/svg/like.svg
 delete mode 100644 app/svg/list.svg
 delete mode 100644 app/svg/location.svg
 delete mode 100644 app/svg/lock.svg
 delete mode 100644 app/svg/organizations.svg
 delete mode 100644 app/svg/project.svg
 delete mode 100644 app/svg/projects.svg
 delete mode 100644 app/svg/promote.svg
 delete mode 100644 app/svg/recruit.svg
 delete mode 100644 app/svg/remove.svg
 delete mode 100644 app/svg/search.svg
 create mode 100644 app/svg/sprite.svg
 delete mode 100644 app/svg/team-requirement.svg
 delete mode 100644 app/svg/team.svg
 delete mode 100644 app/svg/timeline.svg
 delete mode 100644 app/svg/trash.svg
 delete mode 100644 app/svg/unlock.svg
 delete mode 100644 app/svg/unwatch.svg
 delete mode 100644 app/svg/upvote.svg
 delete mode 100644 app/svg/watch.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67620f95..a9ea09e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Features
 - Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).
+- Moved from iconfont to SVG sprite icon system and redesign.
 
 ### Misc
 - Lots of small and not so small bugfixes.
diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index c625f007..2ee6542d 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -53,12 +53,21 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, $loading, lightboxService,
                 <option value="<%- role.id %>"><%- role.name %></option>
                 <% }); %>
             </select>
-            <a class="icon icon-plus add-fieldset" href=""></a>
+            <a class="add-fieldset" href="">
+                <svg class="icon icon-add">
+                    <use xlink:href="#icon-add">
+                </svg>
+            </a>
         </fieldset>
     </div>
     """)
 
     link = ($scope, $el, $attrs) ->
+        createButton = (type) ->
+            html = "<svg class='icon " + type + "'><use xlink:href='#" + type + "'></svg>";
+            console.log html
+            return html
+
         createFieldSet = (required = true)->
             ctx = {roleList: $scope.project.roles, required: required}
             return $compile(template(ctx))($scope)
@@ -88,17 +97,19 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, $loading, lightboxService,
             fieldSet.remove()
 
             lastActionButton = $el.find(".add-member-wrapper fieldset:last > a")
-            if lastActionButton.hasClass("icon-delete delete-fieldset")
-                lastActionButton.removeClass("icon-delete delete-fieldset")
-                                .addClass("icon-plus add-fieldset")
+            if lastActionButton.hasClass("delete-fieldset")
+                lastActionButton.removeClass("delete-fieldset").addClass("add-fieldset")
+                svg = createButton('icon-add')
+                lastActionButton.html(svg)
 
         $el.on "click", ".add-fieldset", (event) ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
             fieldSet = target.closest('.add-member-wrapper')
 
-            target.removeClass("icon-plus add-fieldset")
-                  .addClass("icon-delete delete-fieldset")
+            target.removeClass("add-fieldset").addClass("delete-fieldset")
+            svg = createButton('icon-trash')
+            target.html(svg)
 
             newFieldSet = createFieldSet(false)
             fieldSet.after(newFieldSet)
@@ -106,8 +117,10 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, $loading, lightboxService,
             $scope.$digest() # To compile newFieldSet and translate text
 
             if $el.find(".add-member-wrapper").length == MAX_MEMBERSHIP_FIELDSETS
-                $el.find(".add-member-wrapper fieldset:last > a").removeClass("icon-plus add-fieldset")
-                                             .addClass("icon-delete delete-fieldset")
+                $el.find(".add-member-wrapper fieldset:last > a")
+                    .removeClass("add-fieldset").addClass("delete-fieldset")
+                svg = createButton('icon-trash')
+                $el.find(".add-member-wrapper fieldset:last > a").html(svg)
 
         submit = debounce 2000, (event) =>
             event.preventDefault()
diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 84ff8071..ed683bdd 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -359,7 +359,9 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
     </div>
     <a class="delete" href=""
        title="{{ 'ADMIN.MEMBERSHIP.DELETE_MEMBER' | translate }}">
-        <span class="icon icon-delete"></span>
+        <svg class="icon icon-trash">
+            <use xlink:href="#icon-trash">
+        </svg>
     </a>
     """
 
@@ -370,7 +372,9 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
     </a>
     <a class="delete" href=""
        title="{{ 'ADMIN.MEMBERSHIP.DELETE_MEMBER' | translate }}">
-        <span class="icon icon-delete"></span>
+        <svg class="icon icon-trash">
+            <use xlink:href="#icon-trash">
+        </svg>
     </a>
     """
 
diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index d2689147..1883adc7 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -193,7 +193,7 @@ EditRoleDirective = ($repo, $confirm) ->
 
             toggleView()
 
-        $el.on "click", "a.icon-edit", ->
+        $el.on "click", ".edit-value", ->
             toggleView()
             $el.find("input").focus()
             $el.find("input").val($scope.role.name)
@@ -292,7 +292,9 @@ RolePermissionsDirective = ($rootscope, $repo, $confirm, $compile) ->
                  title="{{ '<%- permission.name %>' | translate }}"></div>
         <% }) %>
     </div>
-    <div class="icon icon-arrow-bottom"></div>
+    <svg class="icon icon-arrow-right">
+        <use xlink:href="#icon-arrow-right">
+    </svg>
     """)
 
     categoryTemplate = _.template("""
@@ -431,6 +433,7 @@ RolePermissionsDirective = ($rootscope, $repo, $confirm, $compile) ->
             $el.on "click", ".resume", (event) ->
                 event.preventDefault()
                 target = angular.element(event.currentTarget)
+                target.toggleClass("open-drawer")
                 target.next().toggleClass("open")
 
             $el.on "change", ".category-item input", (event) ->
diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee
index 99c1ebd0..d26ca64d 100644
--- a/app/coffee/modules/backlog/lightboxes.coffee
+++ b/app/coffee/modules/backlog/lightboxes.coffee
@@ -204,7 +204,7 @@ CreateEditSprint = ($repo, $confirm, $rs, $rootscope, lightboxService, $loading,
 
         $el.on "submit", "form", submit
 
-        $el.on "click", ".delete-sprint .icon-delete", (event) ->
+        $el.on "click", ".delete-sprint", (event) ->
             event.preventDefault()
             remove()
 
diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index d2ea8d2a..ac0191dd 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -563,7 +563,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
 
         currentLoading = @loading()
             .target(target)
-            .removeClasses("icon-edit")
+            .removeClasses("edit-story")
             .timeout(200)
             .start()
 
diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee
index 218da013..2ea49705 100644
--- a/app/coffee/modules/backlog/sprints.coffee
+++ b/app/coffee/modules/backlog/sprints.coffee
@@ -40,7 +40,7 @@ BacklogSprintDirective = ($repo, $rootscope) ->
 
     toggleSprint = ($el) =>
         sprintTable = $el.find(".sprint-table")
-        sprintArrow = $el.find(".icon-arrow-up")
+        sprintArrow = $el.find(".compact-sprint")
 
         sprintArrow.toggleClass('active')
         sprintTable.toggleClass('open')
@@ -55,7 +55,7 @@ BacklogSprintDirective = ($repo, $rootscope) ->
                 toggleSprint($el)
 
         # Event Handlers
-        $el.on "click", ".sprint-name > .icon-arrow-up", (event) ->
+        $el.on "click", ".sprint-name > .compact-sprint", (event) ->
             event.preventDefault()
 
             toggleSprint($el)
diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index 86afc2ab..f8f9f237 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -288,13 +288,11 @@ Capslock = ($translate) ->
     link = ($scope, $el, $attrs) ->
         open = false
 
-        warningIcon = $('<div>')
-            .addClass('icon')
-            .addClass('icon-capslock')
-            .attr('title', $translate.instant('COMMON.CAPSLOCK_WARNING'))
+
+        warningIcon = "<svg class='icon icon-capslock' title='" + $translate.instant('COMMON.CAPSLOCK_WARNING') + "'><use xlink:href='#icon-capslock'></svg>";
 
         hideIcon = () ->
-            warningIcon.fadeOut () ->
+            $('.icon-capslock').fadeOut () ->
                 open = false
 
                 $(this).remove()
diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index dece6008..325c2524 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -321,7 +321,7 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $qqueue, $template
             $model.$modelValue.assigned_to = $currentUserService.getUser().get('id')
             save($currentUserService.getUser().get('id'))
 
-        $el.on "click", ".icon-delete", (event) ->
+        $el.on "click", ".remove-user", (event) ->
             event.preventDefault()
             return if not isEditable()
             title = $translate.instant("COMMON.ASSIGNED_TO.CONFIRM_UNASSIGNED")
@@ -498,11 +498,10 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading, $qqueue, $tem
             else if event.keyCode == 27
                 $scope.$apply () => $model.$modelValue.revert()
 
-                $el.find('div.edit-subject').hide()
-                $el.find('div.view-subject').show()
+                $el.find('.edit-subject').hide()
+                $el.find('.view-subject').show()
 
-        $el.find('div.edit-subject').hide()
-        $el.find('div.view-subject span.edit').hide()
+        $el.find('.edit-subject').hide()
 
         $scope.$watch $attrs.ngModel, (value) ->
             return if not value
diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index be7452cc..c7c93e20 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -59,12 +59,12 @@ class ConfirmService extends taiga.Service
         el = angular.element(lightboxSelector)
 
         # Render content
-        el.find("h2.title").text(title)
-        el.find("span.subtitle").text(subtitle)
-        el.find("span.message").text(message)
+        el.find(".title").text(title)
+        el.find(".subtitle").text(subtitle)
+        el.find(".message").text(message)
 
         # Assign event handlers
-        el.on "click.confirm-dialog", "a.button-green", debounce 2000, (event) =>
+        el.on "click.confirm-dialog", ".button-green", debounce 2000, (event) =>
             event.preventDefault()
             target = angular.element(event.currentTarget)
             currentLoading = @loading()
@@ -77,7 +77,7 @@ class ConfirmService extends taiga.Service
                         @.hide(el)
             }
 
-        el.on "click.confirm-dialog", "a.button-red", (event) =>
+        el.on "click.confirm-dialog", ".button-red", (event) =>
             event.preventDefault()
             defered.reject()
             @.hide(el)
@@ -129,7 +129,7 @@ class ConfirmService extends taiga.Service
                         @.hide(el)
             }
 
-        el.on "click.confirm-dialog", "a.button-red", (event) =>
+        el.on "click.confirm-dialog", ".button-red", (event) =>
             event.preventDefault()
             defered.reject()
             @.hide(el)
@@ -144,15 +144,15 @@ class ConfirmService extends taiga.Service
         el = angular.element(".lightbox-generic-error")
 
         # Render content
-        el.find("h2.title").html(message)
+        el.find(".title").html(message)
 
         # Assign event handlers
-        el.on "click.confirm-dialog", "a.button-green", (event) =>
+        el.on "click.confirm-dialog", ".button-green", (event) =>
             event.preventDefault()
             defered.resolve()
             @.hide(el)
 
-        el.on "click.confirm-dialog", "a.close", (event) =>
+        el.on "click.confirm-dialog", ".close", (event) =>
             event.preventDefault()
             defered.resolve()
             @.hide(el)
@@ -167,16 +167,16 @@ class ConfirmService extends taiga.Service
         el = angular.element(".lightbox-generic-success")
 
         # Render content
-        el.find("h2.title").html(title) if title
-        el.find("p.message").html(message) if message
+        el.find(".title").html(title) if title
+        el.find(".message").html(message) if message
 
         # Assign event handlers
-        el.on "click.confirm-dialog", "a.button-green", (event) =>
+        el.on "click.confirm-dialog", ".button-green", (event) =>
             event.preventDefault()
             defered.resolve()
             @.hide(el)
 
-        el.on "click.confirm-dialog", "a.close", (event) =>
+        el.on "click.confirm-dialog", ".close", (event) =>
             event.preventDefault()
             defered.resolve()
             @.hide(el)
@@ -189,15 +189,15 @@ class ConfirmService extends taiga.Service
         el = angular.element(".lightbox-generic-loading")
 
         # Render content
-        el.find("h2.title").html(title) if title
-        el.find("p.message").html(message) if message
+        el.find(".title").html(title) if title
+        el.find(".message").html(message) if message
 
         return {
             start: => @lightboxService.open(el)
             stop: => @lightboxService.close(el)
             update: (status, title, message, percent) =>
-                el.find("h2.title").html(title) if title
-                el.find("p.message").html(message) if message
+                el.find(".title").html(title) if title
+                el.find(".message").html(message) if message
 
                 if percent
                     el.find(".spin").addClass("hidden")
@@ -251,7 +251,7 @@ class ConfirmService extends taiga.Service
 
             delete @.tsem
 
-        el.on "click", ".icon-delete, .close", (event) =>
+        el.on "click", ".icon-close, .close", (event) =>
             body.find(selector)
                 .removeClass('active')
                 .addClass('inactive')
diff --git a/app/coffee/modules/common/custom-field-values.coffee b/app/coffee/modules/common/custom-field-values.coffee
index 8568cae5..897cfe24 100644
--- a/app/coffee/modules/common/custom-field-values.coffee
+++ b/app/coffee/modules/common/custom-field-values.coffee
@@ -117,15 +117,15 @@ CustomAttributesValuesDirective = ($templates, $storage) ->
             $ctrl.initialize($attrs.type, value.id)
             $ctrl.loadCustomAttributesValues()
 
-        $el.on "click", ".custom-fields-header a", ->
+        $el.on "click", ".custom-fields-header .icon", ->
             hash = collapsedHash($attrs.type)
             collapsed = not($storage.get(hash) or false)
             $storage.set(hash, collapsed)
             if collapsed
-                $el.find(".custom-fields-header a").removeClass("open")
+                $el.find(".custom-fields-header .icon").removeClass("open")
                 $el.find(".custom-fields-body").removeClass("open")
             else
-                $el.find(".custom-fields-header a").addClass("open")
+                $el.find(".custom-fields-header .icon").addClass("open")
                 $el.find(".custom-fields-body").addClass("open")
 
         $scope.$on "$destroy", ->
@@ -235,7 +235,7 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
             render(attributeValue, true)
             setFocusAndSelectOnInputField()
 
-        $el.on "click", "a.icon-edit", (event) ->
+        $el.on "click", ".js-edit-description", (event) ->
             event.preventDefault()
             render(attributeValue, true)
             setFocusAndSelectOnInputField()
@@ -249,7 +249,7 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
 
         $el.on "submit", "form", submit
 
-        $el.on "click", "a.icon-floppy", submit
+        $el.on "click", ".js-save-description", submit
 
         $scope.$on "$destroy", ->
             $el.off()
diff --git a/app/coffee/modules/common/tags.coffee b/app/coffee/modules/common/tags.coffee
index c5ea64e4..271d1e54 100644
--- a/app/coffee/modules/common/tags.coffee
+++ b/app/coffee/modules/common/tags.coffee
@@ -120,10 +120,13 @@ LbTagLineDirective = ($rs, $template, $compile) ->
                     tag.style = "border-left: 5px solid #{tag.color}"
 
             html = $compile(templateTags(ctx))($scope)
-            $el.find("div.tags-container").html(html)
+            $el.find(".tags-container").html(html)
 
-        showSaveButton = -> $el.find(".save").removeClass("hidden")
-        hideSaveButton = -> $el.find(".save").addClass("hidden")
+        showSaveButton = ->
+            $el.find(".save").removeClass("hidden")
+
+        hideSaveButton = ->
+            $el.find(".save").addClass("hidden")
 
         resetInput = ->
             $el.find("input").val("")
@@ -179,7 +182,7 @@ LbTagLineDirective = ($rs, $template, $compile) ->
             event.preventDefault()
             saveInputTag()
 
-        $el.on "click", ".icon-delete", (event) ->
+        $el.on "click", ".remove-tag", (event) ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
 
@@ -348,7 +351,7 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template, $compi
             hideAddTagButton()
             showInput()
 
-        $el.on "click", ".icon-delete", (event) ->
+        $el.on "click", ".remove-tag", (event) ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
 
diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee
index c811b2e7..132e5ab1 100644
--- a/app/coffee/modules/issues/list.coffee
+++ b/app/coffee/modules/issues/list.coffee
@@ -461,14 +461,14 @@ IssuesFiltersDirective = ($q, $log, $location, $rs, $confirm, $loading, $templat
         showFilters = (title, type) ->
             $el.find(".filters-cats").hide()
             $el.find(".filter-list").removeClass("hidden")
-            $el.find("h2.breadcrumb").removeClass("hidden")
-            $el.find("h2 a.subfilter span.title").html(title)
-            $el.find("h2 a.subfilter span.title").prop("data-type", type)
+            $el.find(".breadcrumb").removeClass("hidden")
+            $el.find("h2 .subfilter .title").html(title)
+            $el.find("h2 .subfilter .title").prop("data-type", type)
 
         showCategories = ->
             $el.find(".filters-cats").show()
             $el.find(".filter-list").addClass("hidden")
-            $el.find("h2.breadcrumb").addClass("hidden")
+            $el.find(".breadcrumb").addClass("hidden")
 
         initializeSelectedFilters = (filters) ->
             selectedFilters = []
@@ -502,7 +502,7 @@ IssuesFiltersDirective = ($q, $log, $location, $rs, $confirm, $loading, $templat
             $el.find(".filter-list").html(html)
 
         getFiltersType = () ->
-            return $el.find("h2 a.subfilter span.title").prop('data-type')
+            return $el.find(".subfilter .title").prop('data-type')
 
         reloadIssues = () ->
             currentFiltersType = getFiltersType()
@@ -617,7 +617,7 @@ IssuesFiltersDirective = ($q, $log, $location, $rs, $confirm, $loading, $templat
 
             toggleFilterSelection(type, id)
 
-        $el.on "click", ".filter-list .single-filter .icon-delete", (event) ->
+        $el.on "click", ".filter-list .single-filter .remove-filter", (event) ->
             event.preventDefault()
             event.stopPropagation()
 
@@ -665,7 +665,7 @@ IssuesFiltersDirective = ($q, $log, $location, $rs, $confirm, $loading, $templat
                         currentLoading.finish()
                         $scope.filters.myFilters = filters
 
-                        currentfilterstype = $el.find("h2 a.subfilter span.title").prop('data-type')
+                        currentfilterstype = $el.find("h2 .subfilter .title").prop('data-type')
                         if currentfilterstype == "myFilters"
                             renderFilters($scope.filters.myFilters)
 
diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index dcb17811..700d0873 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -62,7 +62,7 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
                 else if event.keyCode == 27
                     renderView($model.$modelValue)
 
-            $el.on "click", ".icon-floppy", (event) ->
+            $el.on "click", ".save-task", (event) ->
                 saveTask($model.$modelValue).then ->
                     renderView($model.$modelValue)
 
@@ -79,7 +79,7 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
 
             $el.html($compile(templateView({task: task, perms: perms}))($scope))
 
-            $el.on "click", ".icon-edit", ->
+            $el.on "click", ".edit-task", ->
                 renderEdit($model.$modelValue)
                 $el.find('input').focus().select()
 
diff --git a/app/index.jade b/app/index.jade
index 71ac29b6..66d7d234 100644
--- a/app/index.jade
+++ b/app/index.jade
@@ -45,3 +45,4 @@ html(lang="en")
         script(src="/#{v}/js/libs.js")
         script(src="/#{v}/js/templates.js")
         script(src="/#{v}/js/app-loader.js")
+        include svg/sprite.svg
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 86fee941..f3d15c67 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Be careful! You're writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "This value seems to be invalid.",
             "TYPE_EMAIL": "This value should be a valid email.",
@@ -458,9 +458,7 @@
             "RECRUITING_MESSAGE": "Who are you looking for?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Public project",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Private project",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
             "DELETE": "Delete this project",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
diff --git a/app/modules/attachments/attachment-gallery.scss b/app/modules/attachments/attachment-gallery.scss
index 029b29a9..adeb7276 100644
--- a/app/modules/attachments/attachment-gallery.scss
+++ b/app/modules/attachments/attachment-gallery.scss
@@ -13,58 +13,63 @@
                 opacity: 1;
             }
         }
-        .attachment-image {
-            display: inline-block;
-        }
-        img {
-            height: 150px;
-            margin-bottom: .2rem;
-            width: 200px;
-            &:hover {
-                filter: saturate(150%) hue-rotate(60deg);
-                transition: all .3s cubic-bezier(.01, .7, 1, 1);
-            }
-        }
-        &.deprecated {
-            img {
-                opacity: .5;
-            }
-            .attachment-name {
-                color: $gray-light;
-            }
-        }
-        .attachment-data {
-            align-content: center;
-            display: flex;
-            justify-content: space-between;
-        }
         .attachment-name {
             @extend %light;
             @include ellipsis(175px);
             display: inline-block;
         }
-        .icon-delete {
-            color: $red-light;
-            margin-left: auto;
-            opacity: 0;
-            transition: opacity .3s ease-in;
-            transition-delay: .2s;
-            &:hover {
-                color: $red;
-            }
-        }
-        .loading-container {
-            align-items: center;
-            display: flex;
-            height: 150px;
-            justify-content: center;
-            margin: 0 .5rem .5rem 0;
-            width: 200px;
-        }
-        .loading-spinner {
-            margin: 0 auto;
-            max-height: 3rem;
-            max-width: 3rem;
+    }
+    .attachment-image {
+        display: inline-block;
+    }
+    img {
+        height: 150px;
+        margin-bottom: .2rem;
+        width: 200px;
+        &:hover {
+            filter: saturate(150%) hue-rotate(60deg);
+            transition: all .3s cubic-bezier(.01, .7, 1, 1);
         }
     }
+    &.deprecated {
+        img {
+            opacity: .5;
+        }
+        .attachment-name {
+            color: $gray-light;
+        }
+    }
+    .attachment-data {
+        align-content: center;
+        display: flex;
+        justify-content: space-between;
+    }
+    .icon-delete {
+        margin-left: auto;
+        opacity: 0;
+        transition: opacity .2s ease-in;
+        transition-delay: .1s;
+        svg {
+            fill: $red-light;
+        }
+        &:hover {
+            svg {
+                color: $red;
+            }
+
+        }
+    }
+    .loading-container {
+        align-items: center;
+        display: flex;
+        height: 150px;
+        justify-content: center;
+        margin: 0 .5rem .5rem 0;
+        width: 200px;
+    }
+    .loading-spinner {
+        margin: 0 auto;
+        max-height: 3rem;
+        max-width: 3rem;
+    }
 }
diff --git a/app/modules/attachments/attachment-list.scss b/app/modules/attachments/attachment-list.scss
index dc2e21db..df533f2b 100644
--- a/app/modules/attachments/attachment-list.scss
+++ b/app/modules/attachments/attachment-list.scss
@@ -47,34 +47,29 @@
         flex-shrink: 0;
         justify-content: space-around;
         margin-left: auto;
-        .settings,
-        .editable-settings {
-            @extend %large;
-            color: $gray-light;
-            &:hover {
-                color: $primary;
-            }
-        }
         .settings {
             opacity: 0;
         }
         .editable-settings {
             opacity: 1;
         }
-        .icon-delete {
+        svg {
+            fill: $gray-light;
+        }
+        .icon-edit,
+        .icon-save {
             &:hover {
-                color: $red;
+                fill: $primary;
             }
         }
-        .icon-drag-v {
-            cursor: move;
+        .icon-trash,
+        .icon-close {
+            &:hover {
+                fill: $red;
+            }
         }
-    }
-    .icon-delete {
-        @extend %large;
-        color: $gray-light;
-        &:hover {
-            color: $red;
+        .icon-drag {
+            cursor: move;
         }
     }
     .editable-attachment-deprecated {
diff --git a/app/modules/attachments/attachments.scss b/app/modules/attachments/attachments.scss
index 59e2336d..61b9e15f 100644
--- a/app/modules/attachments/attachments.scss
+++ b/app/modules/attachments/attachments.scss
@@ -4,6 +4,7 @@
 
 .attachments-header {
     align-content: center;
+    align-items: center;
     background: $whitish;
     display: flex;
     justify-content: space-between;
@@ -33,9 +34,9 @@
         }
         svg {
             fill: $white;
-            height: 1.25rem;
+            height: 1.2rem;
             margin-bottom: -.2rem;
-            width: 1.25rem;
+            width: 1.2rem;
         }
     }
     button {
@@ -50,7 +51,6 @@
         svg {
             fill: $gray-light;
             height: 1.6rem;
-            margin-bottom: -.2rem;
             width: 1.6rem;
         }
     }
@@ -77,6 +77,7 @@
 
 .single-attachment {
     @extend %small;
+    background: rgba($white, .9);
     &.ui-sortable-helper {
         background: lighten($primary, 60%);
         box-shadow: 1px 1px 10px rgba($black, .1);
@@ -89,12 +90,11 @@
     .attachment-name {
         @extend %bold;
         padding-right: 1rem;
-        .icon {
-            margin-right: .25rem;
-        }
         svg {
-            height: 1.2rem;
-            width: 1.2rem;
+            fill: $gray;
+            height: .9rem;
+            margin-right: .25rem;
+            width: .9rem;
         }
     }
     .attachment-size {
diff --git a/app/modules/components/attachment/attachment-gallery.jade b/app/modules/components/attachment/attachment-gallery.jade
index dbb353b1..b6c560a1 100644
--- a/app/modules/components/attachment/attachment-gallery.jade
+++ b/app/modules/components/attachment/attachment-gallery.jade
@@ -30,8 +30,9 @@
             span {{::vm.attachment.getIn(['file', 'name'])}}
 
         a.icon-delete(
-            ng-if="vm.attachment.get('editable')"
             href=""
             title="{{'COMMON.DELETE' | translate}}"
             ng-click="vm.delete()"
         )
+            svg.icon.icon-trash
+                use(xlink:href="#icon-trash")
diff --git a/app/modules/components/attachment/attachment.jade b/app/modules/components/attachment/attachment.jade
index 32df1083..b0207960 100644
--- a/app/modules/components/attachment/attachment.jade
+++ b/app/modules/components/attachment/attachment.jade
@@ -12,8 +12,8 @@ form.single-attachment(
             target="_blank"
             download="{{::vm.attachment.getIn(['file', 'name'])}}"
         )
-            span.icon
-                include ../../../svg/attachment.svg
+            svg.icon.icon-attachment
+                use(xlink:href="#icon-attachment")
             span {{::vm.attachment.getIn(['file', 'name'])}}
 
     .attachment-comments(ng-if="!vm.attachment.get('editable') && vm.attachment.getIn(['file', 'description'])")
@@ -47,34 +47,44 @@ form.single-attachment(
 
     .attachment-settings(ng-if="vm.attachment.get('editable')")
         div(tg-loading="vm.attachment.get('loading')")
-            a.editable-settings.icon.icon-floppy(
+            a.editable-settings(
                 href=""
                 title="{{'COMMON.SAVE' | translate}}"
                 ng-click="vm.save()"
             )
+                svg.drag.icon.icon-save
+                    use(xlink:href="#icon-save")
 
         div
-            a.editable-settings.icon.icon-delete(
+            a.editable-settings(
                 href=""
                 title="{{'COMMON.CANCEL' | translate}}"
                 ng-click="vm.editMode(false)"
             )
+                svg.drag.icon.icon-close
+                    use(xlink:href="#icon-close")
 
     .attachment-settings(
         ng-if="!vm.attachment.get('editable')"
         tg-check-permission="modify_{{vm.type}}"
     )
-        a.settings.icon.icon-edit(
+        a.settings(
             href=""
             title="{{'COMMON.EDIT' | translate}}"
             ng-click="vm.editMode(true)"
         )
-        a.settings.icon.icon-delete(
+            svg.drag.icon.icon-edit
+                use(xlink:href="#icon-edit")
+        a.settings(
             href=""
             title="{{'COMMON.DELETE' | translate}}"
             ng-click="vm.delete()"
         )
-        a.settings.icon.icon-drag-v(
+            svg.drag.icon.icon-trash
+                use(xlink:href="#icon-trash")
+        a.settings(
             href=""
             title="{{'COMMON.DRAG' | translate}}"
         )
+            svg.drag.icon.icon-drag
+                use(xlink:href="#icon-drag")
diff --git a/app/modules/components/attachments-full/attachments-full.jade b/app/modules/components/attachments-full/attachments-full.jade
index 9968d9fa..98a9710d 100644
--- a/app/modules/components/attachments-full/attachments-full.jade
+++ b/app/modules/components/attachments-full/attachments-full.jade
@@ -8,21 +8,24 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
                 ng-click="vm.setMode('gallery')"
                 title="{{ 'ATTACHMENT.GALLERY_VIEW_MODE' | translate }}"
             )
-                include ../../../svg/gallery.svg
+                svg.icon.icon-gallery
+                    use(xlink:href="#icon-gallery")
             button.view-list(
                 ng-class="{'is-active': vm.mode == 'list'}"
                 ng-if="vm.attachments.size"
                 ng-click="vm.setMode('list')"
                 title="{{ 'ATTACHMENT.LIST_VIEW_MODE' | translate }}"
             )
-                include ../../../svg/list.svg
+                svg.icon.icon-list
+                    use(xlink:href="#icon-list")
             .add-attach(
                 tg-check-permission="modify_{{vm.type}}"
                 title!="{{'ATTACHMENT.ADD' | translate}}"
             )
 
                 label.add-attachment-button(for="add-attach")
-                    include ../../../svg/add.svg
+                    svg.icon.icon-add
+                        use(xlink:href="#icon-add")
 
                 input(
                     id="add-attach",
@@ -49,12 +52,11 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
 
           .single-attachment(ng-repeat="file in vm.uploadingAttachments()")
               .attachment-name
-                  span.icon
-                      include ../../../svg/attachment.svg
+                  svg.icon.icon-attachment
+                      use(xlink:href="#icon-attachment")
                   span {{file.name}}
               .attachment-size
                   span {{file.size | sizeFormat}}
-
               .attachment-comments
                   span {{file.progressMessage}}
                   .percentage(ng-style="{'width': file.progressPercent}")
diff --git a/app/modules/components/attachments-simple/attachments-simple.jade b/app/modules/components/attachments-simple/attachments-simple.jade
index 461f5ba8..9b4cdcc7 100644
--- a/app/modules/components/attachments-simple/attachments-simple.jade
+++ b/app/modules/components/attachments-simple/attachments-simple.jade
@@ -5,7 +5,8 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
         h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")]
         .add-attach(title!="{{'ATTACHMENT.ADD' | translate}}")
             label.add-attachment-button(for="add-attach")
-                include ../../../svg/add.svg
+                svg.icon.icon-add
+                    use(xlink:href="#icon-add")
             input(
                 id="add-attach"
                 type="file"
@@ -18,8 +19,8 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
     .attachment-body.attachment-list
         .single-attachment(tg-repeat="attachment in vm.attachments track by $index")
             .attachment-name
-                span.icon
-                    include ../../../svg/attachment.svg
+                svg.icon.icon-attachment
+                    use(xlink:href="#icon-attachment")
                 span {{attachment.get('name')}}
             .attachment-size
                 span {{attachment.get('size') | sizeFormat}}
@@ -30,4 +31,5 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files)")
                     title="{{'COMMON.DELETE' | translate}}"
                     ng-click="vm.deleteAttachment(attachment)"
                 )
-                    include ../../../svg/remove.svg
+                    svg.icon.icon-trash
+                        use(xlink:href="#icon-trash")
diff --git a/app/modules/components/attachments-sortable/attachments-sortable.directive.coffee b/app/modules/components/attachments-sortable/attachments-sortable.directive.coffee
index c220e9b2..17f62ae6 100644
--- a/app/modules/components/attachments-sortable/attachments-sortable.directive.coffee
+++ b/app/modules/components/attachments-sortable/attachments-sortable.directive.coffee
@@ -23,7 +23,7 @@ AttachmentSortableDirective = ($parse) ->
 
         el.sortable({
             items: "div[tg-bind-scope]"
-            handle: "a.settings.icon.icon-drag-v"
+            handle: ".settings .icon"
             containment: ".attachments"
             dropOnEmpty: true
             helper: 'clone'
diff --git a/app/modules/components/live-announcement/live-announcement.jade b/app/modules/components/live-announcement/live-announcement.jade
index 25df0db7..1c2a4225 100644
--- a/app/modules/components/live-announcement/live-announcement.jade
+++ b/app/modules/components/live-announcement/live-announcement.jade
@@ -9,4 +9,5 @@
               href=""
               title="{{ COMMON.CLOSE | translate }}"
             )
-                include ../../../svg/remove.svg
+                svg.icon.icon-close
+                    use(xlink:href="#icon-close")
diff --git a/app/modules/components/project-menu/project-menu.jade b/app/modules/components/project-menu/project-menu.jade
index e411f98a..acde56ac 100644
--- a/app/modules/components/project-menu/project-menu.jade
+++ b/app/modules/components/project-menu/project-menu.jade
@@ -12,7 +12,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.SEARCH' | translate}}"
                     tabindex="1"
                  )
-                    span.icon.icon-search
+                     svg.icon.icon-search
+                         use(xlink:href="#icon-search")
                     span.helper(translate="PROJECT.SECTION.SEARCH")
 
              li(id="nav-timeline")
@@ -22,7 +23,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.TIMELINE' | translate}}"
                     tabindex="2"
                  )
-                    include ../../../svg/timeline.svg
+                    svg.icon.icon-timeline
+                        use(xlink:href="#icon-timeline")
                     span.helper(translate="PROJECT.SECTION.TIMELINE")
 
             li(id="nav-backlog", ng-if="vm.menu.get('backlog')")
@@ -32,7 +34,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.BACKLOG' | translate}}"
                     tabindex="2"
                 )
-                    span.icon.icon-scrum
+                    svg.icon.icon-scrum
+                        use(xlink:href="#icon-scrum")
                     span.helper(translate="PROJECT.SECTION.BACKLOG")
 
             li(id="nav-kanban", ng-if="vm.menu.get('kanban')")
@@ -42,7 +45,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.KANBAN' | translate}}"
                     tabindex="3"
                 )
-                    span.icon.icon-kanban
+                    svg.icon.icon-kanban
+                        use(xlink:href="#icon-kanban")
                     span.helper(translate="PROJECT.SECTION.KANBAN")
 
             li(id="nav-issues", ng-if="vm.menu.get('issues')")
@@ -52,7 +56,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.ISSUES' | translate}}"
                     tabindex="4"
                 )
-                    span.icon.icon-issues
+                    svg.icon.icon-issues
+                        use(xlink:href="#icon-issues")
                     span.helper(translate="PROJECT.SECTION.ISSUES")
 
             li(id="nav-wiki", ng-if="vm.menu.get('wiki')")
@@ -62,7 +67,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.WIKI' | translate}}"
                     tabindex="5"
                 )
-                    span.icon.icon-wiki
+                    svg.icon.icon-wiki
+                        use(xlink:href="#icon-wiki")
                     span.helper(translate="PROJECT.SECTION.WIKI")
 
             li(id="nav-team")
@@ -72,7 +78,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.TEAM' | translate}}"
                     tabindex="6"
                 )
-                    span(class="icon icon-team")
+                    svg.icon.icon-team
+                        use(xlink:href="#icon-team")
                     span.helper(translate="PROJECT.SECTION.TEAM")
 
             li(id="nav-video", ng-if="vm.project.get('videoconferenceUrl')")
@@ -82,7 +89,8 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.MEETUP' | translate}}"
                     tabindex="7"
                 )
-                    span.icon.icon-video
+                    svg.icon.icon-bubble
+                        use(xlink:href="#icon-bubble")
                     span.helper(translate="PROJECT.SECTION.MEETUP")
 
             li(id="nav-admin", ng-if="vm.project.get('i_am_owner')")
@@ -92,5 +100,6 @@ nav.menu(
                     aria-label="{{'PROJECT.SECTION.ADMIN' | translate}}"
                     tabindex="8"
                 )
-                    span.icon.icon-settings
+                    svg.icon.icon-settings
+                        use(xlink:href="#icon-settings")
                     span.helper(translate="PROJECT.SECTION.ADMIN")
diff --git a/app/modules/components/vote-button/vote-button.jade b/app/modules/components/vote-button/vote-button.jade
index 24d63b04..f0b07a4c 100644
--- a/app/modules/components/vote-button/vote-button.jade
+++ b/app/modules/components/vote-button/vote-button.jade
@@ -9,7 +9,8 @@ a.vote-inner(
     ng-mouseleave="vm.showTextWhenMouseIsLeave()"
 )
     span.track-icon
-        include ../../../svg/upvote.svg
+        svg.icon.icon-upvote
+            use(xlink:href="#icon-upvote")
     span.track-button-counter(
         title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.total_voters||0}:'messageformat' }}",
         tg-loading="vm.loading"
@@ -18,7 +19,8 @@ a.vote-inner(
 //- Anonymous user button
 span.vote-inner(ng-if="::!vm.user")
     span.track-icon
-        include ../../../svg/upvote.svg
+        svg.icon.icon-upvote
+            use(xlink:href="#icon-upvote")
     span.track-button-counter(
         title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.total_voters||0}:'messageformat' }}"
     ) {{ ::vm.item.total_voters }}
diff --git a/app/modules/components/watch-button/watch-button-ticket.jade b/app/modules/components/watch-button/watch-button-ticket.jade
index e54d36fd..661be69b 100644
--- a/app/modules/components/watch-button/watch-button-ticket.jade
+++ b/app/modules/components/watch-button/watch-button-ticket.jade
@@ -13,20 +13,18 @@ div.ticket-watch-inner
         ng-mouseover="vm.showTextWhenMouseIsOver()"
         ng-mouseleave="vm.showTextWhenMouseIsLeave()"
     )
-        span.track-icon
-            include ../../../svg/watch.svg
-        span(
-            ng-if="!vm.item.is_watcher",
-            translate="COMMON.WATCH_BUTTON.WATCH"
-        )
-        span(
-            ng-if="vm.item.is_watcher && !vm.isMouseOver",
-            translate="COMMON.WATCH_BUTTON.WATCHING"
-        )
-        span(
-            ng-if="vm.item.is_watcher && vm.isMouseOver",
-            translate="COMMON.WATCH_BUTTON.UNWATCH"
-        )
+        span(ng-if="!vm.item.is_watcher")
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
+            | {{'COMMON.WATCH_BUTTON.WATCH' | translate}}
+        span(ng-if="vm.item.is_watcher && !vm.isMouseOver",)
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
+            | {{'COMMON.WATCH_BUTTON.WATCHING' | translate}}
+        span(ng-if="vm.item.is_watcher && vm.isMouseOver")
+            svg.icon.icon-unwatch
+                use(xlink:href="#icon-unwatch")
+            | {{'COMMON.WATCH_BUTTON.UNWATCH' | translate}}
 
     a.add-watcher(
         href=""
diff --git a/app/modules/components/watch-button/watch-button.jade b/app/modules/components/watch-button/watch-button.jade
index 2d25bbde..842f0d60 100644
--- a/app/modules/components/watch-button/watch-button.jade
+++ b/app/modules/components/watch-button/watch-button.jade
@@ -2,8 +2,7 @@ mixin counter
     span.track-button-counter(
         title="{{ 'COMMON.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.watchers.length||0}:'messageformat' }}",
         tg-loading="vm.loading"
-    )
-        | {{ vm.item.watchers.length }}
+    ) {{ vm.item.watchers.length }}
 
 
 //- Registered user button
@@ -17,8 +16,8 @@ a.track-button.watch-button.watch-container(
     ng-mouseleave="vm.showTextWhenMouseIsLeave()"
 )
     span.track-inner
-        span.track-icon
-            include ../../../svg/watch.svg
+        svg.icon.icon-watch
+            use(xlink:href="#icon-watch")
         span(
             ng-if="!vm.item.is_watcher",
             translate="COMMON.WATCH_BUTTON.WATCH"
@@ -39,6 +38,7 @@ span.track-button.watch-button.watch-container(
 )
     span.track-inner
         span.track-icon
-            include ../../../svg/watch.svg
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
         span(translate="COMMON.WATCH_BUTTON.WATCHERS")
     +counter
diff --git a/app/modules/discover/components/discover-home-order-by/discover-home-order-by.jade b/app/modules/discover/components/discover-home-order-by/discover-home-order-by.jade
index fbaaa04c..9379c7d0 100644
--- a/app/modules/discover/components/discover-home-order-by/discover-home-order-by.jade
+++ b/app/modules/discover/components/discover-home-order-by/discover-home-order-by.jade
@@ -3,7 +3,8 @@
         href="#"
         ng-click="vm.open()"
     ) {{vm.currentText()}}
-        span.icon-arrow-bottom
+        svg.icon.icon-arrow-down
+            use(xlink:href="#icon-arrow-down")
 
     ul.filter-list(ng-if="vm.is_open")
         li(ng-click="vm.orderBy('week')") {{ 'DISCOVER.FILTERS.WEEK' | translate }}
diff --git a/app/modules/discover/components/discover-search-bar/discover-search-bar.jade b/app/modules/discover/components/discover-search-bar/discover-search-bar.jade
index 201c6bca..436c92af 100644
--- a/app/modules/discover/components/discover-search-bar/discover-search-bar.jade
+++ b/app/modules/discover/components/discover-search-bar/discover-search-bar.jade
@@ -18,12 +18,12 @@ div.discover-header
                     placeholder="{{ 'DISCOVER.SEARCH.INPUT_PLACEHOLDER' | translate }}"
                     ng-model="vm.q"
                 )
-                a.search-button(
+                svg.search-button.icon.icon-search(
                     ng-click="vm.submitFilter()"
                     href="#"
                     title="{{ 'DISCOVER.SEARCH.ACTION_TITLE' | translate }}"
                 )
-                    include ../../../../svg/search.svg
+                    use(xlink:href="#icon-search")
 
             fieldset.searchbox-filters(ng-if="vm.filter")
                 input(
diff --git a/app/modules/discover/components/discover-search-bar/discover-search-bar.scss b/app/modules/discover/components/discover-search-bar/discover-search-bar.scss
index a45705b2..888a06b8 100644
--- a/app/modules/discover/components/discover-search-bar/discover-search-bar.scss
+++ b/app/modules/discover/components/discover-search-bar/discover-search-bar.scss
@@ -36,19 +36,15 @@
         }
     }
     .search-button {
+        @include svg-size(1.5rem);
+        fill: $gray-light;
         position: absolute;
         right: 1rem;
         top: 1rem;
+        transition: fill .2s;
         &:hover {
-            svg {
-                fill: $primary;
-            }
+            cursor: pointer;
+            fill: $primary;
         }
     }
-    svg {
-        fill: $gray-light;
-        height: 1.5rem;
-        transition: all .2;
-        width: 1.5rem;
-    }
 }
diff --git a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.jade b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.jade
index b480a619..42c854fb 100644
--- a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.jade
+++ b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.jade
@@ -1,7 +1,8 @@
 .discover-results-header
     .discover-results-header-inner
         .title
-            include ../../../../svg/search.svg
+            svg.icon.icon-search
+                use(xlink:href="#icon-search")
             h2 {{ 'DISCOVER.SEARCH.RESULTS' | translate }}
 
         .filter-discover-search(ng-mouseleave="vm.toggleClose()")
@@ -10,14 +11,16 @@
                 ng-click="vm.openLike()"
                 ng-class="{active: vm.like_is_open}"
             )
-                include ../../../../svg/like.svg
+                svg.icon.icon-like
+                    use(xlink:href="#icon-like")
                 span {{ 'DISCOVER.MOST_LIKED' | translate }}
             a.discover-search-filter(
                 href="#"
                 ng-click="vm.openActivity()"
                 ng-class="{active: vm.activity_is_open}"
             )
-                include ../../../../svg/activity.svg
+                svg.icon.icon-activity
+                    use(xlink:href="#icon-activity")
                 span {{ 'DISCOVER.MOST_ACTIVE' | translate }}
 
     .discover-search-subfilter.most-liked-subfilter(ng-if="vm.like_is_open")
diff --git a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss
index d3112c54..6f265a9a 100644
--- a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss
+++ b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss
@@ -5,8 +5,9 @@
         justify-content: space-between;
     }
     svg {
-        @include svg-size(1.1rem);
+        @include svg-size(1.2rem);
         fill: $gray-light;
+        margin-right: .25rem;
     }
     .title {
         @extend %bold;
@@ -23,8 +24,14 @@
         margin-right: 1rem;
         &.active {
             color: $primary;
+            svg {
+                fill: $primary;
+            }
         }
     }
+    svg {
+        @include svg-size(.8rem);
+    }
 }
 
 .discover-search-subfilter {
diff --git a/app/modules/discover/components/featured-projects/featured-projects.jade b/app/modules/discover/components/featured-projects/featured-projects.jade
index 53c3514b..783c71e3 100644
--- a/app/modules/discover/components/featured-projects/featured-projects.jade
+++ b/app/modules/discover/components/featured-projects/featured-projects.jade
@@ -26,28 +26,31 @@
                             tg-nav="project:project=project.get('slug')"
                             title="{{::project.get('name')}}"
                         ) {{::project.get('name')}}
-                        span.look-for-people(
+                        svg.look-for-people.icon.icon-recruit(
                             ng-if="project.get('is_looking_for_people')"
-                            title="{{ ::project.get('looking_for_people_note') }}"
                         )
-                            include ../../../../svg/recruit.svg
+                            use(xlink:href="#icon-recruit")
+                                title="{{ ::project.get('looking_for_people_note') }}"
                 p.project-card-description {{ ::project.get('description') | limitTo:100 }}{{ ::project.get('description').length < 100 ? '' : '...'}}
                 .project-card-statistics
                     span.statistic(
                         ng-class="{'active': project.get('is_fan')}"
                         title="{{ 'PROJECT.FANS_COUNTER_TITLE'|translate:{total:project.get('total_fans')||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/like.svg
+                        svg.icon.icon-like
+                            use(xlink:href="#icon-like")
                         span {{::project.get('total_fans')}}
                     span.statistic(
                         ng-class="{'active': project.get('is_watcher')}"
                         title="{{ 'PROJECT.WATCHERS_COUNTER_TITLE'|translate:{total:project.get('total_watchers')||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/eye.svg
+                        svg.icon.icon-watch
+                            use(xlink:href="#icon-watch")
                         span {{::project.get('total_watchers')}}
                     span.statistic(
                         ng-class="{'active': project.get('i_am_member')}"
                         title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/team.svg
+                        svg.icon.icon-team
+                            use(xlink:href="#icon-team")
                         span.statistics-num {{ ::project.get('members').size }}
diff --git a/app/modules/discover/components/highlighted/highlighted.jade b/app/modules/discover/components/highlighted/highlighted.jade
index 96031ebf..f001c6a6 100644
--- a/app/modules/discover/components/highlighted/highlighted.jade
+++ b/app/modules/discover/components/highlighted/highlighted.jade
@@ -24,29 +24,30 @@
                         tg-nav="project:project=project.get('slug')"
                         title="{{::project.get('name')}}"
                     ) {{::project.get('name')}}
-                    span.look-for-people(
-                        ng-if="project.get('is_looking_for_people')"
-                        title="{{ ::project.get('looking_for_people_note') }}"
-                    )
-                        include ../../../../svg/recruit.svg
+                    svg.look-for-people.icon.icon-recruit(ng-if="project.get('is_looking_for_people')")
+                        use(xlink:href="#icon-recruit")
+                            title="{{ ::project.get('looking_for_people_note') }}"
                 .project-statistics
                     span.statistic(
                         ng-class="{'active': project.get('is_fan')}"
                         title="{{ 'PROJECT.FANS_COUNTER_TITLE'|translate:{total:project.get('total_fans')||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/like.svg
+                        svg.icon.icon-like
+                            use(xlink:href="#icon-like")
                         span {{::project.get('total_fans')}}
                     span.statistic(
                         ng-class="{'active': project.get('is_watcher')}"
                         title="{{ 'PROJECT.WATCHERS_COUNTER_TITLE'|translate:{total:project.get('total_watchers')||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/eye.svg
+                        svg.icon.icon-watch
+                            use(xlink:href="#icon-watch")
                         span {{::project.get('total_watchers')}}
                     span.statistic(
                         ng-class="{'active': project.get('i_am_member')}"
                         title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                     )
-                        include ../../../../svg/team.svg
+                        svg.icon.icon-team
+                            use(xlink:href="#icon-team")
                         span.statistics-num {{ ::project.get('members').size }}
             p.project-description {{ ::project.get('description') | limitTo:150 }}{{ ::project.get('description').length < 150 ? '' : '...'}}
 
diff --git a/app/modules/discover/components/highlighted/highlighted.scss b/app/modules/discover/components/highlighted/highlighted.scss
index fb2091b9..8dced746 100644
--- a/app/modules/discover/components/highlighted/highlighted.scss
+++ b/app/modules/discover/components/highlighted/highlighted.scss
@@ -34,14 +34,19 @@
         justify-content: space-between;
         margin-bottom: 1rem;
         svg {
-            @include svg-size(1.5rem);
+            @include svg-size(.8rem);
             fill: $gray-light;
-            margin: .5rem;
+            margin-left: .5rem;
         }
     }
     .title-wrapper {
         align-items: center;
         display: flex;
+        svg {
+            @include svg-size(1.25rem);
+            fill: $gray-light;
+            margin-right: .5rem;
+        }
     }
     .title {
         @extend %bold;
@@ -97,6 +102,11 @@
             position: relative;
             top: .2rem;
         }
+        &:hover {
+            svg {
+                fill: currentColor;
+            }
+        }
     }
     .filter-list {
         background: $black;
@@ -163,11 +173,9 @@
         }
     }
     .look-for-people {
-        svg {
-            @include svg-size();
-            fill: $gray-light;
-            margin-left: .5rem;
-        }
+        @include svg-size();
+        fill: $gray-light;
+        margin-left: .5rem;
     }
     .project-description {
         @extend %small;
@@ -179,8 +187,9 @@
         flex-basis: 140px;
         justify-content: flex-end;
         svg {
-            @include svg-size(.8rem);
+            @include svg-size(.75rem);
             fill: $gray-light;
+            margin-right: .25rem;
         }
         .svg-eye-closed {
             display: none;
diff --git a/app/modules/discover/components/most-active/most-active.jade b/app/modules/discover/components/most-active/most-active.jade
index 37e58cdf..e90666af 100644
--- a/app/modules/discover/components/most-active/most-active.jade
+++ b/app/modules/discover/components/most-active/most-active.jade
@@ -1,7 +1,8 @@
 .most-active(ng-if="vm.highlighted.size")
     .header
         .title-wrapper
-            include ../../../../svg/activity.svg
+            svg.icon.icon-activity
+                use(xlink:href="#icon-activity")
             h1.title {{ 'DISCOVER.MOST_ACTIVE' | translate }}
         tg-discover-home-order-by(on-change="vm.orderBy(orderBy)", order-by="vm.currentOrderBy")
     
@@ -14,5 +15,6 @@
 .empty-highlighted-project(
     ng-if="!vm.highlighted.size"
 )
-    include ../../../../svg/activity.svg
+    svg.icon.icon-activity
+        use(xlink:href="#icon-activity")
     span {{ 'DISCOVER.MOST_ACTIVE_EMPTY' | translate }}
diff --git a/app/modules/discover/components/most-liked/most-liked.jade b/app/modules/discover/components/most-liked/most-liked.jade
index e3967aa0..031f35c3 100644
--- a/app/modules/discover/components/most-liked/most-liked.jade
+++ b/app/modules/discover/components/most-liked/most-liked.jade
@@ -1,7 +1,8 @@
 .most-liked(ng-if="vm.highlighted.size")
     .header
         .title-wrapper
-            include ../../../../svg/like.svg
+            svg.icon.icon-like
+                use(xlink:href="#icon-like")
             h1.title {{ 'DISCOVER.MOST_LIKED' | translate }}
         tg-discover-home-order-by(on-change="vm.orderBy(orderBy)", order-by="vm.currentOrderBy")
     tg-highlighted(
@@ -13,5 +14,6 @@
 .empty-highlighted-project(
     ng-if="!vm.highlighted.size"
 )
-    include ../../../../svg/like.svg
+    svg.icon.icon-like
+        use(xlink:href="#icon-like")
     span {{ 'DISCOVER.MOST_LIKED_EMPTY' | translate }}
diff --git a/app/modules/discover/discover-search/discover-search.jade b/app/modules/discover/discover-search/discover-search.jade
index 937e45fa..1fecc64f 100644
--- a/app/modules/discover/discover-search/discover-search.jade
+++ b/app/modules/discover/discover-search/discover-search.jade
@@ -43,11 +43,9 @@ div(tg-discover-search)
                                     tg-nav="project:project=project.get('slug')"
                                     title="{{ ::project.get('name') }}"
                                 ) {{project.get('name')}}
-                                span.look-for-people(
-                                    ng-if="project.get('is_looking_for_people')"
-                                    title="{{ ::project.get('looking_for_people_note') }}"
-                                )
-                                    include ../../../svg/recruit.svg
+                                svg.look-for-people.icon.icon-recruit(ng-if="project.get('is_looking_for_people')")
+                                    use(xlink:href="#icon-recruit")
+                                        title="{{ ::project.get('looking_for_people_note') }}"
                             p {{ ::project.get('description') | limitTo:300 }}
                                 span(ng-if="::project.get('description').length > 300") ...
                     .list-itemtype-project-right.project-statistics
@@ -55,19 +53,22 @@ div(tg-discover-search)
                             ng-class="{'active': project.get('is_fan')}"
                             title="{{ 'PROJECT.FANS_COUNTER_TITLE'|translate:{total:project.get('total_fans')||0}:'messageformat' }}"
                         )
-                            include ../../../svg/like.svg
+                            svg.icon.icon-like
+                                use(xlink:href="#icon-like")
                             span {{::project.get('total_fans')}}
                         span.statistic(
                             ng-class="{'active': project.get('is_watcher')}"
                             title="{{ 'PROJECT.WATCHERS_COUNTER_TITLE'|translate:{total:project.get('total_watchers')||0}:'messageformat' }}"
                         )
-                            include ../../../svg/eye.svg
+                            svg.icon.icon-watch
+                                use(xlink:href="#icon-watch")
                             span {{::project.get('total_watchers')}}
                         span.statistic(
                             ng-class="{'active': project.get('i_am_member')}"
                             title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                         )
-                            include ../../../svg/team.svg
+                            svg.icon.icon-team
+                                use(xlink:href="#icon-team")
                             span.statistics-num {{ ::project.get('members').size }}
 
             a.button-green.more-results(
diff --git a/app/modules/discover/discover-search/discover-search.scss b/app/modules/discover/discover-search/discover-search.scss
index 9cc13527..b97b58e8 100644
--- a/app/modules/discover/discover-search/discover-search.scss
+++ b/app/modules/discover/discover-search/discover-search.scss
@@ -4,7 +4,6 @@
             margin: 0 8rem;
             position: relative;
         }
-
         .search-button {
             left: 1rem;
             right: auto;
@@ -73,19 +72,17 @@
         vertical-align: middle;
     }
     .look-for-people {
+        fill: $gray-light;
         margin-left: .5rem;
-        svg {
-            @include svg-size(1rem);
-            fill: $gray-light;
-        }
     }
     .project-statistics {
         display: flex;
         flex-basis: 300px;
         justify-content: flex-end;
         svg {
-            @include svg-size(.8rem);
+            @include svg-size(.7rem);
             fill: $gray-light;
+            margin-right: .2rem;
         }
         .svg-eye-closed {
             display: none;
diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index a66a41c2..3b367f1e 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -24,11 +24,9 @@ section.home-project-list(ng-if="vm.projects.size")
                         tg-nav="project:project=project.get('slug')"
                         title="{{::project.get('name')}}"
                     ) {{::project.get('name')}}
-                    span.look-for-people(
-                        ng-if="project.get('is_looking_for_people')"
-                        title="{{ ::project.get('looking_for_people_note') }}"
-                    )
-                        include ../../../svg/recruit.svg
+                    svg.look-for-people.icon.icon-recruit(ng-if="project.get('is_looking_for_people')")
+                        use(xlink:href="#icon-recruit")
+                            title="{{ ::project.get('looking_for_people_note') }}"
             p.project-card-description {{::project.get('description')| limitTo:100 }}
                  span(ng-if="::project.get('description').length > 100") ...
             .project-card-statistics
@@ -36,25 +34,29 @@ section.home-project-list(ng-if="vm.projects.size")
                     ng-class="{'active': project.get('is_fan')}"
                     title="{{ 'PROJECT.FANS_COUNTER_TITLE'|translate:{total:project.get('total_fans')||0}:'messageformat' }}"
                 )
-                    include ../../../svg/like.svg
+                    svg.icon.icon-like
+                        use(xlink:href="#icon-like")
                     span {{::project.get('total_fans')}}
                 span.statistic(
                     ng-class="{'active': project.get('is_watcher')}"
                     title="{{ 'PROJECT.WATCHERS_COUNTER_TITLE'|translate:{total:project.get('total_watchers')||0}:'messageformat' }}"
                 )
-                    include ../../../svg/eye.svg
+                    svg.icon.icon-watch
+                        use(xlink:href="#icon-watch")
                     span {{::project.get('total_watchers')}}
                 span.statistic(
                     ng-class="{'active': project.get('i_am_member')}"
                     title="{{ 'PROJECT.MEMBERS_COUNTER_TITLE'|translate:{total:project.get('members').size||0}:'messageformat' }}"
                 )
-                    include ../../../svg/team.svg
+                    svg.icon.icon-team
+                        use(xlink:href="#icon-team")
                     span.statistics-num {{ ::project.get('members').size }}
                 span.statistic(
                     ng-if="::project.get('is_private')"
                     title="{{ 'PROJECT.PRIVATE' | translate }}"
                 )
-                    include ../../../svg/lock.svg
+                    svg.icon.icon-lock
+                        use(xlink:href="#icon-lock")
 
     a.see-more-projects-btn.button-gray(
         href="#",
@@ -65,7 +67,8 @@ section.home-project-list(ng-if="vm.projects.size")
     )
 
 section.projects-empty(ng-if="vm.projects != undefined && vm.projects.size === 0")
-    include ../../../svg/empty-project.svg
+    svg.icon.icon-project
+        use(xlink:href="#icon-project")
     p(translate="HOME.EMPTY_PROJECT_LIST")
     a.create-project-button.button-green(href="#", ng-click="vm.newProject()",
                                       title="{{'PROJECT.NAVIGATION.TITLE_CREATE_PROJECT' | translate}}",
diff --git a/app/modules/home/projects/home-project-list.scss b/app/modules/home/projects/home-project-list.scss
index c73826b0..503b1155 100644
--- a/app/modules/home/projects/home-project-list.scss
+++ b/app/modules/home/projects/home-project-list.scss
@@ -14,13 +14,11 @@
 .projects-empty {
     text-align: center;
     svg {
+        fill: $whitish;
         height: 100px;
         margin: 1rem auto;
         text-align: center;
         width: 100%;
-        path {
-            fill: $whitish;
-        }
     }
     p {
         @extend %small;
diff --git a/app/modules/navigation-bar/dropdown-organization-list/dropdown-organization-list.jade b/app/modules/navigation-bar/dropdown-organization-list/dropdown-organization-list.jade
deleted file mode 100644
index e0b23904..00000000
--- a/app/modules/navigation-bar/dropdown-organization-list/dropdown-organization-list.jade
+++ /dev/null
@@ -1,10 +0,0 @@
-#TODO: fill correctly when implemented
-a(href="#", title="Organizations")
-    include ../../../svg/organizations.svg
-
-div.navbar-dropdown.dropdown-organization-list
-    ul
-        - for (var x = 0; x < 4; x++)
-            li
-                a(href="#", title="{{ project.title }}") Organization 1
-    a.create-organization-btn.button-green(href="#", title="Create Organization") Create Organization
diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
index 13b7097a..50bc0a4d 100644
--- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
+++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
@@ -1,5 +1,6 @@
 a(href="", title="Projects", tg-nav="projects")
-    include ../../../svg/projects.svg
+    svg.icon.icon-project
+        use(xlink:href="#icon-project")
 
 div.navbar-dropdown.dropdown-project-list
     ul
@@ -19,7 +20,11 @@ div.navbar-dropdown.dropdown-project-list
             title="{{'PROJECT.NAVIGATION.ACTION_CREATE_PROJECT' | translate}}",
             translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT")
 
-        span(tg-import-project-button)
-            a.button-blackish.import-project-button(href="", title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}")
-                span.icon.icon-upload
+        a.button-blackish.import-project-button(
+            href=""
+            title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}"
+            tg-import-project-button
+        )
+            svg.icon.icon-upload
+                use(xlink:href="#icon-upload")
             input.import-file.hidden(type="file")
diff --git a/app/modules/navigation-bar/navigation-bar.jade b/app/modules/navigation-bar/navigation-bar.jade
index 83f49a36..2c6a4a81 100644
--- a/app/modules/navigation-bar/navigation-bar.jade
+++ b/app/modules/navigation-bar/navigation-bar.jade
@@ -30,14 +30,16 @@ nav.navbar(ng-if="vm.isEnabledHeader")
           ng-class="{active: vm.active}",
           title="{{'PROJECT.NAVIGATION.DASHBOARD_TITLE' | translate}}")
 
-            include ../../svg/dashboard.svg
+            svg.icon.icon-dashboard
+                use(xlink:href="#icon-dashboard")
 
         a(
             href="#",
             tg-nav="discover",
             title="{{'PROJECT.NAVIGATION.DISCOVER_TITLE' | translate}}",
         )
-            include ../../svg/discover.svg
+            svg.icon.icon-discover
+                use(xlink:href="#icon-discover")
 
         div.topnav-dropdown-wrapper(ng-show="vm.projects.size", tg-dropdown-project-list)
         //- div.topnav-dropdown-wrapper(tg-dropdown-organization-list)
diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss
index 440784c0..8106882f 100644
--- a/app/modules/navigation-bar/navigation-bar.scss
+++ b/app/modules/navigation-bar/navigation-bar.scss
@@ -52,13 +52,14 @@ $dropdown-width: 350px;
         color: $white;
         display: inline-block;
         transition: all .2s linear;
-        svg path {
+        svg {
             fill: darken($primary-dark, 8%);
+            transition: all .2s linear;
         }
         &:hover {
             background: rgba($black, .2);
             color: $primary-light;
-            svg path {
+            svg {
                 fill: $white;
             }
 
@@ -152,14 +153,22 @@ $dropdown-width: 350px;
         &.see-more-projects-btn {
             margin-bottom: .3rem;
         }
+        &.import-project-button {
+            padding: .8rem 1rem;
+        }
         &.create-project-btn {
             flex: 1;
         }
-        &.import-project-button {
-            padding-left: .75rem;
-            padding-right: .75rem;
+    }
+    .import-project-button {
+        &:hover {
+            svg {
+                fill: $primary-light;
+            }
+        }
+        svg {
+            fill: $white;
         }
-
     }
     .create-options {
         display: flex;
diff --git a/app/modules/profile/profile-bar/profile-bar.jade b/app/modules/profile/profile-bar/profile-bar.jade
index 3c16c794..8a53a4ad 100644
--- a/app/modules/profile/profile-bar/profile-bar.jade
+++ b/app/modules/profile/profile-bar/profile-bar.jade
@@ -2,19 +2,10 @@ section.profile-bar
     div.profile-image-wrapper(ng-class="::{'is-current-user': vm.isCurrentUser}")
         img.profile-img(ng-src="{{::vm.user.get('big_photo')}}", alt="{{::vm.user.get('full_name')}}")
         a.profile-edition(title="{{ 'USER.PROFILE.EDIT' | translate }}", tg-nav="user-settings-user-profile", translate="USER.PROFILE.EDIT")
-    // a.button-green
-    //     span(translate="USER.PROFILE.FOLLOW")
     div.profile-data
         h1(ng-class="{'not-full-name': !vm.user.get('full_name')}") {{::vm.user.get("full_name_display")}}
         .username @{{::vm.user.get("username")}}
         h2 {{::vm.stats.get('roles').join(", ")}}
-        // div.location
-        //     include ../../../svg/location.svg
-        //     span Madrid
-        // Remove Abuse Flag when a user is seeing itself
-        // a.flag(href="", title="{{ 'USER.PROFILE.REPORT' | translate }}")
-        //     include ../../../svg/flag.svg
-    // These values in profile stats are not defined yet in UX. Please ask
     div.profile-stats
         div.stat
             span.stat-number {{::vm.stats.get('total_num_projects')}}
@@ -25,14 +16,6 @@ section.profile-bar
         div.stat
             span.stat-number {{::vm.stats.get('total_num_contacts')}}
             span.stat-name(translate="USER.PROFILE.CONTACTS")
-    // TODO Hide until organizations come
-        // div.profile-organizations
-        //     h3 Organizations
-        //     div.profile-organizations-wrapper
-        //         div.organization
-        //         div.organization
-        //         div.organization
-        //         div.organization
 
     div.profile-quote(ng-if="::vm.user.get('bio')")
         span {{::vm.user.get("bio") | limitTo:210 }}{{vm.user.get("bio").length < 210 ? '' : '...'}}
diff --git a/app/modules/profile/profile-contacts/profile-contacts.jade b/app/modules/profile/profile-contacts/profile-contacts.jade
index 08ffe638..b752325e 100644
--- a/app/modules/profile/profile-contacts/profile-contacts.jade
+++ b/app/modules/profile/profile-contacts/profile-contacts.jade
@@ -4,7 +4,8 @@ section.profile-contacts
             img(src="/#{v}/svg/spinner-circle.svg", alt="Loading...")
 
     div.empty-tab(ng-if="vm.contacts && !vm.contacts.size")
-        include ../../../svg/hide.svg
+        svg.icon.icon-unwatch
+            use(xlink:href="#icon-unwatch")
 
         div(ng-if="!vm.isCurrentUser")
             p(translate="USER.PROFILE.CONTACTS_EMPTY", translate-values="{username: vm.user.get('full_name_display')}")
diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade
index 827eff4f..4b1b7e56 100644
--- a/app/modules/profile/profile-favs/items/project.jade
+++ b/app/modules/profile/profile-favs/items/project.jade
@@ -34,14 +34,14 @@
             ng-class="{'active': vm.item.get('is_fan')}"
             title="{{ 'PROJECT.LIKE_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.get(\"total_fans\")||0}:'messageformat' }}"
          )
-            span.icon
-                include ../../../../svg/like.svg
+            svg.icon.icon-like
+                use(xlink:href="#icon-like")
             span {{ ::vm.item.get('total_fans') }}
 
         span.list-itemtype-track-watchers(
             ng-class="{'active': vm.item.get('is_watcher')}"
             title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.get(\"total_watchers\")||0}:'messageformat' }}"
         )
-            span.icon
-                include ../../../../svg/watch.svg
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
             span {{ ::vm.item.get('total_watchers') }}
diff --git a/app/modules/profile/profile-favs/items/ticket.jade b/app/modules/profile/profile-favs/items/ticket.jade
index a55ec8d0..d938466a 100644
--- a/app/modules/profile/profile-favs/items/ticket.jade
+++ b/app/modules/profile/profile-favs/items/ticket.jade
@@ -67,14 +67,14 @@ div.list-itemtype-ticket
             ng-class="{'active': vm.item.get('is_voter')}",
             title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.get(\"total_voters\")||0}:'messageformat' }}"
         )
-            span.icon
-                include ../../../../svg/upvote.svg
+            svg.icon.icon-upvote
+                use(xlink:href="#icon-upvote")
             span {{ ::vm.item.get('total_voters') }}
 
         span.list-itemtype-track-watchers(
             ng-class="{'active': vm.item.get('is_watcher')}"
             title="{{ 'COMMON.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.item.get(\"total_watchers\")||0}:'messageformat' }}"
         )
-            span.icon
-                include ../../../../svg/watch.svg
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
             span {{ ::vm.item.get('total_watchers') }}
diff --git a/app/modules/profile/profile-favs/profile-favs.jade b/app/modules/profile/profile-favs/profile-favs.jade
index 3b1ece60..24120ccb 100644
--- a/app/modules/profile/profile-favs/profile-favs.jade
+++ b/app/modules/profile/profile-favs/profile-favs.jade
@@ -1,7 +1,8 @@
 section.profile-favs
     div.profile-filter
         div.searchbox(ng-if="::vm.enableFilterByTextQuery")
-            span.icon-search
+            svg.icon.icon-search
+                use(xlink:href="#icon-search")
             input(
                 type="text"
                 ng-model="vm.q"
diff --git a/app/modules/profile/profile-favs/profile-favs.scss b/app/modules/profile/profile-favs/profile-favs.scss
index e37d4542..dce9d08c 100644
--- a/app/modules/profile/profile-favs/profile-favs.scss
+++ b/app/modules/profile/profile-favs/profile-favs.scss
@@ -14,7 +14,7 @@
         display: flex;
         flex: 1;
         .icon-search {
-            color: grayer;
+            fill: $gray;
             margin-right: .5rem;
         }
         input {
diff --git a/app/modules/profile/profile-hints/profile-hints.jade b/app/modules/profile/profile-hints/profile-hints.jade
index fceb5fd9..364a9066 100644
--- a/app/modules/profile/profile-hints/profile-hints.jade
+++ b/app/modules/profile/profile-hints/profile-hints.jade
@@ -1,5 +1,6 @@
 h4
-    span.icon.icon-help
+    svg.icon.icon-question
+        use(xlink:href="#icon-question")
     span(translate="HINTS.SECTION_NAME")
 
 p {{::vm.hint.title}}
diff --git a/app/modules/profile/profile-projects/profile-projects.jade b/app/modules/profile/profile-projects/profile-projects.jade
index 28c2ef45..3f76179d 100644
--- a/app/modules/profile/profile-projects/profile-projects.jade
+++ b/app/modules/profile/profile-projects/profile-projects.jade
@@ -4,7 +4,8 @@ section.profile-projects
             img(src="/#{v}/svg/spinner-circle.svg", alt="Loading...")
 
     .empty-tab(ng-if="vm.projects && !vm.projects.size")
-        include ../../../svg/hide.svg
+        svg.icon.icon-unwatch
+            use(xlink:href="#icon-unwatch")
 
         p(
             translate="USER.PROFILE.PROJECTS_EMPTY"
@@ -46,16 +47,16 @@ section.profile-projects
                     ng-class="{'active': project.get('is_fan')}"
                     title="{{ 'PROJECT.LIKE_BUTTON.COUNTER_TITLE'|translate:{total:project.get(\"total_fans\")||0}:'messageformat' }}"
                 )
-                    span.icon
-                        include ../../../svg/like.svg
+                    svg.icon.icon-like
+                        use(xlink:href="#icon-like")
                     span {{ ::project.get('total_fans') }}
 
                 span.list-itemtype-track-watchers(
                     ng-class="{'active': project.get('is_watcher')}"
                     title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:project.get(\"total_watchers\")||0}:'messageformat' }}"
                 )
-                    span.icon
-                        include ../../../svg/watch.svg
+                    svg.icon.icon-watch
+                        use(xlink:href="#icon-watch")
                     span {{ ::project.get('total_watchers') }}
 
             .list-itemtype-project-members
diff --git a/app/modules/profile/profile-tab/profile-tab.directive.coffee b/app/modules/profile/profile-tab/profile-tab.directive.coffee
index 308a97ba..252e7282 100644
--- a/app/modules/profile/profile-tab/profile-tab.directive.coffee
+++ b/app/modules/profile/profile-tab/profile-tab.directive.coffee
@@ -28,6 +28,7 @@ ProfileTabDirective = () ->
             scope.tab.title = title
 
         scope.tab.icon = attrs.tabIcon
+        scope.tab.iconName = '#' + attrs.tabIcon
         scope.tab.active = !!attrs.tabActive
 
         if scope.$eval(attrs.tabDisabled) != true
diff --git a/app/modules/profile/profile-tabs/profile-tabs.jade b/app/modules/profile/profile-tabs/profile-tabs.jade
index ba10af3a..c7965c2f 100644
--- a/app/modules/profile/profile-tabs/profile-tabs.jade
+++ b/app/modules/profile/profile-tabs/profile-tabs.jade
@@ -7,7 +7,8 @@ div
             ng-click="vm.toggleTab(tab)"
             ng-class="{active: tab.active}"
         )
-            span.icon(ng-class="::tab.icon")
+            svg.icon(ng-class="::tab.icon")
+                use(xlink:href="{{::tab.iconName}}")
             span {{::tab.name}}
 
     ng-transclude
diff --git a/app/modules/profile/profile.jade b/app/modules/profile/profile.jade
index dc5ce3f7..3b6caf8e 100644
--- a/app/modules/profile/profile.jade
+++ b/app/modules/profile/profile.jade
@@ -21,21 +21,21 @@ div.profile.centered(ng-if="vm.user")
             div(
                 tg-profile-tab="{{'USER.PROFILE.TABS.LIKES_TAB' | translate}}"
                 tab-title="{{'USER.PROFILE.TABS.LIKES_TAB_TITLE' | translate}}"
-                tab-icon="icon-heart"
+                tab-icon="icon-like"
             )
                 div(tg-profile-liked, user="vm.user")
 
             div(
                 tg-profile-tab="{{'USER.PROFILE.TABS.VOTES_TAB' | translate}}"
                 tab-title="{{'USER.PROFILE.TABS.VOTES_TAB_TITLE' | translate}}"
-                tab-icon="icon-caret-up"
+                tab-icon="icon-upvote"
             )
                 div(tg-profile-voted, user="vm.user")
 
             div(
                 tg-profile-tab="{{'USER.PROFILE.TABS.WATCHED_TAB' | translate}}"
                 tab-title="{{'USER.PROFILE.TABS.WATCHED_TAB_TITLE' | translate}}"
-                tab-icon="icon-eye"
+                tab-icon="icon-watch"
             )
                 div(tg-profile-watched, user="vm.user")
 
diff --git a/app/modules/profile/profile.scss b/app/modules/profile/profile.scss
index 0dcec0dc..d11826f6 100644
--- a/app/modules/profile/profile.scss
+++ b/app/modules/profile/profile.scss
@@ -50,12 +50,16 @@
         padding: 5vh;
         text-align: center;
         svg {
+            fill: $whitish;
+            height: 10rem;
             margin: 2rem auto;
-            max-width: 160px;
             text-align: center;
+            width: 10rem;
         }
         p {
+            color: $gray-light;
             font-size: .9rem;
+            margin: 0;
         }
     }
 }
diff --git a/app/modules/profile/styles/profile-content-tabs.scss b/app/modules/profile/styles/profile-content-tabs.scss
index 6b5340be..b63ec85e 100644
--- a/app/modules/profile/styles/profile-content-tabs.scss
+++ b/app/modules/profile/styles/profile-content-tabs.scss
@@ -7,8 +7,11 @@
         padding: 1rem;
         &:hover,
         &.active {
-            color: $grayer;
+            color: $gray;
             transition: color .2s linear;
+            .icon {
+                fill: $primary-light;
+            }
         }
         &.active {
             background: $white;
@@ -19,11 +22,13 @@
             transition: color .2s linear;
             .icon {
                 color: $primary;
-                transition: color .2s linear;
             }
         }
     }
     .icon {
-        margin-right: .4rem;
+        fill: $gray-light;
+        height: .8rem;
+        margin-right: .5rem;
+        transition: fill .2s linear;
     }
 }
diff --git a/app/modules/profile/styles/profile-sidebar.scss b/app/modules/profile/styles/profile-sidebar.scss
index 944c813c..964b3322 100644
--- a/app/modules/profile/styles/profile-sidebar.scss
+++ b/app/modules/profile/styles/profile-sidebar.scss
@@ -6,9 +6,10 @@
         margin-bottom: .5rem;
         padding: .5rem;
         .icon {
-            color: $gray-light;
+            fill: $gray-light;
             margin-right: .3rem;
-            vertical-align: text-bottom;
+            margin-top: -3px;
+            vertical-align: middle;
         }
     }
     p {
diff --git a/app/modules/projects/components/like-project-button/like-project-button.jade b/app/modules/projects/components/like-project-button/like-project-button.jade
index 7faad550..176c25fd 100644
--- a/app/modules/projects/components/like-project-button/like-project-button.jade
+++ b/app/modules/projects/components/like-project-button/like-project-button.jade
@@ -8,7 +8,8 @@ a.track-button.like-button.like-container(
 )
     span.track-inner
         span.track-icon
-            include ../../../../svg/like.svg
+            svg.icon.icon-like
+                use(xlink:href="#icon-like")
         span(
             ng-if="!vm.project.get('is_fan')"
             translate="PROJECT.LIKE_BUTTON.LIKE"
diff --git a/app/modules/projects/components/watch-project-button/watch-project-button.jade b/app/modules/projects/components/watch-project-button/watch-project-button.jade
index 508922fd..1c2671a5 100644
--- a/app/modules/projects/components/watch-project-button/watch-project-button.jade
+++ b/app/modules/projects/components/watch-project-button/watch-project-button.jade
@@ -6,10 +6,12 @@ a.track-button.watch-button.watch-container(
 )
     span.track-inner
         span.track-icon
-            include ../../../../svg/watch.svg
+            svg.icon.icon-watch
+                use(xlink:href="#icon-watch")
         span(ng-if="!vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCH")
         span(ng-if="vm.project.get('is_watcher')", translate="PROJECT.WATCH_BUTTON.WATCHING")
-        span.icon.icon-arrow-up
+        svg.icon.icon-arrow-down
+            use(xlink:href="#icon-arrow-down")
 
     span.track-button-counter(
         title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.project.get(\"total_watchers\")||0}:'messageformat' }}",
@@ -35,7 +37,8 @@ ul.watch-options(
         )
             span(translate="PROJECT.WATCH_BUTTON.OPTIONS.NOTIFY_ALL")
             span.watch-check(ng-if="vm.project.get('is_watcher') && vm.project.get('notify_level') == 2")
-                include ../../../../svg/check.svg
+                svg.icon.icon-check-empty
+                    use(xlink:href="#icon-check-empty")
     li
         a(
             href="",
@@ -45,7 +48,8 @@ ul.watch-options(
         )
             span(translate="PROJECT.WATCH_BUTTON.OPTIONS.NOTIFY_INVOLVED")
             span.watch-check(ng-if="vm.project.get('is_watcher') && vm.project.get('notify_level') == 1")
-                include ../../../../svg/check.svg
+                svg.icon.icon-check-empty
+                    use(xlink:href="#icon-check-empty")
 
     li(ng-if="vm.project.get('is_watcher')")
         a(
diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade
index 3e1e0de9..59676e12 100644
--- a/app/modules/projects/listing/projects-listing.jade
+++ b/app/modules/projects/listing/projects-listing.jade
@@ -13,7 +13,8 @@
                     href=""
                     title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}"
                 )
-                    span.icon.icon-upload
+                    svg.icon.icon-upload
+                        use(xlink:href="#icon-upload")
                 input.import-file.hidden(type="file")
 
     section.project-list-section
@@ -46,7 +47,8 @@
                                         ng-if="project.get('is_private')"
                                         title="{{'PROJECT.PRIVATE' | translate}}"
                                     )
-                                        include ../../../svg/lock.svg
+                                        svg.icon.icon-lock
+                                            use(xlink:href="#icon-lock")
                                 p {{ ::project.get('description') | limitTo:300 }}
                                     span(ng-if="::project.get('description').length > 300") ...
 
@@ -57,7 +59,8 @@
                             )
                                 span.tag-name {{::tag.get('name')}}
 
-                    span.drag.icon.icon-drag-v
+                    svg.drag.icon.icon-drag
+                        use(xlink:href="#icon-drag")
 
         aside.help-area
             p(translate="PROJECT.HELP")
diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss
index b9f68b93..522358f2 100644
--- a/app/modules/projects/listing/styles/project-list.scss
+++ b/app/modules/projects/listing/styles/project-list.scss
@@ -13,20 +13,21 @@
             margin: 0;
         }
     }
-    .create-options a {
-        &.create-project-btn {
-            margin-right: .25rem;
-            padding: .6rem 2.5rem;
-        }
-        &.import-project-button {
-            padding: .53rem .8rem;
-            &:hover {
-                background: $grayer;
-            }
+    .create-project-btn {
+        margin-right: .25rem;
+        padding: .6rem 2.5rem;
+    }
+    .import-project-button {
+        padding: .53rem .8rem;
+        &:hover {
             .icon-upload {
-                margin: 0;
+                fill: $primary-light;
             }
         }
+        .icon-upload {
+            fill: $white;
+        }
+
     }
     .project-list-section {
         display: flex;
@@ -63,10 +64,12 @@
         }
     }
     .drag {
-        @extend %large;
         align-self: center;
-        color: $gray-light;
+        fill: $gray-light;
+        height: 1.1rem;
+        margin-right: .5rem;
         opacity: 0;
         transition: opacity .2s;
+        width: 1.1rem;
     }
 }
diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade
index b646fbff..285e0dbf 100644
--- a/app/modules/projects/project/project.jade
+++ b/app/modules/projects/project/project.jade
@@ -20,7 +20,8 @@ div.wrapper
                             ng-if="::vm.project.get('is_private')"
                             title="{{'PROJECT.PRIVATE' | translate}}"
                         )
-                            include ../../../svg/lock.svg
+                            svg.icon.icon-lock
+                                use(xlink:href="#icon-lock")
 
                     div.track-buttons-container(ng-if="vm.user")
                         tg-like-project-button(project="vm.project")
@@ -31,15 +32,15 @@ div.wrapper
                             span.list-itemtype-track-likers(
                                 title="{{ 'PROJECT.LIKE_BUTTON.COUNTER_TITLE'|translate:{total:vm.project.get(\"total_fans\")||0}:'messageformat' }}"
                             )
-                                span.icon
-                                    include ../../../svg/like.svg
+                                svg.icon.icon-like
+                                    use(xlink:href="#icon-like")
                                 span {{ ::vm.project.get('total_fans') }}
 
                             span.list-itemtype-track-watchers(
                                 title="{{ 'PROJECT.WATCH_BUTTON.COUNTER_TITLE'|translate:{total:vm.project.get(\"total_watchers\")||0}:'messageformat' }}"
                             )
-                                span.icon
-                                    include ../../../svg/watch.svg
+                                svg.icon.icon-watche
+                                    use(xlink:href="#icon-watch")
                                 span {{ ::vm.project.get('total_watchers') }}
 
                 p.description {{vm.project.get('description')}}
diff --git a/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment.jade b/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment.jade
index a2f83b04..8c086e97 100644
--- a/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment.jade
+++ b/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment.jade
@@ -1,5 +1,6 @@
 div.single-attachment
     blockquote
         a(ng-href="{{ attachment.get('url') }}", title="Click to download {{ attachment.get('filename') }}", target="_blank")
-            span.icon.icon-document
+            svg.icon.icon-attachment
+                use(xlink:href="#icon-attachment")
             span {{attachment.get('filename')}}
diff --git a/app/modules/user-timeline/user-timeline/user-timeline.scss b/app/modules/user-timeline/user-timeline/user-timeline.scss
index fc41472a..181109b4 100644
--- a/app/modules/user-timeline/user-timeline/user-timeline.scss
+++ b/app/modules/user-timeline/user-timeline/user-timeline.scss
@@ -86,11 +86,12 @@
             max-width: 95%;
             overflow: hidden;
             text-overflow: ellipsis;
-            vertical-align: middle;
+            vertical-align: sub;
             white-space: nowrap;
         }
         .icon {
-            margin-right: .3rem;
+            fill: $grayer;
+            margin-right: .5rem;
         }
     }
     .spin {
diff --git a/app/partials/admin/admin-project-export.jade b/app/partials/admin/admin-project-export.jade
index 04fd1af4..024e49da 100644
--- a/app/partials/admin/admin-project-export.jade
+++ b/app/partials/admin/admin-project-export.jade
@@ -26,5 +26,6 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl",
             p.result-message
 
         a.help-button(href="https://taiga.io/support/import-export-projects/", target="_blank")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="ADMIN.HELP")
diff --git a/app/partials/admin/admin-project-modules.jade b/app/partials/admin/admin-project-modules.jade
index ab4ade35..fac254da 100644
--- a/app/partials/admin/admin-project-modules.jade
+++ b/app/partials/admin/admin-project-modules.jade
@@ -15,7 +15,8 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
 
         form
             div.functionality(ng-class="{true:'active', false:''}[project.is_backlog_activated]")
-                div.icon.icon-scrum
+                svg.icon.icon-scrum
+                    use(xlink:href="#icon-scrum")
                 div.desc
                     p
                         span.title(translate="ADMIN.MODULES.BACKLOG")
@@ -29,7 +30,8 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
                             span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
 
             div.functionality(ng-class="{true:'active', false:''}[project.is_kanban_activated]")
-                div.icon.icon-kanban
+                svg.icon.icon-kanban
+                    use(xlink:href="#icon-kanban")
                 div.desc
                     p
                         span.title(translate="ADMIN.MODULES.KANBAN")
@@ -43,7 +45,8 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
                             span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
 
             div.functionality(ng-class="{true:'active', false:''}[project.is_issues_activated]")
-                div.icon.icon-issues
+                svg.icon.icon-issues
+                    use(xlink:href="#icon-issues")
                 div.desc
                     p
                         span.title(translate="ADMIN.MODULES.ISSUES")
@@ -57,7 +60,8 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
                             span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
 
             div.functionality(ng-class="{true:'active', false:''}[project.is_wiki_activated]")
-                div.icon.icon-wiki
+                svg.icon.icon-wiki
+                    use(xlink:href="#icon-wiki")
                 div.desc
                     p
                         span.title(translate="ADMIN.MODULES.WIKI")
@@ -71,7 +75,8 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
                             span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
 
             div.functionality(ng-class="{true:'active', false:''}[isVideoconferenceActivated]")
-                div.icon.icon-video
+                svg.icon.icon-bubble-empty
+                    use(xlink:href="#icon-bubble-empty")
                 div.desc
                     p
                         span.title(translate="ADMIN.MODULES.MEETUP")
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index c786f932..1aedd6cb 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -105,10 +105,9 @@ div.wrapper(
                 fieldset.looking-for-people
                     .looking-for-people-selector
                         span {{ 'ADMIN.PROJECT_PROFILE.RECRUITING' | translate }}
-                        span(
-                            title="{{ 'ADMIN.PROJECT_PROFILE.RECRUITING_MESSAGE' | translate }}"
-                        )
-                            include ../../svg/recruit.svg
+                        svg.icon.icon-recruit
+                            use(xlink:href="#icon-recruit")
+                                title {{ 'ADMIN.PROJECT_PROFILE.RECRUITING_MESSAGE' | translate }}"
                         div.check
                             input(
                                 type="checkbox",
@@ -138,8 +137,6 @@ div.wrapper(
                                 ng-value="false"
                             )
                             label.trans-button(for="private-project") {{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT' | translate }}
-                                span(title="{{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT_DESC' | translate }}")
-                                    include ../../svg/help.svg
 
                         div.privacy-option
                             input.privacy-project(
@@ -150,15 +147,14 @@ div.wrapper(
                                 ng-value="true"
                             )
                             label.trans-button(for="public-project") {{'ADMIN.PROJECT_PROFILE.PRIVATE_PROJECT' | translate }}
-                                span(title="{{ 'ADMIN.PROJECT_PROFILE.PRIVATE_PROJECT_DESC' | translate }}")
-                                    include ../../svg/help.svg
 
                     a.private-or-public(
                         href="https://taiga.io/support/whats-the-difference-between-public-and-private-projects/"
                         target="_blank"
                     )
-                        span(title="{{ 'ADMIN.PROJECT_PROFILE.PRIVATE_OR_PUBLIC' | translate }}")
-                            include ../../svg/help.svg
+                        svg.icon.icon-question
+                            use(xlink:href="#icon-question")
+                                title {{ 'ADMIN.PROJECT_PROFILE.PRIVATE_OR_PUBLIC' | translate }}
                         span {{'ADMIN.PROJECT_PROFILE.PRIVATE_OR_PUBLIC' | translate }}
                 button.button-green.submit-button(
                     type="submit"
diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade
index ffbb8ca5..bde79213 100644
--- a/app/partials/admin/admin-project-reports.jade
+++ b/app/partials/admin/admin-project-reports.jade
@@ -22,5 +22,6 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl",
 
         div
             a.help-button(href="https://taiga.io/support/csv-reports/", target="_blank")
-                span.icon.icon-help
+                svg.icon.icon-question
+                    use(xlink:href="#icon-question")
                 span(translate="ADMIN.REPORTS.HELP")
diff --git a/app/partials/admin/admin-roles.jade b/app/partials/admin/admin-roles.jade
index 2af066c0..1afdcc9b 100644
--- a/app/partials/admin/admin-roles.jade
+++ b/app/partials/admin/admin-roles.jade
@@ -18,25 +18,27 @@ div.wrapper.roles(ng-controller="RolesController as ctrl",
                     span(translate="COMMON.DELETE")
 
 
-        div(ng-if="!role.external_user")
-            div(tg-edit-role)
-                .edit-role
-                    input(type="text", value="{{ role.name }}")
-                    a.save.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
+        tg-edit-role(ng-if="!role.external_user")
+            .edit-role
+                input(type="text", value="{{ role.name }}")
+                a.save(href="", title="{{'COMMON.SAVE' | translate}}")
+                    svg.icon.icon-save
+                        use(xlink:href="#icon-save")
+            p.total
+                span.role-name(title="{{'ADMIN.ROLES.COUNT_MEMBERS' | translate}}") {{ role.name }}
+                a.edit-value
+                    svg.icon.icon-edit
+                        use(xlink:href="#icon-edit")
 
-                p.total
-                    span.role-name(title="{{'ADMIN.ROLES.COUNT_MEMBERS' | translate}}") {{ role.name }}
-                    a.edit-value.icon.icon-edit
+        div.any-computable-role(ng-hide="anyComputableRole", translate="ADMIN.ROLES.WARNING_NO_ROLE")
 
-            div.any-computable-role(ng-hide="anyComputableRole", translate="ADMIN.ROLES.WARNING_NO_ROLE")
-
-            div.general-category
-                span(translate="ADMIN.ROLES.HELP_ROLE_ENABLED")
-                div.check
-                    input(type="checkbox", ng-model="role.computable", ng-change="ctrl.toggleComputable()")
-                    div
-                    span.check-text.check-yes(translate="COMMON.YES")
-                    span.check-text.check-no(translate="COMMON.NO")
+        div.general-category
+            span(translate="ADMIN.ROLES.HELP_ROLE_ENABLED")
+            div.check
+                input(type="checkbox", ng-model="role.computable", ng-change="ctrl.toggleComputable()")
+                div
+                span.check-text.check-yes(translate="COMMON.YES")
+                span.check-text.check-no(translate="COMMON.NO")
 
         div(ng-if="role.external_user")
             p.total
diff --git a/app/partials/admin/admin-third-parties-bitbucket.jade b/app/partials/admin/admin-third-parties-bitbucket.jade
index 6aa26207..b56beb19 100644
--- a/app/partials/admin/admin-third-parties-bitbucket.jade
+++ b/app/partials/admin/admin-third-parties-bitbucket.jade
@@ -24,7 +24,8 @@ div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as c
                         .field-with-option
                             input(type="text", ng-model="bitbucket.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url")
                             .option-wrapper.select-input-content
-                                .icon.icon-copy
+                                svg.icon.icon-clipboard
+                                    use(xlink:href="#icon-clipboard")
                         .help-copy(translate="COMMON.COPY_TO_CLIPBOARD")
 
             fieldset
@@ -34,5 +35,6 @@ div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as c
             button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
 
         a.help-button(href="https://taiga.io/support/bitbucket-integration/", target="_blank")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="ADMIN.HELP")
diff --git a/app/partials/admin/admin-third-parties-github.jade b/app/partials/admin/admin-third-parties-github.jade
index 9154d42b..3500c73a 100644
--- a/app/partials/admin/admin-third-parties-github.jade
+++ b/app/partials/admin/admin-third-parties-github.jade
@@ -23,11 +23,13 @@ div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl",
                         .field-with-option
                             input(type="text", ng-model="github.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url")
                             .option-wrapper.select-input-content
-                                .icon.icon-copy
+                                svg.icon.icon-clipboard
+                                    use(xlink:href="#icon-clipboard")
                         .help-copy(translate="COMMON.COPY_TO_CLIPBOARD")
 
             button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
 
         a.help-button(href="https://taiga.io/support/github-integration/", target="_blank")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="ADMIN.HELP")
diff --git a/app/partials/admin/admin-third-parties-gitlab.jade b/app/partials/admin/admin-third-parties-gitlab.jade
index 6bc1fcbe..8867eee3 100644
--- a/app/partials/admin/admin-third-parties-gitlab.jade
+++ b/app/partials/admin/admin-third-parties-gitlab.jade
@@ -23,7 +23,8 @@ div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl",
                         .field-with-option
                             input(type="text", ng-model="gitlab.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url")
                             .option-wrapper.select-input-content
-                                .icon.icon-copy
+                                svg.icon.icon-clipboard
+                                    use(xlink:href="#icon-clipboard")
                         .help-copy(translate="COMMON.COPY_TO_CLIPBOARD")
 
             fieldset
@@ -33,5 +34,6 @@ div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl",
             button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
 
         a.help-button(href="https://taiga.io/support/gitlab-integration/", target="_blank")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="ADMIN.HELP")
diff --git a/app/partials/admin/admin-third-parties-webhooks.jade b/app/partials/admin/admin-third-parties-webhooks.jade
index b890b2a0..0b9349e6 100644
--- a/app/partials/admin/admin-third-parties-webhooks.jade
+++ b/app/partials/admin/admin-third-parties-webhooks.jade
@@ -31,12 +31,29 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl",
                             div.webhook-url
                                 div.webhook-url-inputs
                                     fieldset
-                                        input(type="text", name="url", data-type="url", placeholder="{{'ADMIN.WEBHOOKS.TYPE_PAYLOAD_URL' | translate}}", data-required="true", ng-model="webhook.url")
+                                        input(
+                                            type="text"
+                                            name="url"
+                                            data-type="url"
+                                            placeholder="{{'ADMIN.WEBHOOKS.TYPE_PAYLOAD_URL' | translate}}"
+                                            data-required="true"
+                                            ng-model="webhook.url"
+                                        )
                                     fieldset
-                                        input(type="text", name="key", placeholder="{{'ADMIN.WEBHOOKS.TYPE_SERVICE_SECRET' | translate}}", data-required="true", ng-model="webhook.key")
+                                        input(
+                                            type="text"
+                                            name="key"
+                                            placeholder="{{'ADMIN.WEBHOOKS.TYPE_SERVICE_SECRET' | translate}}"
+                                            data-required="true"
+                                            ng-model="webhook.key"
+                                        )
                             div.webhook-options
-                                a.edit-existing.icon.icon-floppy(href="", title="{{'ADMIN.WEBHOOKS.SAVE' | translate}}")
-                                a.cancel-existing.icon.icon-delete(href="", title="{{'ADMIN.WEBHOOKS.CANCEL' | translate}}")
+                                a.edit-existing(href="", title="{{'ADMIN.WEBHOOKS.SAVE' | translate}}")
+                                    svg.icon.icon-save
+                                        use(xlink:href="#icon-save")
+                                a.cancel-existing(href="", title="{{'ADMIN.WEBHOOKS.CANCEL' | translate}}")
+                                    svg.icon.icon-close
+                                        use(xlink:href="#icon-close")
 
                     div.visualization-mode
                         div.row
@@ -48,9 +65,15 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl",
 
                             div.webhook-options
                                 div.webhook-options-wrapper
-                                    a.test-webhook.icon.icon-check-square(href="", title="{{'ADMIN.WEBHOOKS.TEST' | translate}}")
-                                    a.edit-webhook.icon.icon-edit(href="", title="{{'ADMIN.WEBHOOKS.EDIT' | translate}}")
-                                    a.delete-webhook.icon.icon-delete(href="", title="{{'ADMIN.WEBHOOKS.DELETE' | translate}}")
+                                    a.test-webhook(href="", title="{{'ADMIN.WEBHOOKS.TEST' | translate}}")
+                                        svg.icon.icon-check-empty
+                                            use(xlink:href="#icon-check-empty")
+                                    a.edit-webhook(href="", title="{{'ADMIN.WEBHOOKS.EDIT' | translate}}")
+                                        svg.icon.icon-edit
+                                            use(xlink:href="#icon-edit")
+                                    a.delete-webhook(href="", title="{{'ADMIN.WEBHOOKS.DELETE' | translate}}")
+                                        svg.icon.icon-trash
+                                            use(xlink:href="#icon-trash")
 
                         div.webhooks-history(ng-show="webhook.logs")
                             div.history-single-wrapper(ng-repeat="log in webhook.logs")
@@ -58,13 +81,15 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl",
                                     div
                                         span.history-response-icon(ng-class="log.validStatus ? 'history-success' : 'history-error'", title="{{log.status}}")
                                         span.history-date(ng-bind="log.prettyDate")
-                                    span.toggle-log.icon.icon-arrow-bottom
+                                    svg.toggle-log.icon.icon-arrow-down
+                                        use(xlink:href="#icon-arrow-down")
 
                                 div.history-single-response
                                     div.history-single-request-header
                                         span(translate="ADMIN.WEBHOOKS.REQUEST")
                                         a.resend-request(href="", title="{{'ADMIN.WEBHOOKS.RESEND_REQUEST' | translate}}", data-log="{{log.id}}")
-                                            span.icon.icon-reload
+                                            svg.icon.icon-reload
+                                                use(xlink:href="#icon-reload")
                                             span(translate="ADMIN.WEBHOOKS.RESEND_REQUEST")
                                     div.history-single-request-body
                                         div.response-container
@@ -91,9 +116,14 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl",
                             fieldset
                                 input(type="text", name="key", placeholder="{{'ADMIN.WEBHOOKS.TYPE_SERVICE_SECRET' | translate}}", data-required="true", ng-model="newValue.key")
                     div.webhook-options
-                        a.add-new.icon.icon-floppy(href="", title="{{'ADMIN.WEBHOOKS.SAVE' | translate}}")
-                        a.cancel-new.icon.icon-delete(href="", title="{{'ADMIN.WEBHOOKS.CANCEL' | translate}}")
+                        a.add-new(href="", title="{{'ADMIN.WEBHOOKS.SAVE' | translate}}")
+                            svg.icon.icon-save
+                                use(xlink:href="#icon-save")
+                        a.cancel-new(href="", title="{{'ADMIN.WEBHOOKS.CANCEL' | translate}}")
+                            svg.icon.icon-close
+                                use(xlink:href="#icon-close")
 
         a.help-button(href="https://taiga.io/support/webhooks/", target="_blank")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="ADMIN.HELP")
diff --git a/app/partials/admin/project-csv.jade b/app/partials/admin/project-csv.jade
index 8e709dd9..559b1fd0 100644
--- a/app/partials/admin/project-csv.jade
+++ b/app/partials/admin/project-csv.jade
@@ -10,11 +10,14 @@ section.project-csv(tg-select-input-text)
             input(type="text", placeholder="{{'ADMIN.CSV.URL_FIELD_PLACEHOLDER' | translate}}",
                   readonly, ng-model="csvUrl")
             div.option-wrapper.select-input-content
-                div.icon.icon-copy
+                svg.icon.icon-clipboard
+                    use(xlink:href="#icon-clipboard")
 
         a(href="", title="{{'ADMIN.CSV.TITLE_REGENERATE_URL' | translate}}", ng-click="ctrl.regenerateUuid()")
-           span.icon.icon-plus(ng-hide="csvUrl")
+           svg.icon.icon-add(ng-hide="csvUrl")
+               use(xlink:href="#icon-add")
            span(ng-hide="csvUrl", translate="ADMIN.CSV.ACTION_GENERATE_URL")
 
-           span.icon.icon-reload(ng-Show="csvUrl")
+           svg.icon.icon-reload(ng-Show="csvUrl")
+               use(xlink:href="#icon-reload")
            span(ng-Show="csvUrl", translate="ADMIN.CSV.ACTION_REGENERATE")
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index 0752b02f..f87992bc 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -12,8 +12,8 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
             include ../includes/components/summary
 
             div.empty-burndown(ng-if="showGraphPlaceholder")
-                div.graph-icon
-                    include ../../svg/graph.svg
+                svg.icon.icon-graph
+                    use(xlink:href="#icon-graph")
                 div.empty-text
                     p.title(translate="BACKLOG.CUSTOMIZE_GRAPH")
                     p {{'BACKLOG.CUSTOMIZE_GRAPH_TEXT' | translate}} #[a(href="", tg-nav="project-admin-project-profile-details:project=project.slug", title="{{'BACKLOG.CUSTOMIZE_GRAPH_TITLE' | translate}}") {{'BACKLOG.CUSTOMIZE_GRAPH_ADMIN' | translate}}]
@@ -30,7 +30,8 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
                     title="{{'BACKLOG.MOVE_US_TO_CURRENT_SPRINT' | translate}}"
                     id="move-to-current-sprint"
                 )
-                    span.icon.icon-move
+                    svg.icon.icon-move
+                        use(xlink:href="#icon-move")
                     span.text(translate="BACKLOG.MOVE_US_TO_CURRENT_SPRINT")
                 a.trans-button.move-to-latest-sprint.move-to-sprint(
                     ng-if="!currentSprint"
@@ -38,7 +39,8 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
                     title="{{'BACKLOG.MOVE_US_TO_LATEST_SPRINT' | translate}}"
                     id="move-to-latest-sprint"
                 )
-                    span.icon.icon-move
+                    svg.icon.icon-move
+                        use(xlink:href="#icon-move")
                     span.text(translate="BACKLOG.MOVE_US_TO_LATEST_SPRINT")
                 a.trans-button(
                     ng-if="userstories.length"
diff --git a/app/partials/backlog/filter-selected.jade b/app/partials/backlog/filter-selected.jade
index d9550028..860c8423 100644
--- a/app/partials/backlog/filter-selected.jade
+++ b/app/partials/backlog/filter-selected.jade
@@ -2,5 +2,6 @@
 a.single-filter.selected(data-type!="<%- f.type %>", data-id!="<%- f.id %>")
     span.name(style!="<%- f.style %>")
         | <%- f.name %>
-    span.icon.icon-delete
+    svg.icon.icon-close.remove-filter
+        use(xlink:href="#icon-close")
 <% }) %>
diff --git a/app/partials/backlog/sprint-header.jade b/app/partials/backlog/sprint-header.jade
index c1e636fb..2024e3ea 100644
--- a/app/partials/backlog/sprint-header.jade
+++ b/app/partials/backlog/sprint-header.jade
@@ -1,9 +1,12 @@
 .sprint-name
-    a.icon.icon-arrow-up(href="", title="{{'BACKLOG.COMPACT_SPRINT' | translate}}")
+    a.compact-sprint(href="", title="{{'BACKLOG.COMPACT_SPRINT' | translate}}")
+        svg.icon.icon-arrow-right
+            use(xlink:href="#icon-arrow-right")
     a(ng-if="::isVisible", href="{{::taskboardUrl}}", title="{{'BACKLOG.GO_TO_TASKBOARD' | translate}}")
         span {{::name}}
 
-    a.icon.icon-edit(ng-if="::isEditable", href="", title="{{'BACKLOG.EDIT_SPRINT' | translate}}")
+    svg.icon.icon-edit.edit-sprint(ng-if="::isEditable", href="", title="{{'BACKLOG.EDIT_SPRINT' | translate}}")
+        use(xlink:href="#icon-edit")
 
 .sprint-summary
     .sprint-date {{::estimatedDateRange}}
diff --git a/app/partials/common/components/add-button.jade b/app/partials/common/components/add-button.jade
index a510e0a1..22606398 100644
--- a/app/partials/common/components/add-button.jade
+++ b/app/partials/common/components/add-button.jade
@@ -1,4 +1,5 @@
 a.add-button(
     href=""
 )
-    include ../../../svg/add.svg
+    svg.icon.icon-add
+        use(xlink:href="#icon-add")
diff --git a/app/partials/common/components/assigned-to.jade b/app/partials/common/components/assigned-to.jade
index 25b4b52b..2588a8b5 100644
--- a/app/partials/common/components/assigned-to.jade
+++ b/app/partials/common/components/assigned-to.jade
@@ -2,7 +2,8 @@
     img(src!="<%- photo %>", alt!="<%- fullName %>")
     <% if (isIocaine) { %>
     .iocaine-symbol(title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}")
-        include ../../../svg/iocaine.svg
+        svg.icon.icon-iocaine
+            use(xlink:href="#icon-iocaine")
     <% }; %>
 
 .assigned-to
@@ -23,7 +24,8 @@
                 <%- fullName %>
                 <% }; %>
                 <% if (isEditable && !isUnassigned) { %>
-                span.icon.icon-arrow-bottom
+                svg.icon.icon-arrow-down
+                    use(xlink:href="#icon-arrow-down")
                 <% }; %>
 
         <% if (isEditable && isUnassigned) { %>
@@ -37,8 +39,9 @@
         <% }; %>
 
     <% if (isEditable && !isUnassigned) { %>
-    a.icon.icon-delete(
+    svg.icon.icon-close.remove-user(
         href=""
         title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
     )
+        use(xlink:href="#icon-close")
     <% } %>
diff --git a/app/partials/common/components/block-button.jade b/app/partials/common/components/block-button.jade
index 2f474602..0a499ff2 100644
--- a/app/partials/common/components/block-button.jade
+++ b/app/partials/common/components/block-button.jade
@@ -2,9 +2,11 @@ a.button-gray.item-block(
     href=""
     title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
 )
-    include ../../../svg/lock.svg
+    svg.icon.icon-lock
+        use(xlink:href="#icon-lock")
 a.button-red.item-unblock(
     href=""
     title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}"
 )
-    include ../../../svg/unlock.svg
+    svg.icon.icon-lock
+        use(xlink:href="#icon-unlock")
diff --git a/app/partials/common/components/delete-button.jade b/app/partials/common/components/delete-button.jade
index 22f6ee5b..3f1d987c 100644
--- a/app/partials/common/components/delete-button.jade
+++ b/app/partials/common/components/delete-button.jade
@@ -2,4 +2,5 @@ a.button-red.button-delete(
     href=""
     title="{{ 'COMMON.DELETE' | translate }}"
 )
-    include ../../../svg/trash.svg
+    svg.icon.icon-trash
+        use(xlink:href="#icon-trash")
diff --git a/app/partials/common/components/editable-description.jade b/app/partials/common/components/editable-description.jade
index 6cfdeda1..348ef613 100644
--- a/app/partials/common/components/editable-description.jade
+++ b/app/partials/common/components/editable-description.jade
@@ -2,10 +2,12 @@ include wysiwyg.jade
 
 .view-description
     section.us-content.wysiwyg(tg-bind-html="item.description_html || noDescriptionMsg")
-    span.edit.icon.icon-edit
+    svg.icon.icon-edit.edit
+        use(xlink:href="#icon-edit")
 
 .edit-description
     textarea(ng-attr-placeholder="{{'COMMON.DESCRIPTION.EMPTY' | translate}}", ng-model="item.description", tg-markitup="tg-markitup")
     +wysihelp
     span.save-container
-        a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
+        svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+            use(xlink:href="#icon-save")
diff --git a/app/partials/common/components/editable-subject.jade b/app/partials/common/components/editable-subject.jade
index f5d728bb..e4cc7bb2 100644
--- a/app/partials/common/components/editable-subject.jade
+++ b/app/partials/common/components/editable-subject.jade
@@ -1,7 +1,9 @@
 .view-subject
     | {{ item.subject }}
-    a.edit.icon.icon-edit(href="" title="{{'COMMON.EDIT' | translate}}")
+    svg.edit.icon.icon-edit(href="" title="{{'COMMON.EDIT' | translate}}")
+        use(xlink:href="#icon-edit")
 .edit-subject
     input(type="text", ng-model="item.subject", data-required="true", data-maxlength="500", ng-model-options="{ debounce: 200 }")
     span.save-container
-        a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
+        svg.save.icon.icon-save(href="", title="{{'COMMON.SAVE' | translate}}")
+            use(xlink:href="#icon-save")
diff --git a/app/partials/common/components/watchers.jade b/app/partials/common/components/watchers.jade
index fcbe398d..fb5d9771 100644
--- a/app/partials/common/components/watchers.jade
+++ b/app/partials/common/components/watchers.jade
@@ -10,11 +10,11 @@
         span <%- watcher.full_name_display %>
 
         <% if(isEditable){ %>
-        a.icon.icon-delete.js-delete-watcher(
-            href=""
+        svg.icon.icon-trash.js-delete-watcher.delete-watcher(
             data-watcher-id!="<%- watcher.id %>"
             title="{{'COMMON.WATCHERS.DELETE' | translate}}"
         )
+            use(xlink:href="#icon-trash")
         <% }; %>
 <% } %>
 <% }); %>
diff --git a/app/partials/common/components/wysiwyg.jade b/app/partials/common/components/wysiwyg.jade
index 3d90e44a..4c10f363 100644
--- a/app/partials/common/components/wysiwyg.jade
+++ b/app/partials/common/components/wysiwyg.jade
@@ -2,5 +2,6 @@ mixin wysihelp
     div.wysiwyg-help
         span.drag-drop-help Attach files by dragging & dropping on the textarea above.
         a.help-markdown(href="https://taiga.io/support/taiga-markdown-syntax/", target="_blank", title="{{'COMMON.WYSIWYG.MARKDOWN_HELP' | translate}}")
-            span.icon.icon-help
+            svg.icon.icon-question
+                use(xlink:href="#icon-question")
             span(translate="COMMON.WYSIWYG.MARKDOWN_HELP")
diff --git a/app/partials/common/estimation/us-estimation-points-per-role.jade b/app/partials/common/estimation/us-estimation-points-per-role.jade
index 86bf489c..298960c0 100644
--- a/app/partials/common/estimation/us-estimation-points-per-role.jade
+++ b/app/partials/common/estimation/us-estimation-points-per-role.jade
@@ -3,7 +3,8 @@ ul.points-per-role
     li.ticket-role-points.total(class!="<% if(editable){ %>clickable<% } %>", data-role-id!="<%- role.id %>", title!="<%- role.name %>")
         span.points 
             <%- role.points %>
-            span.icon-arrow-bottom
+            svg.icon.icon-arrow-down
+                use(xlink:href="#icon-arrow-down")
         span.role 
             <%- role.name %>
     <% }); %>
diff --git a/app/partials/common/estimation/us-estimation-total.jade b/app/partials/common/estimation/us-estimation-total.jade
index 235494bb..013bd495 100644
--- a/app/partials/common/estimation/us-estimation-total.jade
+++ b/app/partials/common/estimation/us-estimation-total.jade
@@ -1,5 +1,6 @@
 a.us-points(href="", title!="<%= title %>", class!="<% if (!editable) { %>not-clickable<% } %>")
     span.points-value <%= text %>
     <% if (editable) { %>
-    span.icon.icon-arrow-bottom(tg-check-permission="modify_us")
+    svg.icon.icon-arrow-down(tg-check-permission="modify_us")
+        use(xlink:href="#icon-arrow-down")
     <% } %>
diff --git a/app/partials/common/history/history-activity.jade b/app/partials/common/history/history-activity.jade
index a49c3fb6..7a7ce6ff 100644
--- a/app/partials/common/history/history-activity.jade
+++ b/app/partials/common/history/history-activity.jade
@@ -1,4 +1,4 @@
-div(class!="activity-single <%- mode %>")
+.activity-single(class!="<%- mode %>")
     .activity-user
         a.avatar(href!="<%- userProfileUrl %>", title!="<%- userFullName %>")
             img(src!="<%- avatar %>", alt!="<%- userFullName %>")
@@ -18,11 +18,11 @@ div(class!="activity-single <%- mode %>")
         .comment.wysiwyg(ng-non-bindable)
             | <%= comment %>
             <% if (!deleteCommentDate && mode !== "activity" && canDeleteComment) { %>
-            a.icon.icon-delete.comment-delete(
-                href=""
+            svg.icon.icon-trash.comment-delete(
                 data-activity-id!="<%- activityId %>"
                 title!="<%- deleteCommentActionTitle %>"
             )
+                use(xlink:href="#icon-trash")
             <% } %>
         <% } %>
 
@@ -31,7 +31,8 @@ div(class!="activity-single <%- mode %>")
             <% if (mode != "activity") { %>
             a.changes-title(href="", title="{{'ACTIVITY.SHOW_ACTIVITY' | translate}}")
                 span <%- changesText %>
-                span.icon.icon-arrow-up
+                svg.icon.icon-arrow-right
+                    use(xlink:href="#icon-arrow-right")
             <% } %>
             <% _.each(changes, function(change) { %>
             | <%= change %>
diff --git a/app/partials/common/history/history-base.jade b/app/partials/common/history/history-base.jade
index ceef5a7c..3d8f1874 100644
--- a/app/partials/common/history/history-base.jade
+++ b/app/partials/common/history/history-base.jade
@@ -6,13 +6,15 @@ section.history
         <% if (commentsVisible) { %>
         li
             a(href="#", class="active", data-section-class="history-comments")
-                span.icon.icon-comment
+                svg.icon.icon-writer
+                    use(xlink:href="#icon-writer")
                 span.tab-title(translate="COMMENTS.TITLE")
         <% } %>
         <% if (historyVisible) { %>
         li
             a(href="#", data-section-class="history-activity")
-                span.icon.icon-issues
+                svg.icon.icon-timeline
+                    use(xlink:href="#icon-timeline")
                 span.tab-title(translate="ACTIVITY.TITLE")
         <% } %>
     <% } %>
diff --git a/app/partials/common/history/history-deleted-comment.jade b/app/partials/common/history/history-deleted-comment.jade
index fbbcd29d..51510e55 100644
--- a/app/partials/common/history/history-deleted-comment.jade
+++ b/app/partials/common/history/history-deleted-comment.jade
@@ -13,6 +13,7 @@
         data-activity-id!="<%- activityId %>"
         title="{{ 'COMMENTS.RESTORE' | translate }}"
     )
-        span.icon.icon-reload
+        svg.icon.icon-reload
+            use(xlink:href="#icon-reload")
         span(translate="COMMENTS.RESTORE")
     <% } %>
diff --git a/app/partials/common/lightbox-feedback.jade b/app/partials/common/lightbox-feedback.jade
index d985a8a6..f46019c6 100644
--- a/app/partials/common/lightbox-feedback.jade
+++ b/app/partials/common/lightbox-feedback.jade
@@ -1,5 +1,5 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.FEEDBACK.TITLE")
     fieldset
diff --git a/app/partials/common/lightbox/lightbox-assigned-to-users.jade b/app/partials/common/lightbox/lightbox-assigned-to-users.jade
index 49c44b9a..78916665 100644
--- a/app/partials/common/lightbox/lightbox-assigned-to-users.jade
+++ b/app/partials/common/lightbox/lightbox-assigned-to-users.jade
@@ -11,10 +11,11 @@
         title!="<%- selected.full_name_display %>"
     )
         | <%-selected.full_name_display %>
-    a.icon-delete.remove-assigned-to(
+    svg.icon.icon-close.remove-assigned-to(
         href="" 
         title="{{'COMMON.ASSIGNED_TO.REMOVE_ASSIGNED' | translate}}"
     )
+        use(xlink:href="#icon-close")
 <% } %>
 
 <% _.each(users, function(user) { %>
diff --git a/app/partials/common/lightbox/lightbox-assigned-to.jade b/app/partials/common/lightbox/lightbox-assigned-to.jade
index 7f00751d..b3947857 100644
--- a/app/partials/common/lightbox/lightbox-assigned-to.jade
+++ b/app/partials/common/lightbox/lightbox-assigned-to.jade
@@ -1,5 +1,6 @@
-a.close(href="", title="close")
-    span.icon.icon-delete
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
+    
 div.form
     h2.title(translate="LIGHTBOX.ASSIGNED_TO.SELECT")
     fieldset
diff --git a/app/partials/common/lightbox/lightbox-attachment-preview.jade b/app/partials/common/lightbox/lightbox-attachment-preview.jade
index b1b1ebb5..bf401bbf 100644
--- a/app/partials/common/lightbox/lightbox-attachment-preview.jade
+++ b/app/partials/common/lightbox/lightbox-attachment-preview.jade
@@ -1,6 +1,6 @@
 .attachment-preview
-    a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-        span.icon.icon-delete
+    svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+        use(xlink:href="#icon-close")
 
     a(href="{{::file.get('url')}}", title="{{::file.get('description')}}", target="_blank", download="{{::file.get('name')}}")
-        img(src="{{::file.get('url')}}")
\ No newline at end of file
+        img(src="{{::file.get('url')}}")
diff --git a/app/partials/common/lightbox/lightbox-block.jade b/app/partials/common/lightbox/lightbox-block.jade
index b74ee6d4..d7bd60da 100644
--- a/app/partials/common/lightbox/lightbox-block.jade
+++ b/app/partials/common/lightbox/lightbox-block.jade
@@ -1,5 +1,5 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
 div.form
     h2.title
     fieldset
diff --git a/app/partials/common/lightbox/lightbox-users.jade b/app/partials/common/lightbox/lightbox-users.jade
index 2c43e246..d6693258 100644
--- a/app/partials/common/lightbox/lightbox-users.jade
+++ b/app/partials/common/lightbox/lightbox-users.jade
@@ -1,5 +1,5 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
 div.form
     h2.title(translate="COMMON.WATCHERS.ADD")
     fieldset
diff --git a/app/partials/common/tag/lb-tag-line-tags.jade b/app/partials/common/tag/lb-tag-line-tags.jade
index fb6be1eb..7f95583e 100644
--- a/app/partials/common/tag/lb-tag-line-tags.jade
+++ b/app/partials/common/tag/lb-tag-line-tags.jade
@@ -1,5 +1,6 @@
 <% _.each(tags, function(tag) { %>
 span(class="tag", style!="<%- tag.style %>")
     span.tag-name <%- tag.name %>
-    a(href="", title="{{ 'COMMON.TAGS.DELETE' | translate }}", class="icon icon-delete")
+    svg.icon.icon-close.remove-tag(title="{{ 'COMMON.TAGS.DELETE' | translate }}")
+        use(xlink:href="#icon-close")
 <% }); %>
diff --git a/app/partials/common/tag/lb-tag-line.jade b/app/partials/common/tag/lb-tag-line.jade
index 1c06a23e..5fe8414b 100644
--- a/app/partials/common/tag/lb-tag-line.jade
+++ b/app/partials/common/tag/lb-tag-line.jade
@@ -1,3 +1,8 @@
 .tags-container
-input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input")
-a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden")
+input.tag-input(
+    type="text"
+    placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}"
+)
+span.save.hidden(title="{{'COMMON.SAVE' | translate}}")
+    svg.icon.icon-save
+        use(xlink:href="#icon-save")
diff --git a/app/partials/common/tag/tag-line.jade b/app/partials/common/tag/tag-line.jade
index 06040a9e..2d205441 100644
--- a/app/partials/common/tag/tag-line.jade
+++ b/app/partials/common/tag/tag-line.jade
@@ -1,8 +1,11 @@
 .tags-container
 a(href="#", class="add-tag hidden", title="{{'COMMON.TAGS.ADD' | translate}}")
-    span.icon.icon-plus
+    svg.icon.icon-add
+        use(xlink:href="#icon-add")
     span.add-tag-text(translate="COMMON.TAGS.ADD")
 
 span.add-tag-input
     input(type="text", placeholder="{{'COMMON.TAGS.PLACEHOLDER' | translate}}", class="tag-input hidden")
-    a(href="", title="{{'COMMON.SAVE' | translate}}", class="save icon icon-floppy hidden")
+    span.save.hidden(title="{{'COMMON.SAVE' | translate}}")
+        svg.icon.icon-save
+            use(xlink:href="#icon-save")
diff --git a/app/partials/common/tag/tags-line-tags.jade b/app/partials/common/tag/tags-line-tags.jade
index c9b0dbd9..9ea57c69 100644
--- a/app/partials/common/tag/tags-line-tags.jade
+++ b/app/partials/common/tag/tags-line-tags.jade
@@ -2,6 +2,7 @@
 span(class="tag", style!="border-left: 5px solid <%- tag.color %>;")
     span.tag-name <%- tag.name %>
     <% if (isEditable) { %>
-    a(href="", title="{{ 'COMMON.TAGS.DELETE' | translate }}", class="icon icon-delete")
+    svg.icon.icon-close.remove-tag(title="{{ 'COMMON.TAGS.DELETE' | translate }}")
+        use(xlink:href="#icon-close")
     <% } %>
 <% }); %>
diff --git a/app/partials/common/wysiwyg/wysiwyg-markitup-preview.jade b/app/partials/common/wysiwyg/wysiwyg-markitup-preview.jade
index a674385d..791c2d2b 100644
--- a/app/partials/common/wysiwyg/wysiwyg-markitup-preview.jade
+++ b/app/partials/common/wysiwyg/wysiwyg-markitup-preview.jade
@@ -1,5 +1,6 @@
 .preview
     .actions
-        a(href="#" title="{{'COMMON.WYSIWYG.EDIT_BUTTON' | translate}}" class="icon icon-edit edit")
+        svg.edit.icon.icon-edit(title="{{'COMMON.WYSIWYG.EDIT_BUTTON' | translate}}")
+            use(xlink:href="#icon-edit")
         .content.wysiwyg
             | <%= data %>
diff --git a/app/partials/custom-attributes/custom-attribute-value-edit.jade b/app/partials/custom-attributes/custom-attribute-value-edit.jade
index 1f90518e..a62c4f53 100644
--- a/app/partials/custom-attributes/custom-attribute-value-edit.jade
+++ b/app/partials/custom-attributes/custom-attribute-value-edit.jade
@@ -22,4 +22,5 @@ form.custom-field-single.editable
         <% } %>
 
     div.custom-field-options
-        a.icon.icon-floppy(href="", title="{{'COMMON.CUSTOM_ATTRIBUTES.SAVE' | translate}}")
+        svg.icon.icon-save.js-save-description(title="{{'COMMON.CUSTOM_ATTRIBUTES.SAVE' | translate}}")
+            use(xlink:href="#icon-save")
diff --git a/app/partials/custom-attributes/custom-attribute-value.jade b/app/partials/custom-attributes/custom-attribute-value.jade
index c89dbd06..51e7bfeb 100644
--- a/app/partials/custom-attributes/custom-attribute-value.jade
+++ b/app/partials/custom-attributes/custom-attribute-value.jade
@@ -1,5 +1,5 @@
-div.custom-field-single
-    div.custom-field-data
+.custom-field-single
+    .custom-field-data
         span.custom-field-name
             <%- name %>
         <% if (description){ %>
@@ -7,7 +7,7 @@ div.custom-field-single
             <%- description %>
         <% } %>
 
-    div.custom-field-value.js-value-view-mode
+    .custom-field-value.js-value-view-mode
         span
             <% if (type=="url") { %>
             a(href!="<%- value %>")
@@ -17,6 +17,7 @@ div.custom-field-single
             <% } %>
 
     <% if (isEditable) { %>
-    div.custom-field-options
-        a.icon.icon-edit(href="", title="{{'COMMON.CUSTOM_ATTRIBUTES.EDIT' | translate}}")
+    .custom-field-options
+        svg.icon.icon-edit.js-edit-description(title="{{'COMMON.CUSTOM_ATTRIBUTES.EDIT' | translate}}")
+            use(xlink:href="#icon-edit")
     <% } %>
diff --git a/app/partials/custom-attributes/custom-attributes-values.jade b/app/partials/custom-attributes/custom-attributes-values.jade
index 3c34c6e1..09d7ecf9 100644
--- a/app/partials/custom-attributes/custom-attributes-values.jade
+++ b/app/partials/custom-attributes/custom-attributes-values.jade
@@ -2,6 +2,7 @@ section.duty-custom-fields(ng-show="ctrl.customAttributes.length")
     div.custom-fields-header
         span(translate="COMMON.CUSTOM_ATTRIBUTES.CUSTOM_FIELDS")
         // Remove .open class on click on this button in both .icon and .custom-fields-body to close
-        a.icon.icon-arrow-bottom(class!="<% if (!collapsed) { %>open<% } %>")
+        svg.icon.icon-arrow-down(class!="<% if (!collapsed) { %>open<% } %>")
+            use(xlink:href="#icon-arrow-down")
     div.custom-fields-body(class!="<% if (!collapsed) { %>open<% } %>")
         div(ng-repeat="att in ctrl.customAttributes", tg-custom-attribute-value="ctrl.getAttributeValue(att)", required-edition-perm!="<%- requiredEditionPerm %>")
diff --git a/app/partials/includes/components/addnewtask.jade b/app/partials/includes/components/addnewtask.jade
index fd25ed2d..6de3e427 100644
--- a/app/partials/includes/components/addnewtask.jade
+++ b/app/partials/includes/components/addnewtask.jade
@@ -1,6 +1,14 @@
-a.icon.icon-plus(tg-check-permission="add_task",
-                 href="", title="{{'TASKBOARD.TITLE_ACTION_ADD' | translate}}",
-                 ng-click="ctrl.addNewTask('standard', us)")
-a.icon.icon-bulk(tg-check-permission="add_task",
-                 href="", title="{{'TASKBOARD.TITLE_ACTION_ADD_BULK' | translate}}",
-                 ng-click="ctrl.addNewTask('bulk', us)")
+svg.icon.icon-add(
+    tg-check-permission="add_task"
+    href=""
+    title="{{'TASKBOARD.TITLE_ACTION_ADD' | translate}}"
+    ng-click="ctrl.addNewTask('standard', us)"
+)
+    use(xlink:href="#icon-add")
+svg.icon.icon-bulk(
+    tg-check-permission="add_task"
+    href=""
+    title="{{'TASKBOARD.TITLE_ACTION_ADD_BULK' | translate}}"
+    ng-click="ctrl.addNewTask('bulk', us)"
+)
+    use(xlink:href="#icon-bulk")
diff --git a/app/partials/includes/components/addnewus.jade b/app/partials/includes/components/addnewus.jade
index 52f59b9a..27a9d870 100644
--- a/app/partials/includes/components/addnewus.jade
+++ b/app/partials/includes/components/addnewus.jade
@@ -6,4 +6,5 @@ div.new-us
     a.button-bulk(href="", title="{{'US.ADD_BULK' | translate}}",
                          ng-click="ctrl.addNewUs('bulk')",
                          tg-check-permission="add_us")
-        span.icon.icon-bulk
+        svg.icon.icon-bulk
+            use(xlink:href="#icon-bulk")
diff --git a/app/partials/includes/components/backlog-row.jade b/app/partials/includes/components/backlog-row.jade
index 99684c1b..e564a31b 100644
--- a/app/partials/includes/components/backlog-row.jade
+++ b/app/partials/includes/components/backlog-row.jade
@@ -13,7 +13,8 @@ div.row.us-item-row(
         ng-class="{'inactive': !us.total_voters, 'is-voted': us.is_voter}"
         title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:us.total_voters||0}:'messageformat' }}"
     )
-        span.icon.icon-caret-up
+        svg.icon.icon-upvote
+            use(xlink:href="#icon-upvote")
         span {{ ::us.total_voters }}
     div.user-stories
         div.tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog")
@@ -27,25 +28,33 @@ div.row.us-item-row(
                 span(tg-bo-ref="us.ref")
                 span(ng-bind="us.subject")
             div.us-settings
-                a.icon.icon-edit(
+                a.edit-story(
                     href=""
                     tg-check-permission="modify_us"
                     ng-click="ctrl.editUserStory(us.project, us.ref, $event)"
                     title="{{'COMMON.EDIT' | translate}}"
                 )
-                a.icon.icon-delete(
+                    svg.icon.icon-edit
+                        use(xlink:href="#icon-edit")
+                    
+                a.icon-delete(
                     href=""
                     tg-check-permission="delete_us"
                     ng-click="ctrl.deleteUserStory(us)"
                     title="{{'COMMON.DELETE' | translate}}"
                 )
+                    svg.icon.icon-trash
+                        use(xlink:href="#icon-trash")
 
     div.status(tg-us-status="us" on-update="ctrl.updateUserStoryStatus()")
         a.us-status(href="", title="{{'BACKLOG.STATUS_NAME' | translate}}")
             span.us-status-bind
-            span.icon.icon-arrow-bottom(tg-check-permission="modify_us")
+            svg.icon.icon-arrow-down(tg-check-permission="modify_us")
+                use(xlink:href="#icon-arrow-down")
 
     div.points(tg-backlog-us-points="us")
         a.us-points(href="", title="{{'COMMON.FIELDS.POINTS' | translate}}")
 
-    a.icon.icon-drag-v(tg-check-permission="modify_us", href="", title="{{'COMMON.DRAG' | translate}}")
+    a(tg-check-permission="modify_us", href="", title="{{'COMMON.DRAG' | translate}}")
+        svg.icon.icon-drag
+            use(xlink:href="#icon-drag")
diff --git a/app/partials/includes/components/notification-message.jade b/app/partials/includes/components/notification-message.jade
index 82b3ab05..4597bd30 100644
--- a/app/partials/includes/components/notification-message.jade
+++ b/app/partials/includes/components/notification-message.jade
@@ -15,15 +15,18 @@ div.notification-message.notification-message-success
        p(translate="NOTIFICATION.SAVED")
 
 div.notification-message.notification-message-error
-    div.icon.icon-notification-error
+    svg.icon.icon-error
+        use(xlink:href="#icon-error")
     div.text
         h4.warning(translate="NOTIFICATION.WARNING")
         p(translate="NOTIFICATION.WARNING_TEXT")
-    a.icon.icon-delete(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
+    svg.icon.icon-close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
+        use(xlink:href="#icon-close")
 
 div.notification-light.notification-message-light-error
     div.text
         h4.warning(translate="NOTIFICATION.WARNING")
         p(translate="NOTIFICATION.WARNING_TEXT")
     a.close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
-        include ../../../svg/remove.svg
+        svg.icon.icon-close
+            use(xlink:href="#icon-close")
diff --git a/app/partials/includes/components/sprint-summary.jade b/app/partials/includes/components/sprint-summary.jade
index 5fbe8e4e..87244b25 100644
--- a/app/partials/includes/components/sprint-summary.jade
+++ b/app/partials/includes/components/sprint-summary.jade
@@ -13,7 +13,8 @@ div.summary.large-summary
             span.description(translate="BACKLOG.SPRINT_SUMMARY.COMPLETED_POINTS")
 
         div.summary-stats
-            span.icon.icon-bulk
+            svg.icon.icon-bulk
+                use(xlink:href="#icon-bulk")
             span.number(ng-bind="stats.openTasks|default:'--'")
             span.description(translate="BACKLOG.SPRINT_SUMMARY.OPEN_TASKS")
         div.summary-stats
@@ -21,9 +22,11 @@ div.summary.large-summary
             span.description(translate="BACKLOG.SPRINT_SUMMARY.CLOSED_TASKS")
 
         div.summary-stats(title="{{'COMMON.IOCAINE_TEXT' | translate}}")
-            span.icon.icon-iocaine
+            svg.icon.icon-iocaine
+                use(xlink:href="#icon-iocaine")
             span.number(ng-bind="stats.iocaine_doses|default:'--'")
             span.description(translate="BACKLOG.SPRINT_SUMMARY.IOCAINE_DOSES")
             
     div.stats.toggle-analytics-visibility(title="{{'BACKLOG.SPRINT_SUMMARY.SHOW_STATISTICS_TITLE' | translate}}")
-        include ../../../svg/graph.svg
+        svg.icon.icon-graph
+            use(xlink:href="#icon-graph")
diff --git a/app/partials/includes/components/summary.jade b/app/partials/includes/components/summary.jade
index 81ba9d4b..b6698321 100644
--- a/app/partials/includes/components/summary.jade
+++ b/app/partials/includes/components/summary.jade
@@ -22,4 +22,5 @@ div.summary
           title="{{'BACKLOG.SPRINT_SUMMARY.TOGGLE_BAKLOG_GRAPH' | translate}}",
           ng-if="!showGraphPlaceholder"
         )
-        include ../../../svg/graph.svg
+        svg.icon.icon-graph
+            use(xlink:href="#icon-graph")
diff --git a/app/partials/includes/components/taskboard-task.jade b/app/partials/includes/components/taskboard-task.jade
index dd34369e..4716a763 100644
--- a/app/partials/includes/components/taskboard-task.jade
+++ b/app/partials/includes/components/taskboard-task.jade
@@ -1,11 +1,18 @@
 div.taskboard-tagline(tg-colorize-tags="task.tags", tg-colorize-tags-type="taskboard")
 div.taskboard-task-inner
     div.taskboard-user-avatar(tg-taskboard-user-avatar, users="usersById", task="task", project="project", ng-class="{iocaine: task.is_iocaine}")
-    span.icon.icon-iocaine(ng-if="task.is_iocaine", title="{{'COMMON.IOCAINE_TEXT' | translate}}")
+    svg.icon.icon-iocaine(
+        ng-if="task.is_iocaine"
+        title="{{'COMMON.IOCAINE_TEXT' | translate}}"
+    )
+        use(xlink:href="#icon-iocaine")
     p.taskboard-text
         a.task-assigned(href="", title="{{'TASKBOARD.TITLE_ACTION_ASSIGN' | translate}}")
         span.task-num(tg-bo-ref="task.ref")
         a.task-name(href="", title="#{{ ::task.ref }} {{ ::task.subject }}", ng-bind="task.subject",
                     tg-nav="project-tasks-detail:project=project.slug,ref=task.ref")
-    a.icon.icon-edit(tg-check-permission="modify_task",
-        href="", title="{{'TASKBOARD.TITLE_ACTION_EDIT' | translate}}")
+    svg.icon.icon-edit(
+        tg-check-permission="modify_task"
+        title="{{'TASKBOARD.TITLE_ACTION_EDIT' | translate}}"
+    )
+        use(xlink:href="#icon-edit")
diff --git a/app/partials/includes/modules/admin/admin-custom-attributes.jade b/app/partials/includes/modules/admin/admin-custom-attributes.jade
index bb03c36c..073dcbe5 100644
--- a/app/partials/includes/modules/admin/admin-custom-attributes.jade
+++ b/app/partials/includes/modules/admin/admin-custom-attributes.jade
@@ -22,7 +22,8 @@ section.custom-fields-table.basic-table
             div(ng-repeat="attr in customAttributes track by attr.id", tg-bind-scope)
                 form.js-form(tg-bind-scope)
                     div.row.single-custom-field.js-view-custom-field
-                        span.icon.icon-drag-v
+                        svg.icon.icon-drag
+                            use(xlink:href="#icon-drag")
                         div.custom-name
                             span {{ attr.name }}
                         div.custom-description
@@ -35,14 +36,16 @@ section.custom-fields-table.basic-table
                             span(ng-switch-when="url", translate="ADMIN.CUSTOM_FIELDS.FIELD_TYPE_URL")
                         div.custom-options
                             div.custom-options-wrapper
-                                a.js-edit-custom-field-button.icon.icon-edit(
+                                svg.js-edit-custom-field-button.icon.icon-edit(
                                     href=""
                                     title="{{'ADMIN.CUSTOM_ATTRIBUTES.EDIT' | translate}}"
                                 )
-                                a.js-delete-custom-field-button.icon.icon-delete(
+                                    use(xlink:href="#icon-edit")
+                                svg.js-delete-custom-field-button.icon.icon-trash(
                                     href=""
                                     title="{{'ADMIN.CUSTOM_ATTRIBUTES.DELETE' | translate}}"
                                 )
+                                    use(xlink:href="#icon-trash")
 
                     div.row.single-custom-field.js-edit-custom-field.hidden
                         fieldset.custom-name
@@ -68,14 +71,16 @@ section.custom-fields-table.basic-table
                             )
                         fieldset.custom-options
                             div.custom-options-wrapper
-                                a.js-update-custom-field-button.icon.icon-floppy(
+                                svg.js-update-custom-field-button.icon.icon-save(
                                     href=""
                                     title="{{'ADMIN.CUSTOM_ATTRIBUTES.ACTION_UPDATE' | translate}}"
                                 )
-                                a.js-cancel-edit-custom-field-button.icon.icon-delete(
+                                    use(xlink:href="#icon-save")
+                                svg.js-cancel-edit-custom-field-button.icon.icon-close(
                                     href=""
                                     title="{{'ADMIN.CUSTOM_ATTRIBUTES.ACTION_CANCEL_EDITION' | translate}}"
                                 )
+                                    use(xlink:href="#icon-close")
 
         form.row.single-custom-field.js-new-custom-field.hidden
             fieldset.custom-name
@@ -103,11 +108,13 @@ section.custom-fields-table.basic-table
 
             fieldset.custom-options
                 div.custom-options-wrapper
-                    a.js-create-custom-field-button.icon.icon-floppy(
+                    svg.js-create-custom-field-button.icon.icon-save(
                         href=""
                         title="{{'ADMIN.CUSTOM_ATTRIBUTES.SAVE_TITLE' | translate}}"
                     )
-                    a.js-cancel-new-custom-field-button.icon.icon-delete(
+                        use(xlink:href="#icon-save")
+                    svg.js-cancel-new-custom-field-button.icon.icon-trash(
                         href=""
                         title="{{'ADMIN.CUSTOM_ATTRIBUTES.CANCEL_TITLE' | translate}}"
                     )
+                        use(xlink:href="#icon-trash")
diff --git a/app/partials/includes/modules/admin/project-points.jade b/app/partials/includes/modules/admin/project-points.jade
index bb991265..6189a3d7 100644
--- a/app/partials/includes/modules/admin/project-points.jade
+++ b/app/partials/includes/modules/admin/project-points.jade
@@ -18,7 +18,8 @@ section.project-values-table
             div(ng-repeat="value in values track by value.id", tg-bind-scope)
                 form(tg-bind-scope)
                     div.project-values-row.row.table-main.visualization
-                        span.icon.icon-drag-v
+                        svg.icon.icon-drag
+                            use(xlink:href="#icon-drag")
 
                         div.project-values-name
                             span {{ value.name }}
@@ -27,8 +28,10 @@ section.project-values-table
                             span {{ value.value }}
 
                         div.project-values-settings
-                            a.edit-value.icon.icon-edit(href="", title="{{'ADMIN.POINTS.TITLE_ACTION_EDIT_VALUE' | translate}}")
-                            a.delete-value.icon.icon-delete(href="", title="{{'ADMIN.POINTS.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                            svg.edit-value.icon.icon-edit(title="{{'ADMIN.POINTS.TITLE_ACTION_EDIT_VALUE' | translate}}")
+                                use(xlink:href="#icon-edit")
+                            svg.delete-value.icon.icon-trash(title="{{'ADMIN.POINTS.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                                use(xlink:href="#icon-trash")
 
                     div.project-values-row.row.table-main.edition.hidden
                         div.project-values-name
@@ -38,19 +41,33 @@ section.project-values-table
                             input(name="value", type="text", placeholder="{{'COMMON.FIELDS.VALUE' | translate}}", ng-model="value.value", data-type="number")
 
                         div.project-values-settings
-                            a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
-                            a.cancel.icon.icon-delete(href="", title="{{'COMON.CANCEL' | translate}}")
+                            svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+                                use(xlink:href="#icon-save")
+                            svg.cancel.icon.icon-close(href="", title="{{'COMON.CANCEL' | translate}}")
+                                use(xlink:href="#icon-close")
 
         form
             div.project-values-row.new-value.hidden
                 div.project-values-name
-                     input(name="name", type="text", placeholder="{{'COMMON.FIELDS.NAME' | translate}}", ng-model="newValue.name",
-                         data-required="true")
+                    input(
+                        name="name"
+                        type="text"
+                        placeholder="{{'COMMON.FIELDS.NAME' | translate}}"
+                        ng-model="newValue.name"
+                        data-required="true"
+                    )
 
                 div.project-values-value
-                    input("name=value", type="text", placeholder="{{'COMMON.FIELDS.VALUE' | translate}}", ng-model="newValue.value",
-                          data-type="number")
+                    input(
+                        name="value"
+                        type="text"
+                        placeholder="{{'COMMON.FIELDS.VALUE' | translate}}"
+                        ng-model="newValue.value"
+                        data-type="number"
+                    )
 
                 div.project-values-settings
-                    a.add-new.icon.icon-floppy(href="", title="{{'COMMON.ADD' | translate}}")
-                    a.delete-new.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                    svg.add-new.icon.icon-save(title="{{'COMMON.ADD' | translate}}")
+                        use(xlink:href="#icon-save")
+                    svg.delete-new.icon.icon-trash(title="{{'COMMON.CANCEL' | translate}}")
+                        use(xlink:href="#icon-trash")
diff --git a/app/partials/includes/modules/admin/project-status.jade b/app/partials/includes/modules/admin/project-status.jade
index 40c5c799..1540413d 100644
--- a/app/partials/includes/modules/admin/project-status.jade
+++ b/app/partials/includes/modules/admin/project-status.jade
@@ -17,7 +17,8 @@ section.colors-table.admin-status-table
             div(ng-repeat="value in values", tg-bind-scope)
                 form(tg-bind-scope)
                     div.row.table-main.visualization
-                        span.icon.icon-drag-v
+                        svg.icon.icon-drag
+                            use(xlink:href="#icon-drag")
                         div.color-column
                             div.current-color(ng-style="{background: value.color}")
 
@@ -28,43 +29,75 @@ section.colors-table.admin-status-table
                             span {{ value.slug }}
 
                         div.is-closed-column
-                            div.icon.icon-check-square(ng-show="value.is_closed")
+                            svg.icon.icon-check(ng-show="value.is_closed")
+                                use(xlink:href="#icon-check")
 
                         div.options-column
-                            a.edit-value.icon.icon-edit(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
-                            a.delete-value.icon.icon-delete(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                            svg.edit-value.icon.icon-edit(title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
+                                use(xlink:href="#icon-edit")
+                            svg.delete-value.icon.icon-trash(title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                                use(xlink:href="#icon-trash")
 
                     div.row.table-main.edition.hidden
-                        div.color-column(tg-color-selection, ng-model="value")
+                        div.color-column(
+                            tg-color-selection
+                            ng-model="value"
+                        )
                             div.current-color(ng-style="{background: value.color}")
                             include ../../components/select-color
 
                         div.status-name
-                            input(name="name", type="text", placeholder="{{'ADMIN.STATUS.PLACEHOLDER_WRITE_STATUS_NAME' | translate}}",
-                                  ng-model="value.name", data-required="true", data-maxlength="255")
+                            input(
+                                name="name"
+                                type="text"
+                                placeholder="{{'ADMIN.STATUS.PLACEHOLDER_WRITE_STATUS_NAME' | translate}}"
+                                ng-model="value.name"
+                                data-required="true"
+                                data-maxlength="255"
+                            )
 
                         div.is-closed-column
-                            select(name="is_closed", ng-model="value.is_closed", data-required="true",
-                                   ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                            select(
+                                name="is_closed"
+                                ng-model="value.is_closed"
+                                data-required="true"
+                                ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
 
                         div.options-column
-                            a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
-                        a.cancel.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                            svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+                                use(xlink:href="#icon-save")
+                        svg.cancel.icon.icon-close(title="{{'COMMON.CANCEL' | translate}}")
+                            use(xlink:href="#icon-close")
 
         form
             div.row.table-main.new-value.hidden
-                div.color-column(tg-color-selection, ng-model="newValue")
+                div.color-column(
+                    tg-color-selection
+                    ng-model="newValue"
+                )
                     div.current-color(ng-style="{background: newValue.color}")
                     include ../../components/select-color
 
                 div.status-name
-                    input(name="name", type="text", placeholder="{{'ADMIN.STATUS.PLACEHOLDER_WRITE_STATUS_NAME' | translate}}",
-                          ng-model="newValue.name", data-required="true", data-maxlength="255")
+                    input(
+                        name="name"
+                        type="text"
+                        placeholder="{{'ADMIN.STATUS.PLACEHOLDER_WRITE_STATUS_NAME' | translate}}"
+                        ng-model="newValue.name"
+                        data-required="true"
+                        data-maxlength="255"
+                    )
 
                 div.is-closed-column
-                    select(name="is_closed", ng-model="newValue.is_closed", data-required="true",
-                           ng-options="e.id as e.name | translate for e in [{'id':true, 'name': 'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                    select(
+                        name="is_closed"
+                        ng-model="newValue.is_closed"
+                        data-required="true"
+                        ng-options="e.id as e.name | translate for e in [{'id':true, 'name': 'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
+                    )
 
                 div.options-column
-                    a.add-new.icon.icon-floppy(href="", title="{{'COMMON.ADD' | translate}}")
-                    a.delete-new.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                    svg.add-new.icon.icon-save(title="{{'COMMON.ADD' | translate}}")
+                        use(xlink:href="#icon-save")
+                    svg.delete-new.icon.icon-close(title="{{'COMMON.CANCEL' | translate}}")
+                        use(xlink:href="#icon-close")
diff --git a/app/partials/includes/modules/admin/project-types.jade b/app/partials/includes/modules/admin/project-types.jade
index cd69b129..12a53bce 100644
--- a/app/partials/includes/modules/admin/project-types.jade
+++ b/app/partials/includes/modules/admin/project-types.jade
@@ -16,7 +16,8 @@ section.colors-table
             div(ng-repeat="value in values", tg-bind-scope)
                 form(tg-bind-scope)
                     div.row.table-main.visualization
-                        span.icon.icon-drag-v
+                        svg.icon.icon-drag
+                            use(xlink:href="#icon-drag")
 
                         div.color-column
                             div.current-color(ng-style="{background: value.color}")
@@ -25,32 +26,56 @@ section.colors-table
                             span {{ value.name }}
 
                         div.options-column
-                            a.edit-value.icon.icon-edit(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
-                            a.delete-value.icon.icon-delete(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                            svg.edit-value.icon.icon-edit(title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
+                                use(xlink:href="#icon-edit")
+                            svg.delete-value.icon.icon-trash(title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                                use(xlink:href="#icon-trash")
 
                     div.row.table-main.edition.hidden
-                        div.color-column(tg-color-selection, ng-model="value")
+                        div.color-column(
+                            tg-color-selection
+                            ng-model="value"
+                        )
                             div.current-color(ng-style="{background: value.color}")
                             include ../../components/select-color
 
                         div.status-name
-                            input(name="name", type="text", placeholder="{{'ADMIN.TYPES.PLACEHOLDER_WRITE_NAME' | translate}}",
-                                  ng-model="value.name", data-required="true", data-maxlength="255")
+                            input(
+                                name="name"
+                                type="text"
+                                placeholder="{{'ADMIN.TYPES.PLACEHOLDER_WRITE_NAME' | translate}}",
+                                ng-model="value.name"
+                                data-required="true"
+                                data-maxlength="255"
+                            )
 
                         div.options-column
-                            a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
-                            a.cancel.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                            svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+                                use(xlink:href="#icon-save")
+                            svg.cancel.icon.icon-trash(title="{{'COMMON.CANCEL' | translate}}")
+                                use(xlink:href="#icon-trash")
 
         form
             div.row.table-main.new-value.hidden
-                div.color-column(tg-color-selection, ng-model="newValue")
+                div.color-column(
+                    tg-color-selection
+                    ng-model="newValue"
+                )
                     div.current-color(ng-style="{background: newValue.color}")
                     include ../../components/select-color
 
                 div.status-name
-                    input(name="name", type="text", placeholder="{{'ADMIN.TYPES.PLACEHOLDER_WRITE_NAME' | translate}}",
-                          ng-model="newValue.name", data-required="true", data-maxlength="255")
+                    input(
+                        name="name"
+                        type="text"
+                        placeholder="{{'ADMIN.TYPES.PLACEHOLDER_WRITE_NAME' | translate}}",
+                        ng-model="newValue.name"
+                        data-required="true"
+                        data-maxlength="255"
+                    )
 
                 div.options-column
-                    a.add-new.icon.icon-floppy(href="", title="{{'COMMON.ADD' | translate}}")
-                    a.delete-new.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                    svg.add-new.icon.icon-save(title="{{'COMMON.ADD' | translate}}")
+                        use(xlink:href="#icon-save")
+                    svg.delete-new.icon.icon-trash(title="{{'COMMON.CANCEL' | translate}}")
+                        use(xlink:href="#icon-trash")
diff --git a/app/partials/includes/modules/admin/project-us-status.jade b/app/partials/includes/modules/admin/project-us-status.jade
index cf583523..892990d8 100644
--- a/app/partials/includes/modules/admin/project-us-status.jade
+++ b/app/partials/includes/modules/admin/project-us-status.jade
@@ -21,7 +21,8 @@ section.project-us-status
                 div(ng-repeat="value in values", tg-bind-scope)
                     form(tg-bind-scope)
                         div.row.table-main.visualization
-                            span.icon.icon-drag-v
+                            svg.icon.icon-drag
+                                use(xlink:href="#icon-drag")
 
                             div.color-column
                                 div.current-color(ng-style="{background: value.color}")
@@ -33,44 +34,69 @@ section.project-us-status
                                 span {{ value.slug }}
 
                             div.is-closed-column
-                                div.icon.icon-check-square(ng-show="value.is_closed")
+                                svg.icon.icon-check(ng-show="value.is_closed")
+                                    use(xlink:href="#icon-check")
 
                             div.is-archived-column
-                                div.icon.icon-check-square(ng-show="value.is_archived")
+                                svg.icon.icon-check(ng-show="value.is_archived")
+                                    use(xlink:href="#icon-check")
 
                             div.status-wip-limit
                                 span(ng-hide="value.is_archived") {{ value.wip_limit }}
 
                             div.options-column
-                                a.edit-value.icon.icon-edit(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
-                                a.delete-value.icon.icon-delete(href="", title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                                svg.edit-value.icon.icon-edit(title="{{'ADMIN.COMMON.TITLE_ACTION_EDIT_VALUE' | translate}}")
+                                    use(xlink:href="#icon-edit")
+                                svg.delete-value.icon.icon-trash(title="{{'ADMIN.COMMON.TITLE_ACTION_DELETE_VALUE' | translate}}")
+                                    use(xlink:href="#icon-trash")
 
                         div.row.table-main.edition.hidden
-                            div.color-column(tg-color-selection, ng-model="value")
-                                div.current-color(ng-style="{background: value.color}")
+                            .color-column(tg-color-selection, ng-model="value")
+                                .current-color(ng-style="{background: value.color}")
                                 include ../../components/select-color
 
 
-                            div.status-name
-                                input(name="name", type="text", placeholder="{{'ADMIN.US_STATUS.PLACEHOLDER_WRITE_NAME' | translate}}",
-                                    ng-model="value.name", data-required="true", data-maxlength="255")
+                            .status-name
+                                input(
+                                    name="name"
+                                    type="text"
+                                    placeholder="{{'ADMIN.US_STATUS.PLACEHOLDER_WRITE_NAME' | translate}}",
+                                    ng-model="value.name"
+                                    data-required="true"
+                                    data-maxlength="255"
+                                )
 
-                            div.is-closed-column
-                                select(name="is_closed", ng-model="value.is_closed", data-required="true",
-                                       ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                            .is-closed-column
+                                select(
+                                    name="is_closed"
+                                    ng-model="value.is_closed"
+                                    data-required="true"
+                                    ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
+                                )
 
-                            div.is-archived-column
-                                select(name="is_archived", ng-model="value.is_archived", data-required="true",
-                                       ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                            .is-archived-column
+                                select(
+                                    name="is_archived"
+                                    ng-model="value.is_archived"
+                                    data-required="true"
+                                    ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
+                                )
 
-                            div.status-wip-limit
-                                input(name="wip_limit", type="number", ng-hide="value.is_archived",
-                                      ng-model="value.wip_limit", data-type="digits",
-                                      placeholder="{{'ADMIN.US_STATUS.WIP_LIMIT_COLUMN' | translate}}")
+                            .status-wip-limit
+                                input(
+                                    name="wip_limit"
+                                    type="number"
+                                    ng-hide="value.is_archived"
+                                    ng-model="value.wip_limit"
+                                    data-type="digits"
+                                    placeholder="{{'ADMIN.US_STATUS.WIP_LIMIT_COLUMN' | translate}}"
+                                )
 
-                            div.options-column
-                                a.save.icon.icon-floppy(href="", title="{{'COMMON.SAVE' | translate}}")
-                            a.cancel.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                            .options-column
+                                svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+                                    use(xlink:href="#icon-save")
+                            svg.cancel.icon.icon-close(title="{{'COMMON.CANCEL' | translate}}")
+                                use(xlink:href="#icon-close")
 
             form
                 div.row.table-main.new-value.hidden
@@ -79,23 +105,43 @@ section.project-us-status
                         include ../../components/select-color
 
                     div.status-name
-                        input(name="name", type="text",
-                              ng-model="newValue.name", data-required="true", data-maxlength="255",
-                              placeholder="{{'ADMIN.US_STATUS.PLACEHOLDER_WRITE_NAME' | translate}}")
+                        input(
+                            name="name"
+                            type="text"
+                            ng-model="newValue.name"
+                            data-required="true"
+                            data-maxlength="255"
+                            placeholder="{{'ADMIN.US_STATUS.PLACEHOLDER_WRITE_NAME' | translate}}"
+                        )
 
                     div.is-closed-column
-                        select(name="is_closed", ng-model="newValue.is_closed", data-required="true",
-                               ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                        select(
+                            name="is_closed"
+                            ng-model="newValue.is_closed"
+                            data-required="true"
+                            ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
+                        )
 
                     div.is-archived-column
-                        select(name="is_archived", ng-model="newValue.is_archived", data-required="true",
-                               ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]")
+                        select(
+                            name="is_archived"
+                            ng-model="newValue.is_archived"
+                            data-required="true"
+                            ng-options="e.id as e.name | translate for e in [{'id':true, 'name':'COMMON.YES'},{'id':false, 'name': 'COMMON.NO'}]"
+                        )
 
                     div.status-wip-limit
-                        input(name="wip_limit", type="number", ng-hide="newValue.is_archived",
-                              ng-model="newValue.wip_limit", data-type="digits",
-                              placeholder="{{'ADMIN.US_STATUS.WIP_LIMIT_COLUMN' | translate}}")
+                        input(
+                            name="wip_limit"
+                            type="number"
+                            ng-hide="newValue.is_archived"
+                            ng-model="newValue.wip_limit"
+                            data-type="digits"
+                            placeholder="{{'ADMIN.US_STATUS.WIP_LIMIT_COLUMN' | translate}}"
+                        )
 
                     div.options-column
-                        a.add-new.icon.icon-floppy(href="", title="{{'COMMON.ADD' | translate}}")
-                        a.delete-new.icon.icon-delete(href="", title="{{'COMMON.CANCEL' | translate}}")
+                        svg.add-new.icon.icon-save(title="{{'COMMON.ADD' | translate}}")
+                            use(xlink:href="#icon-save")
+                        svg.delete-new.icon.icon-trash(title="{{'COMMON.CANCEL' | translate}}")
+                            use(xlink:href="#icon-trash")
diff --git a/app/partials/includes/modules/backlog-filters.jade b/app/partials/includes/modules/backlog-filters.jade
index 056f65a0..01b04ad7 100644
--- a/app/partials/includes/modules/backlog-filters.jade
+++ b/app/partials/includes/modules/backlog-filters.jade
@@ -6,13 +6,19 @@ section.filters
         form
             fieldset
                 input(type="text", placeholder="{{'COMMON.FILTERS.INPUT_PLACEHOLDER' | translate}}", ng-model="filtersQ")
-                a.icon.icon-search(href="", title="{{'COMMON.FILTERS.TITLE_ACTION_FILTER_BUTTON' | translate}}")
+                svg.icon.icon-search(href="", title="{{'COMMON.FILTERS.TITLE_ACTION_FILTER_BUTTON' | translate}}")
+                    use(xlink:href="#icon-search")
 
         div.filters-step-cat
             div.filters-applied
             h2.hidden.breadcrumb
-                a.back(href="", title="{{'COMMON.FILTERS.BREADCRUMB_TITLE' | translate}}", translate="BACKLOG.FILTERS.TITLE")
-                span.icon-arrow-right
+                a.back(
+                    href=""
+                    title="{{'COMMON.FILTERS.BREADCRUMB_TITLE' | translate}}"
+                    translate="BACKLOG.FILTERS.TITLE"
+                )
+                svg.icon.icon-arrow-right
+                    use(xlink:href="#icon-arrow-right")
                 a.subfilter(href="")
                     span.title(translate="COMMON.FILTERS.BREADCRUMB_STATUS")
             div.filters-cats
@@ -20,10 +26,12 @@ section.filters
                     li
                         a(href="", title="{{'BACKLOG.FILTERS.FILTER_CATEGORY_STATUS' | translate}}", data-type="status")
                             span.title(translate="BACKLOG.FILTERS.FILTER_CATEGORY_STATUS")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{'BACKLOG.FILTERS.FILTER_CATEGORY_TAGS' | translate}}", data-type="tags")
                             span.title(translate="BACKLOG.FILTERS.FILTER_CATEGORY_TAGS")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
 
         div.filter-list.hidden
diff --git a/app/partials/includes/modules/backlog-table.jade b/app/partials/includes/modules/backlog-table.jade
index 9c3eab4c..b666dbe2 100644
--- a/app/partials/includes/modules/backlog-table.jade
+++ b/app/partials/includes/modules/backlog-table.jade
@@ -6,7 +6,8 @@ div.backlog-table-header
         div.status(translate="COMMON.FIELDS.STATUS")
         div.points(tg-us-role-points-selector, title="{{'BACKLOG.TABLE.TITLE_COLUMN_POINTS' | translate}}")
             span.header-points(translate="COMMON.FIELDS.POINTS")
-            span.icon.icon-arrow-bottom
+            svg.icon.icon-arrow-down
+                use(xlink:href="#icon-arrow-down")
 
 div.backlog-table-body(tg-backlog-sortable, ng-class="{'show-tags': ctrl.showTags, 'active-filters': ctrl.activeFilters}" )
     include ../components/backlog-row
diff --git a/app/partials/includes/modules/colors-table.jade b/app/partials/includes/modules/colors-table.jade
deleted file mode 100644
index b989422c..00000000
--- a/app/partials/includes/modules/colors-table.jade
+++ /dev/null
@@ -1,21 +0,0 @@
-section.colors-table
-    div.table-header
-        div.row
-            div.color-column(translate="COMMON.FIELDS.COLOR")
-            div.status-name(translate="COMMON.FIELDS.NAME")
-            div.is-closed-column(translate="COMMON.IS_CLOSED")
-            div.options-column
-
-    div.table-main
-        div.row.row-edit
-            div.color-column
-                div.current-color
-                include ../components/select-color
-
-            div.status-name
-                input(type="text")
-            div.is-closed-column
-                input(type="checkbox")
-            div.options-column
-                a.icon.icon-floppy(href="#")
-                a.icon.icon-delete(href="#")
diff --git a/app/partials/includes/modules/comment-activity.jade b/app/partials/includes/modules/comment-activity.jade
deleted file mode 100644
index 86eb047d..00000000
--- a/app/partials/includes/modules/comment-activity.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-div.us-activity
-    a.activity-title(ng-show="ctrl.countChanges(comment)", href="", title="{{'ACTIVITY.SHOW_ACTIVITY' | translate}}")
-        span(tg-bo-bind="ctrl.buildChangesText(comment)")
-        span.icon.icon-arrow-up
-
-    div.activity-inner(ng-repeat="(key, change) in comment.values_diff")
-        div.activity-changed
-            span(tg-bo-bind="key")
-        div.activity-fromto
-            p
-                strong(translate="COMMON.FROM")
-                br
-                span(tg-bo-bind="ctrl.getChangeText(change[0])")
-            p
-                strong(translate="COMMON.TO")
-                br
-                span(tg-bo-bind="ctrl.getChangeText(change[1])")
diff --git a/app/partials/includes/modules/issues-filters.jade b/app/partials/includes/modules/issues-filters.jade
index ab735773..b879fd56 100644
--- a/app/partials/includes/modules/issues-filters.jade
+++ b/app/partials/includes/modules/issues-filters.jade
@@ -6,13 +6,15 @@ section.filters
             fieldset
                 input(type="text", placeholder="{{'ISSUES.FILTERS.INPUT_SEARCH_PLACEHOLDER' | translate}}",
                       ng-model="filtersQ")
-                a.icon.icon-search(href="", title="{{'ISSUES.FILTERS.TITLE_ACTION_SEARCH' | translate}}")
+                svg.icon.icon-search(title="{{'ISSUES.FILTERS.TITLE_ACTION_SEARCH' | translate}}")
+                    use(xlink:href="#icon-search")
         div.filters-step-cat
             div.filters-applied
             a.hide.button.button-gray.save-filters(href="", title="{{'COMMON.SAVE' | translate}}", ng-class="{hide: filters.length}", translate="ISSUES.FILTERS.ACTION_SAVE_CUSTOM_FILTER")
             h2.hidden.breadcrumb
                 a.back(href="", title="{{'ISSUES.FILTERS.TITLE_BREADCRUMB' | translate}}", translate="ISSUES.FILTERS.BREADCRUMB")
-                span.icon-arrow-right
+                svg.icon.icon-arrow-right
+                    use(xlink:href="#icon-arrow-right")
                 a.subfilter(href="", title="cat-name")
                     span.title(translate="COMMON.FILTERS.BREADCRUMB_STATUS")
             div.filters-cats
@@ -20,35 +22,43 @@ section.filters
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.TYPE' | translate}}", data-type="types")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.TYPE")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.STATUS' | translate}}", data-type="status")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.STATUS")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.SEVERITY' | translate}}", data-type="severities")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.SEVERITY")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.PRIORITIES' | translate}}", data-type="priorities")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.PRIORITIES")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.TAGS' | translate}}", data-type="tags")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.TAGS")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.ASSIGNED_TO' | translate}}", data-type="assignedTo")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.ASSIGNED_TO")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.CREATED_BY' | translate}}", data-type="createdBy")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.CREATED_BY")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
                     li.custom-filters(ng-if="filters.myFilters.length")
                         a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.CUSTOM_FILTERS' | translate}}",
                           data-type="myFilters")
                             span.title(translate="ISSUES.FILTERS.CATEGORIES.CUSTOM_FILTERS")
-                            span.icon.icon-arrow-right
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
 
         div.filter-list.hidden
diff --git a/app/partials/includes/modules/issues-options.jade b/app/partials/includes/modules/issues-options.jade
index 4cbce556..2a9692eb 100644
--- a/app/partials/includes/modules/issues-options.jade
+++ b/app/partials/includes/modules/issues-options.jade
@@ -3,4 +3,5 @@ section.issues-options(tg-check-permission="add_issue")
         a.button-green(href="", ng-click="ctrl.addNewIssue()")
             span.text(translate="ISSUES.ACTION_NEW_ISSUE")
         a.button-bulk(href="", ng-click="ctrl.addIssuesInBulk()")
-            span.icon.icon-bulk
+            svg.icon.icon-bulk
+                use(xlink:href="#icon-bulk")
diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade
index ddf6ada0..e23a3025 100644
--- a/app/partials/includes/modules/issues-table.jade
+++ b/app/partials/includes/modules/issues-table.jade
@@ -20,7 +20,8 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
             ng-class="{'inactive': !issue.total_voters, 'is-voted': issue.is_voter}"
             title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:issue.total_voters||0}:'messageformat' }}"
         )
-            span.icon.icon-caret-up
+            svg.icon.icon-upvote
+                use(xlink:href="#icon-upvote")
             span {{ ::issue.total_voters }}
         div.subject
             a(
@@ -42,14 +43,16 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
                 title="{{'ISSUES.TABLE.TITLE_ACTION_CHANGE_STATUS' | translate}}"
             )
                 span.issue-status-bind
-                span.icon.icon-arrow-bottom(tg-check-permission="modify_issue")
+                svg.icon.icon-arrow-down(tg-check-permission="modify_issue")
+                    use(xlink:href="#icon-arrow-down")
 
         div.created-field(tg-bo-bind="issue.created_date|momentFormat:'DD MMM YYYY HH:mm'")
 
         div.assigned-field(tg-issue-assigned-to-inline-edition="issue")
             div.issue-assignedto(title="{{'ISSUES.TABLE.TITLE_ACTION_ASSIGNED_TO' | translate}}")
                 figure.avatar
-                span.icon.icon-arrow-bottom(tg-check-permission="modify_issue")
+                svg.icon.icon-arrow-down(tg-check-permission="modify_issue")
+                    use(xlink:href="#icon-arrow-down")
 
 section.empty-issues(ng-if="issues != undefined && issues.length == 0")
     img(
diff --git a/app/partials/includes/modules/kanban-table.jade b/app/partials/includes/modules/kanban-table.jade
index 5770b403..502fef51 100644
--- a/app/partials/includes/modules/kanban-table.jade
+++ b/app/partials/includes/modules/kanban-table.jade
@@ -7,37 +7,67 @@ div.kanban-table(tg-kanban-squish-column)
                                tg-class-permission="{'readonly': '!modify_task'}")
                 span(tg-bo-bind="s.name")
                 div.options
-                    a.icon.icon-vfold.hfold(href="", ng-click='foldStatus(s)',
-                                            title="{{'KANBAN.TITLE_ACTION_FOLD' | translate}}",
-                                            ng-class='{hidden:folds[s.id]}')
-                    a.icon.icon-vunfold.hunfold(href="", ng-click='foldStatus(s)',
-                                                title="{{'KANBAN.TITLE_ACTION_UNFOLD' | translate}}",
-                                                 ng-class='{hidden:!folds[s.id]}')
+                    a.option(
+                        href=""
+                        ng-click='foldStatus(s)'
+                        title="{{'KANBAN.TITLE_ACTION_FOLD' | translate}}"
+                        ng-class='{hidden:folds[s.id]}'
+                    )
+                        svg.icon.icon-fold-column
+                            use(xlink:href="#icon-fold-column")
+                    a.option.hunfold(
+                        href=""
+                        ng-click='foldStatus(s)'
+                        title="{{'KANBAN.TITLE_ACTION_UNFOLD' | translate}}"
+                        ng-class='{hidden:!folds[s.id]}'
+                    )
+                        svg.icon.icon-unfold-column
+                            use(xlink:href="#icon-unfold-column")
+                    a.option(
+                        href=""
+                        title="{{'KANBAN.TITLE_ACTION_FOLD_CARDS' | translate}}"
+                        ng-class="{hidden:statusViewModes[s.id] == 'minimized'}"
+                        ng-click="ctrl.updateStatusViewMode(s.id, 'minimized')"
+                    )
+                        svg.icon.icon-fold-row
+                            use(xlink:href="#icon-fold-row")
+                    a.option(
+                        href=""
+                        title="{{'KANBAN.TITLE_ACTION_UNFOLD_CARDS' | translate}}"
+                        ng-class="{hidden:statusViewModes[s.id] == 'maximized'}"
+                        ng-click="ctrl.updateStatusViewMode(s.id, 'maximized')"
+                    )
+                        svg.icon.icon-unfold-row
+                            use(xlink:href="#icon-unfold-row")
 
-                    a.icon.icon-vfold(href="", title="{{'KANBAN.TITLE_ACTION_FOLD_CARDS' | translate}}",
-                                         ng-class="{hidden:statusViewModes[s.id] == 'minimized'}",
-                                         ng-click="ctrl.updateStatusViewMode(s.id, 'minimized')")
-                    a.icon.icon-vunfold(href="", title="{{'KANBAN.TITLE_ACTION_UNFOLD_CARDS' | translate}}",
-                                         ng-class="{hidden:statusViewModes[s.id] == 'maximized'}",
-                                         ng-click="ctrl.updateStatusViewMode(s.id, 'maximized')")
+                    a.option(
+                        href=""
+                        title="{{'KANBAN.TITLE_ACTION_ADD_US' | translate}}"
+                         ng-click="ctrl.addNewUs('standard', s.id)"
+                         tg-check-permission="add_us"
+                         ng-hide="s.is_archived"
+                    )
+                        svg.icon.icon-add
+                            use(xlink:href="#icon-add")
 
-                    a.icon.icon-plus(href="", title="{{'KANBAN.TITLE_ACTION_ADD_US' | translate}}",
-                                     ng-click="ctrl.addNewUs('standard', s.id)",
-                                     tg-check-permission="add_us",
-                                     ng-hide="s.is_archived")
+                    a.option(
+                        href=""
+                        title="{{'KANBAN.TITLE_ACTION_ADD_BULK' | translate}}"
+                        ng-click="ctrl.addNewUs('bulk', s.id)"
+                        tg-check-permission="add_us"
+                        ng-hide="s.is_archived"
+                    )
+                        svg.icon.icon-bulk
+                            use(xlink:href="#icon-bulk")
 
-                    a.icon.icon-bulk(href="", title="{{'KANBAN.TITLE_ACTION_ADD_BULK' | translate}}",
-                                     ng-click="ctrl.addNewUs('bulk', s.id)",
-                                     tg-check-permission="add_us",
-                                     ng-hide="s.is_archived")
-
-                    a(
+                    a.option(
                         href=""
                         ng-attr-title="{{title}}"
                         ng-class="class"
                         ng-if="s.is_archived"
                         tg-kanban-archived-status-header="s")
-                        include ../../../svg/eye.svg
+                        svg.icon.icon-watch
+                            use(xlink:href="#icon-watch")
 
     div.kanban-table-body
         div.kanban-table-inner
diff --git a/app/partials/includes/modules/lightbox-add-member.jade b/app/partials/includes/modules/lightbox-add-member.jade
index 624af87f..31aa886b 100644
--- a/app/partials/includes/modules/lightbox-add-member.jade
+++ b/app/partials/includes/modules/lightbox-add-member.jade
@@ -1,5 +1,6 @@
 a.close(href="", title="close")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.ADD_MEMBER.TITLE")
 
diff --git a/app/partials/includes/modules/lightbox-ask-choice.jade b/app/partials/includes/modules/lightbox-ask-choice.jade
index cc7336a0..c1f5a0fb 100644
--- a/app/partials/includes/modules/lightbox-ask-choice.jade
+++ b/app/partials/includes/modules/lightbox-ask-choice.jade
@@ -1,5 +1,6 @@
 a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title
     p.question
@@ -8,7 +9,7 @@ form
     select.choices
     p.warning
 
-    div.options
+    .options
         a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
             span(translate="COMMON.ACCEPT")
         a.button-red(href="", title="{{'COMMON.CANCEL' | translate}}")
diff --git a/app/partials/includes/modules/lightbox-create-issue.jade b/app/partials/includes/modules/lightbox-create-issue.jade
index bfcd53dd..829d660f 100644
--- a/app/partials/includes/modules/lightbox-create-issue.jade
+++ b/app/partials/includes/modules/lightbox-create-issue.jade
@@ -1,19 +1,42 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.CREATE_ISSUE.TITLE")
     fieldset
-        input(type="text", ng-model="issue.subject", ng-attr-placeholder="{{'COMMON.FIELDS.SUBJECT' | translate}}", ng-model-options="{ debounce: 200 }", data-required="true", data-maxlength="500")
-    div.fieldset-row
+        input(
+            type="text"
+            ng-model="issue.subject"
+            ng-attr-placeholder="{{'COMMON.FIELDS.SUBJECT' | translate}}"
+            ng-model-options="{ debounce: 200 }"
+            data-required="true"
+            data-maxlength="500"
+        )
+    .fieldset-row
         fieldset
-            select.type(ng-model="issue.type", ng-options="t.id as t.name for t in issueTypes")
+            select.type(
+                ng-model="issue.type"
+                ng-options="t.id as t.name for t in issueTypes"
+            )
         fieldset
-            select.priority(ng-model="issue.priority", ng-options="p.id as p.name for p in priorityList")
+            select.priority(
+                ng-model="issue.priority"
+                ng-options="p.id as p.name for p in priorityList"
+            )
         fieldset
-            select.severity(ng-model="issue.severity", ng-options="s.id as s.name for s in severityList")
+            select.severity(
+                ng-model="issue.severity"
+                ng-options="s.id as s.name for s in severityList"
+            )
 
     fieldset
-        div.tags-block(tg-lb-tag-line, ng-model="issue.tags")
+        .tags-block(
+            tg-lb-tag-line
+            ng-model="issue.tags"
+        )
 
     fieldset
         section
@@ -24,7 +47,14 @@ form
               )
 
     fieldset
-        textarea.description(ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}", ng-model="issue.description")
+        textarea.description(
+            ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}"
+            ng-model="issue.description"
+        )
 
     // include lightbox-attachments
-    button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}", translate="COMMON.CREATE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.CREATE' | translate}}"
+        translate="COMMON.CREATE"
+    )
diff --git a/app/partials/includes/modules/lightbox-delete-project.jade b/app/partials/includes/modules/lightbox-delete-project.jade
index 0ae8f2ad..c360d23d 100644
--- a/app/partials/includes/modules/lightbox-delete-project.jade
+++ b/app/partials/includes/modules/lightbox-delete-project.jade
@@ -1,11 +1,12 @@
 a.close(href="", title="{{'close' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.DELETE_PROJECT.TITLE")
     p
         span.question(translate="LIGHTBOX.DELETE_PROJECT.QUESTION")
         span.subtitle(translate="LIGHTBOX.DELETE_PROJECT.SUBTITLE")
-    div.options
+    .options
         a.button-green(href="", title="{{'LIGHTBOX.DELETE_PROJECT.CONFIRM' | translate}}")
             span(translate="LIGHTBOX.DELETE_PROJECT.CONFIRM")
         a.button-red(href="", title="{{'COMMON.CANCEL' | translate}}")
diff --git a/app/partials/includes/modules/lightbox-generic-ask.jade b/app/partials/includes/modules/lightbox-generic-ask.jade
index c51ba250..6ddcaf0a 100644
--- a/app/partials/includes/modules/lightbox-generic-ask.jade
+++ b/app/partials/includes/modules/lightbox-generic-ask.jade
@@ -1,12 +1,16 @@
 a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title
     p
         span.subtitle
         span.message
     div.options
-        a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
+        a.button-green(
+            href=""
+            title="{{'COMMON.ACCEPT' | translate}}"
+        )
             span(translate="COMMON.ACCEPT")
         a.button-red(href="", title="{{'COMMON.CANCEL' | translate}}")
             span(translate="COMMON.CANCEL")
diff --git a/app/partials/includes/modules/lightbox-generic-error.jade b/app/partials/includes/modules/lightbox-generic-error.jade
index ca06f309..343dbaa6 100644
--- a/app/partials/includes/modules/lightbox-generic-error.jade
+++ b/app/partials/includes/modules/lightbox-generic-error.jade
@@ -1,7 +1,14 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 section
     h2.title
-    div.options
-        a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
+    .options
+        a.button-green(
+            href=""
+            title="{{'COMMON.ACCEPT' | translate}}"
+        )
             span(translate="COMMON.ACCEPT")
diff --git a/app/partials/includes/modules/lightbox-generic-success.jade b/app/partials/includes/modules/lightbox-generic-success.jade
index 35828685..02bf8c0a 100644
--- a/app/partials/includes/modules/lightbox-generic-success.jade
+++ b/app/partials/includes/modules/lightbox-generic-success.jade
@@ -1,8 +1,15 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 section
     h2.title
     p.message
-    div.options
-        a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
+    .options
+        a.button-green(
+            href=""
+            title="{{'COMMON.ACCEPT' | translate}}"
+        )
             span(translate="COMMON.ACCEPT")
diff --git a/app/partials/includes/modules/lightbox-issue-bulk.jade b/app/partials/includes/modules/lightbox-issue-bulk.jade
index 917fb5ee..b418e7d5 100644
--- a/app/partials/includes/modules/lightbox-issue-bulk.jade
+++ b/app/partials/includes/modules/lightbox-issue-bulk.jade
@@ -1,5 +1,9 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
@@ -10,6 +14,7 @@ form
             data-required="true"
             data-linewidth="200"
             ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}"
+
         )
 
     button.button-green.submit-button(
diff --git a/app/partials/includes/modules/lightbox-sprint-add-edit.jade b/app/partials/includes/modules/lightbox-sprint-add-edit.jade
index d44ad710..148084eb 100644
--- a/app/partials/includes/modules/lightbox-sprint-add-edit.jade
+++ b/app/partials/includes/modules/lightbox-sprint-add-edit.jade
@@ -1,30 +1,57 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 
 form
     h2.title(translate="LIGHTBOX.ADD_EDIT_SPRINT.TITLE")
     fieldset
-        input.sprint-name(type="text", name="name",  ng-model="sprint.name",
-                          ng-model-options="{ debounce: 200 }",
-                          data-required="true", data-maxlength="500",
-                          placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_NAME' | translate}}")
+        input.sprint-name(
+            type="text"
+            name="name"
+            ng-model="sprint.name"
+            ng-model-options="{ debounce: 200 }"
+            data-required="true"
+            data-maxlength="500"
+            placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_NAME' | translate}}"
+        )
         label.last-sprint-name
 
     fieldset.dates
         div
-            input.date-start(type="text", name="estimated_start",
-                             ng-model="sprint.estimated_start", data-required="true", tg-date-selector,
-                             placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_START' | translate}}")
+            input.date-start(
+                type="text"
+                name="estimated_start"
+                ng-model="sprint.estimated_start"
+                data-required="true"
+                tg-date-selector
+                placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_START' | translate}}"
+            )
         div
-            input.date-end(type="text", name="estimated_finish",
-                           ng-model="sprint.estimated_finish", data-required="true", tg-date-selector,
-                           placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_END' | translate}}")
+            input.date-end(
+                type="text"
+                name="estimated_finish"
+                ng-model="sprint.estimated_finish"
+                data-required="true"
+                tg-date-selector
+                placeholder="{{'LIGHTBOX.ADD_EDIT_SPRINT.PLACEHOLDER_SPRINT_END' | translate}}"
+            )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}",
-                                      translate="COMMON.CREATE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.CREATE' | translate}}"
+        translate="COMMON.CREATE"
+    )
 
-    div(tg-check-permission="delete_milestone")
-        span.delete-sprint.hidden(translate)
-            span(translate="LIGHTBOX.ADD_EDIT_SPRINT.ACTION_DELETE_SPRINT")
-            a.icon.icon-delete(href="",
-                               title="{{'LIGHTBOX.ADD_EDIT_SPRINT.TITLE_ACTION_DELETE_SPRINT' | translate}}")
+    a.delete-sprint(
+        tg-check-permission="delete_milestone"
+        href=""
+        title="{{'LIGHTBOX.ADD_EDIT_SPRINT.TITLE_ACTION_DELETE_SPRINT' | translate}}"
+    )
+        span {{'LIGHTBOX.ADD_EDIT_SPRINT.ACTION_DELETE_SPRINT' | translate }}
+        svg.icon.icon-trash(
+            href=""
+        )
+            use(xlink:href="#icon-trash")
diff --git a/app/partials/includes/modules/lightbox-task-bulk.jade b/app/partials/includes/modules/lightbox-task-bulk.jade
index 5a1d4b1a..7fac9d2e 100644
--- a/app/partials/includes/modules/lightbox-task-bulk.jade
+++ b/app/partials/includes/modules/lightbox-task-bulk.jade
@@ -1,5 +1,9 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
@@ -10,6 +14,7 @@ form
             data-required="true"
             data-linewidth="200"
             ng-attr-placeholder="{{'COMMON.ONE_ITEM_LINE' | translate}}"
+
         )
 
     button.button-green.submit-button(
diff --git a/app/partials/includes/modules/lightbox-task-create-edit.jade b/app/partials/includes/modules/lightbox-task-create-edit.jade
index a878e7ad..68fef13c 100644
--- a/app/partials/includes/modules/lightbox-task-create-edit.jade
+++ b/app/partials/includes/modules/lightbox-task-create-edit.jade
@@ -1,22 +1,44 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.CREATE_EDIT_TASK.TITLE")
     fieldset
-        input(type="text", ng-model="task.subject", ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_SUBJECT' | translate}}", ng-model-options="{ debounce: 200 }",
-              data-required="true", data-maxlength="500")
+        input(
+            type="text"
+            ng-model="task.subject"
+            ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_SUBJECT' | translate}}"
+            ng-model-options="{ debounce: 200 }"
+            data-required="true"
+            data-maxlength="500"
+        )
 
     fieldset
-        select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList",
-               placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_STATUS' | translate}}")
+        select(
+            ng-model="task.status"
+            ng-options="s.id as s.name for s in taskStatusList"
+            placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_STATUS' | translate}}"
+        )
 
     fieldset
-        select(ng-model="task.assigned_to", ng-options="s.id as s.full_name_display for s in users",
-               placeholder="{{'Assigned to'}}")
-            option(value="", translate="LIGHTBOX.CREATE_EDIT_TASK.OPTION_UNASSIGNED")
+        select(
+            ng-model="task.assigned_to"
+            ng-options="s.id as s.full_name_display for s in users"
+            placeholder="{{'Assigned to'}}"
+        )
+            option(
+                value=""
+                translate="LIGHTBOX.CREATE_EDIT_TASK.OPTION_UNASSIGNED"
+            )
 
     fieldset
-        div.tags-block(tg-lb-tag-line, ng-model="task.tags")
+        div.tags-block(
+            tg-lb-tag-line
+            ng-model="task.tags"
+        )
 
     fieldset
         section
@@ -27,19 +49,46 @@ form
               )
 
     fieldset
-        textarea.description(ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_SHORT_DESCRIPTION' | translate}}", ng-model="task.description", ng-model-options="{ debounce: 200 }")
+        textarea.description(
+            ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_TASK.PLACEHOLDER_SHORT_DESCRIPTION' | translate}}"
+            ng-model="task.description"
+            ng-model-options="{ debounce: 200 }"
+        )
 
     div.settings
         fieldset.iocaine-flag(title="{{'COMMON.IOCAINE_TEXT' | translate}}")
-            input(type="checkbox", ng-model="task.is_iocaine", name="iocaine-task", id="iocaine-task", ng-value="true")
+            input(
+                type="checkbox"
+                ng-model="task.is_iocaine"
+                name="iocaine-task"
+                id="iocaine-task"
+                ng-value="true"
+            )
             label.iocaine.trans-button(for="iocaine-task")
-                span.icon.icon-iocaine(for="iocaine-task icon-iocaine")
+                svg.icon.icon-iocaine(for="iocaine-task icon-iocaine")
+                    use(xlink:href="#icon-iocaine")
                 span Iocaine
 
         fieldset.blocking-flag
-            input(type="checkbox", ng-model="task.is_blocked", name="blocked-task", id="blocked-task", ng-value="true")
-            label.blocked.trans-button(for="blocked-task", translate="COMMON.BLOCKED")
+            input(
+                type="checkbox"
+                ng-model="task.is_blocked"
+                name="blocked-task"
+                id="blocked-task"
+                ng-value="true"
+            )
+            label.blocked.trans-button(
+                for="blocked-task"
+                translate="COMMON.BLOCKED"
+            )
 
-    tg-blocking-message-input(watch="task.is_blocked", ng-model="task.blocked_note")
+    tg-blocking-message-input(
+        watch="task.is_blocked"
+        ng-model="task.blocked_note"
+    )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}", translate="COMMON.CREATE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.CREATE' | translate}}"
+        translate="COMMON.CREATE"
+    )
diff --git a/app/partials/includes/modules/lightbox-us-bulk.jade b/app/partials/includes/modules/lightbox-us-bulk.jade
index 4da92990..b522a0ed 100644
--- a/app/partials/includes/modules/lightbox-us-bulk.jade
+++ b/app/partials/includes/modules/lightbox-us-bulk.jade
@@ -1,5 +1,9 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="COMMON.NEW_BULK")
     fieldset
diff --git a/app/partials/includes/modules/lightbox-us-create-edit.jade b/app/partials/includes/modules/lightbox-us-create-edit.jade
index bb3d5045..c03c8010 100644
--- a/app/partials/includes/modules/lightbox-us-create-edit.jade
+++ b/app/partials/includes/modules/lightbox-us-create-edit.jade
@@ -1,23 +1,45 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.CREATE_EDIT_US.TITLE")
     fieldset
-        input(type="text", name="subject", ng-model-options="{ debounce: 200 }", ng-model="us.subject", placeholder="{{'COMMON.FIELDS.SUBJECT' | translate}}",
-              data-required="true", data-maxlength="500")
+        input(
+            type="text"
+            name="subject"
+            ng-model-options="{ debounce: 200 }"
+            ng-model="us.subject"
+            placeholder="{{'COMMON.FIELDS.SUBJECT' | translate}}"
+            data-required="true"
+            data-maxlength="500"
+        )
 
     fieldset.ticket-estimation
         tg-lb-us-estimation(ng-model="us")
 
     fieldset
-        select(name="status", ng-model="us.status", ng-options="s.id as s.name for s in usStatusList")
+        select(
+            name="status"
+            ng-model="us.status"
+            ng-options="s.id as s.name for s in usStatusList"
+        )
 
     fieldset
-        div.tags-block(tg-lb-tag-line, ng-model="us.tags")
+        div.tags-block(
+            tg-lb-tag-line
+            ng-model="us.tags"
+        )
 
     fieldset
-        textarea.description(name="description", ng-model="us.description", ng-model-options="{ debounce: 200 }",
-                             ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_US.PLACEHOLDER_DESCRIPTION' | translate}}")
+        textarea.description(
+            name="description"
+            ng-model="us.description"
+            ng-model-options="{ debounce: 200 }"
+            ng-attr-placeholder="{{'LIGHTBOX.CREATE_EDIT_US.PLACEHOLDER_DESCRIPTION' | translate}}"
+        )
     fieldset
         section
           tg-attachments-simple(
@@ -28,19 +50,51 @@ form
 
     div.settings
         fieldset.team-requirement
-            input(type="checkbox", name="team_requirement", ng-model="us.team_requirement",
-                  id="team-requirement", ng-value="true")
-            label.requirement.trans-button(for="team-requirement", translate="US.FIELDS.TEAM_REQUIREMENT")
+            input(
+                type="checkbox"
+                name="team_requirement"
+                ng-model="us.team_requirement"
+                id="team-requirement"
+                ng-value="true"
+            )
+            label.requirement.trans-button(
+                for="team-requirement"
+                translate="US.FIELDS.TEAM_REQUIREMENT"
+            )
 
         fieldset.client-requirement
-            input(type="checkbox", name="client_requirement", ng-model="us.client_requirement",
-                  id="client-requirement", ng-value="true")
-            label.requirement.trans-button(for="client-requirement", translate="US.FIELDS.CLIENT_REQUIREMENT")
+            input(
+                type="checkbox"
+                name="client_requirement"
+                ng-model="us.client_requirement",
+                id="client-requirement"
+                ng-value="true"
+            )
+            label.requirement.trans-button(
+                for="client-requirement"
+                translate="US.FIELDS.CLIENT_REQUIREMENT"
+            )
 
         fieldset.blocking-flag
-            input(type="checkbox", name="is_blocked", ng-model="us.is_blocked", id="blocked-us" ng-value="true")
-            label.blocked.trans-button(for="blocked-us", translate="COMMON.BLOCKED")
+            input(
+                type="checkbox"
+                name="is_blocked"
+                ng-model="us.is_blocked"
+                id="blocked-us" 
+                ng-value="true"
+            )
+            label.blocked.trans-button(
+                for="blocked-us"
+                translate="COMMON.BLOCKED"
+            )
 
-    tg-blocking-message-input(watch="us.is_blocked", ng-model="us.blocked_note")
+    tg-blocking-message-input(
+        watch="us.is_blocked"
+        ng-model="us.blocked_note"
+    )
 
-    button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}", translate="COMMON.CREATE")
+    button.button-green.submit-button(
+        type="submit"
+        title="{{'COMMON.CREATE' | translate}}"
+        translate="COMMON.CREATE"
+    )
diff --git a/app/partials/includes/modules/search-filter.jade b/app/partials/includes/modules/search-filter.jade
index 5c8c93ae..3304a5cc 100644
--- a/app/partials/includes/modules/search-filter.jade
+++ b/app/partials/includes/modules/search-filter.jade
@@ -4,7 +4,8 @@ ul.search-filter
             href="#"
             title="{{ 'SEARCH.FILTER_USER_STORIES' | translate }}"
         )
-            span.icon.icon-bulk
+            svg.icon.icon-bulk
+                use(xlink:href="#icon-bulk")
             span.num
             span.name(translate="SEARCH.FILTER_USER_STORIES")
 
@@ -13,7 +14,8 @@ ul.search-filter
             href="#"
             title="{{ 'SEARCH.FILTER_ISSUES' | translate }}"
         )
-            span.icon.icon-issues
+            svg.icon.icon-issues
+                use(xlink:href="#icon-issues")
             span.num
             span.name(translate="SEARCH.FILTER_ISSUES")
 
@@ -22,7 +24,8 @@ ul.search-filter
             href="#"
             title="{{ 'SEARCH.FILTER_TASKS' | translate }}"
         )
-            span.icon.icon-bulk
+            svg.icon.icon-bulk
+                use(xlink:href="#icon-bulk")
             span.num
             span.name(translate="SEARCH.FILTER_TASKS")
 
@@ -31,6 +34,7 @@ ul.search-filter
             href="#"
             title="{{ 'SEARCH.FILTER_WIKI' | translate }}"
         )
-            span.icon.icon-wiki
+            svg.icon.icon-wiki
+                use(xlink:href="#icon-wiki")
             span.num
             span.name(translate="SEARCH.FILTER_WIKI")
diff --git a/app/partials/includes/modules/search-in.jade b/app/partials/includes/modules/search-in.jade
index e13718a3..e16d70ee 100644
--- a/app/partials/includes/modules/search-in.jade
+++ b/app/partials/includes/modules/search-in.jade
@@ -1,6 +1,11 @@
 section.search-in
     header
         fieldset
-            input(type="text", placeholder="{{'SEARCH.PLACEHOLDER_SEARCH' | translate}}", ng-model="searchTerm")
+            input(
+                type="text"
+                placeholder="{{'SEARCH.PLACEHOLDER_SEARCH' | translate}}"
+                ng-model="searchTerm"
+            )
             .icon-search-wrapper(tg-loading="loading")
-                a.icon.icon-search(href="", title="{{'SEARCH.TITLE_ACTION_SEARCH' | translate}}")
+                svg.icon.icon-search(title="{{'SEARCH.TITLE_ACTION_SEARCH' | translate}}")
+                    use(xlink:href="#icon-search")
diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade
index 2e1b163f..82066a18 100644
--- a/app/partials/includes/modules/sprints.jade
+++ b/app/partials/includes/modules/sprints.jade
@@ -13,7 +13,8 @@ section.sprints
             ng-if="totalMilestones"
             tg-check-permission="add_milestone"
         )
-            include ../../../svg/add.svg
+            svg.icon.icon-add
+                use(xlink:href="#icon-add")
 
     div.sprints-empty(ng-if="totalMilestones === 0")
         img(
@@ -36,7 +37,8 @@ section.sprints
 
     a.filter-closed-sprints(href="", tg-backlog-toggle-closed-sprints-visualization,
                             ng-if="totalClosedMilestones")
-        span.icon.icon-archive
+        svg.icon.icon-archive
+            use(xlink:href="#icon-archive")
         span.text(translate="BACKLOG.SPRINTS.ACTION_SHOW_CLOSED_SPRINTS")
 
     div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id",
diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade
index 5559f648..a87acc12 100644
--- a/app/partials/includes/modules/taskboard-table.jade
+++ b/app/partials/includes/modules/taskboard-table.jade
@@ -4,15 +4,39 @@ div.taskboard-table(tg-taskboard-squish-column)
             h2.task-colum-name(translate="TASKBOARD.TABLE.COLUMN")
             h2.task-colum-name(ng-repeat="s in taskStatusList track by s.id", ng-style="{'border-top-color':s.color}", ng-class="{'column-fold':statusesFolded[s.id]}", class="squish-status-{{s.id}}", tg-bo-title="s.name")
                 span(tg-bo-bind="s.name")
-                a.icon.icon-vfold.hfold(href="", ng-click='foldStatus(s)', title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD' | translate}}", ng-class='{hidden:statusesFolded[s.id]}')
-                a.icon.icon-vunfold.hunfold(href="", title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD' | translate}}", ng-click='foldStatus(s)', ng-class='{hidden:!statusesFolded[s.id]}')
+                svg.icon.icon-fold-row.hfold(
+                    ng-click='foldStatus(s)'
+                    title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD' | translate}}"
+                    ng-class='{hidden:statusesFolded[s.id]}'
+                )
+                    use(xlink:href="#icon-fold-row")
+                    
+                svg.icon.icon-fold-row.hunfold(
+                    title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD' | translate}}"
+                    ng-click='foldStatus(s)'
+                    ng-class='{hidden:!statusesFolded[s.id]}'
+                )
+                    use(xlink:href="#icon-unfold-row")
 
     div.taskboard-table-body(tg-taskboard-table-height-fixer)
         div.taskboard-table-inner
             div.task-row(ng-repeat="us in userstories track by us.id", ng-class="{blocked: us.is_blocked, 'row-fold':usFolded[us.id]}")
                 div.taskboard-userstory-box.task-column(tg-bo-title="us.blocked_note")
-                    a.icon.icon-vfold.vfold(href="", title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD_ROW' | translate}}", ng-click='foldUs(us)', ng-class='{hidden:usFolded[us.id]}')
-                    a.icon.icon-vunfold.vunfold(href="", title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD_ROW' | translate}}", ng-click='foldUs(us)', ng-class='{hidden:!usFolded[us.id]}')
+                    
+                    svg.icon.icon-fold-row.vfold(
+                        title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD_ROW' | translate}}"
+                        ng-click='foldUs(us)'
+                        ng-class='{hidden:usFolded[us.id]}'
+                    )
+                        use(xlink:href="#icon-fold-row")
+                    
+                    svg.icon.icon-unfold-row.vunfold(
+                        title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD_ROW' | translate}}"
+                        ng-click='foldUs(us)'
+                        ng-class='{hidden:!usFolded[us.id]}'
+                    )
+                        use(xlink:href="#icon-fold-row")
+                    
                     h3.us-title
                         a(href="",
                           tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
@@ -41,8 +65,22 @@ div.taskboard-table(tg-taskboard-squish-column)
 
             div.task-row(ng-init="us = null", ng-class="{'row-fold':usFolded[null]}")
                 div.taskboard-userstory-box.task-column
-                    a.icon.icon-vfold.vfold(href="", title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD_ROW' | translate}}", ng-click='foldUs()', ng-class="{hidden:usFolded[null]}")
-                    a.icon.icon-vunfold.vunfold(href="", title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD_ROW' | translate}}", ng-click='foldUs()', ng-class="{hidden:!usFolded[null]}")
+                    a.vfold(
+                        href=""
+                        title="{{'TASKBOARD.TABLE.TITLE_ACTION_FOLD_ROW' | translate}}"
+                        ng-click='foldUs()'
+                        ng-class="{hidden:usFolded[null]}"
+                    )
+                        svg.icon.icon-fold-row
+                            use(xlink:href="#icon-fold-row")
+                    a.vunfold(
+                        href=""
+                        title="{{'TASKBOARD.TABLE.TITLE_ACTION_UNFOLD_ROW' | translate}}"
+                        ng-click='foldUs()'
+                        ng-class="{hidden:!usFolded[null]}"
+                    )
+                        svg.icon.icon-unfold-row
+                            use(xlink:href="#icon-unfold-row")
                     h3.us-title
                         span(translate="TASKBOARD.TABLE.ROW_UNASSIGED_TASKS_TITLE")
                     include ../components/addnewtask.jade
diff --git a/app/partials/includes/modules/team/team-filters.jade b/app/partials/includes/modules/team/team-filters.jade
index d2d68cb9..72b104a0 100644
--- a/app/partials/includes/modules/team/team-filters.jade
+++ b/app/partials/includes/modules/team/team-filters.jade
@@ -7,6 +7,7 @@ section.team-filters
             fieldset
                 input(type="text", placeholder="{{'TEAM.PLACEHOLDER_INPUT_SEARCH' | translate}}", ng-model="filtersQ")
                 .icon-search-wrapper
-                    a.icon.icon-search(href="", title="{{'COMMON.FILTERS.TITLE_ACTION_FILTER_BUTTON' | translate}}")
+                    svg.icon.icon-search(title="{{'COMMON.FILTERS.TITLE_ACTION_FILTER_BUTTON' | translate}}")
+                        use(xlink:href="#icon-search")
 
-        nav(tg-team-filters)
\ No newline at end of file
+        nav(tg-team-filters)
diff --git a/app/partials/includes/modules/team/team-table.jade b/app/partials/includes/modules/team/team-table.jade
index f2a2e3a2..27dc7e42 100644
--- a/app/partials/includes/modules/team/team-table.jade
+++ b/app/partials/includes/modules/team/team-table.jade
@@ -27,7 +27,16 @@ section.table-team.basic-table
                 div.popover.attribute-explanation
                     span(translate="TEAM.EXPLANATION_COLUMN_TOTAL_POWER")
 
-    div.hero(tg-team-current-user, stats="stats", currentuser="currentUser", projectid="projectId", issuesEnabled="issuesEnabled", tasksenabled="tasksEnabled", wikienabled="wikiEnabled", ng-if="::currentUser")
+    div.hero(
+        tg-team-current-user
+        stats="stats"
+        currentuser="currentUser"
+        projectid="projectId"
+        issuesEnabled="issuesEnabled"
+        tasksenabled="tasksEnabled"
+        wikienabled="wikiEnabled"
+        ng-if="::currentUser"
+    )
 
 h2(ng-show="memberships.length")
     span(translate="TEAM.SECTION_TITLE_TEAM")
diff --git a/app/partials/issue/iocaine-button.jade b/app/partials/issue/iocaine-button.jade
index fecc54d9..25406e92 100644
--- a/app/partials/issue/iocaine-button.jade
+++ b/app/partials/issue/iocaine-button.jade
@@ -3,7 +3,8 @@ fieldset(title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}")
         for="is-iocaine"
         class!="<% if(isEditable){ %>is-editable<% }; %> <% if(isIocaine){ %>active<% }; %>"
     )
-        include ../../svg/iocaine.svg
+        svg.icon.icon-iocaine
+            use(xlink:href="#icon-iocaine")
     input(
         type="checkbox"
         id="is-iocaine"
diff --git a/app/partials/issue/issue-priority-button.jade b/app/partials/issue/issue-priority-button.jade
index 62055e0b..0e82506b 100644
--- a/app/partials/issue/issue-priority-button.jade
+++ b/app/partials/issue/issue-priority-button.jade
@@ -2,7 +2,8 @@ div(class!="priority-data <% if(editable){ %>clickable<% }%>")
     span(class="level", style!="background-color:<%- priority.color %>")
     span(class="priority-priority") <%- priority.name %>
     <% if(editable){ %>
-    span(class="icon icon-arrow-bottom")
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
     <% }%>
     span(class="level-name", translate="COMMON.FIELDS.PRIORITY")
 
diff --git a/app/partials/issue/issue-severity-button.jade b/app/partials/issue/issue-severity-button.jade
index 6ffe35dd..377e7346 100644
--- a/app/partials/issue/issue-severity-button.jade
+++ b/app/partials/issue/issue-severity-button.jade
@@ -2,7 +2,8 @@ div(class!="severity-data <% if(editable){ %>clickable<% }%>")
     span(class="level", style!="background-color:<%- severity.color %>")
     span(class="severity-severity") <%- severity.name %>
     <% if(editable){ %>
-    span(class="icon icon-arrow-bottom")
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
     <% }%>
     span(class="level-name", translate="COMMON.FIELDS.SEVERITY")
 
diff --git a/app/partials/issue/issue-type-button.jade b/app/partials/issue/issue-type-button.jade
index 675e7d92..9a050bb2 100644
--- a/app/partials/issue/issue-type-button.jade
+++ b/app/partials/issue/issue-type-button.jade
@@ -2,7 +2,8 @@ div(class!="type-data <% if(editable){ %>clickable<% }%>")
     span(class="level", style!="background-color:<%- type.color %>")
     span(class="type-type") <%- type.name %>
     <% if(editable){ %>
-    span(class="icon icon-arrow-bottom")
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
     <% }%>
     span(class="level-name", translate="COMMON.FIELDS.TYPE")
 
diff --git a/app/partials/issue/issues-detail.jade b/app/partials/issue/issues-detail.jade
index da3a33e5..30b2d69d 100644
--- a/app/partials/issue/issues-detail.jade
+++ b/app/partials/issue/issues-detail.jade
@@ -46,17 +46,19 @@ div.wrapper(
                         span.block-description-title(translate="COMMON.BLOCKED")
                         span.block-description(ng-bind="issue.blocked_note || ('ISSUES.BLOCKED' | translate)")
 
-                    div.issue-nav
-                        a.icon.icon-arrow-left(
+                    .issue-nav
+                        svg.icon.icon-arrow-left(
                             ng-show="previousUrl"
                             tg-bo-href="previousUrl"
                             title="{{'ISSUES.TITLE_PREVIOUS_ISSUE' | translate}}"
                         )
-                        a.icon.icon-arrow-right(
+                            use(xlink:href="#icon-arrow-left")
+                        svg.icon.icon-arrow-right(
                             ng-show="nextUrl"
                             tg-bo-href="nextUrl"
                             title="{{'ISSUES.TITLE_NEXT_ISSUE' | translate}}"
                         )
+                            use(xlink:href="#icon-arrow-right")
             .subheader
                 div.tags-block(tg-tag-line, ng-model="issue", required-perm="modify_issue")
                 tg-created-by-display.ticket-created-by(ng-model="issue")
diff --git a/app/partials/issue/issues-filters-selected.jade b/app/partials/issue/issues-filters-selected.jade
index 90daaacc..187ba9f6 100644
--- a/app/partials/issue/issues-filters-selected.jade
+++ b/app/partials/issue/issues-filters-selected.jade
@@ -1,8 +1,9 @@
 <% _.each(filters, function(f) { %>
-a(class="single-filter selected",
-   data-type!="<%- f.type %>",
-   data-id!="<%- f.id %>")
-    span(class="name", style!="<%- f.style %>")
-        | <%- f.name %>
-    span(class="icon icon-delete")
-<% }) %>
\ No newline at end of file
+a.single-filter.selected(
+    data-type!="<%- f.type %>"
+    data-id!="<%- f.id %>"
+)
+    span.name(style!="<%- f.style %>") <%- f.name %>
+    svg.icon.icon-close.remove-filter
+        use(xlink:href="#icon-close")
+<% }) %>
diff --git a/app/partials/issue/issues-filters.jade b/app/partials/issue/issues-filters.jade
index 8738bc6a..3dfa76ef 100644
--- a/app/partials/issue/issues-filters.jade
+++ b/app/partials/issue/issues-filters.jade
@@ -7,7 +7,8 @@ a(class="single-filter", data-type!="<%- f.type %>", data-id!="<%- f.id %>")
     span(class="number") <%- f.count %>
     <% } %>
     <% if (f.type == "myFilters"){ %>
-    span(class="icon icon-delete")
+    svg.icon.icon-close.remove-filter
+        use(xlink:href="#icon-close")
     <% } %>
 <% } %>
 <% }) %>
diff --git a/app/partials/issue/issues-status-button.jade b/app/partials/issue/issues-status-button.jade
index 957831a8..39f67881 100644
--- a/app/partials/issue/issues-status-button.jade
+++ b/app/partials/issue/issues-status-button.jade
@@ -5,7 +5,8 @@ span.detail-status-inner.js-edit-status(
 )
     span <%- status.name %>
     <% if(editable){ %>
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
     <% }%>
 
     ul.popover.pop-status
diff --git a/app/partials/issue/promote-issue-to-us-button.jade b/app/partials/issue/promote-issue-to-us-button.jade
index d9a4ad31..2a241ca1 100644
--- a/app/partials/issue/promote-issue-to-us-button.jade
+++ b/app/partials/issue/promote-issue-to-us-button.jade
@@ -1,5 +1,6 @@
-a.promote-button.editable(
+a.promote-button.is-editable(
     tg-check-permission="add_us"
     title="{{ 'ISSUES.ACTION_PROMOTE_TO_US' | translate }}"
 )
-    include ../../svg/promote.svg
+    svg.icon.icon-promote
+        use(xlink:href="#icon-promote")
diff --git a/app/partials/kanban/kanban-task.jade b/app/partials/kanban/kanban-task.jade
index a63842bc..a863a07b 100644
--- a/app/partials/kanban/kanban-task.jade
+++ b/app/partials/kanban/kanban-task.jade
@@ -24,4 +24,9 @@ div.kanban-task-inner(ng-class="{'task-archived': us.isArchived}")
             span.task-name(ng-bind="us.subject")
         p(translate="KANBAN.UNDO_ARCHIVED")
 
-    a.icon.icon-edit(tg-check-permission="modify_us", href="", title="{{'COMMON.EDIT' | translate}}", ng-hide="us.isArchived")
+    svg.icon.icon-edit(
+        tg-check-permission="modify_us"
+        title="{{'COMMON.EDIT' | translate}}"
+        ng-hide="us.isArchived"
+    )
+        use(xlink:href="#icon-edit")
diff --git a/app/partials/project/wizard-create-project.jade b/app/partials/project/wizard-create-project.jade
index 1d52dc48..f32cc8c0 100644
--- a/app/partials/project/wizard-create-project.jade
+++ b/app/partials/project/wizard-create-project.jade
@@ -6,16 +6,26 @@ form
         div.template-wrapper
             div.template-inner
                 fieldset(ng-repeat="template in templates")
-                    input(type="radio", name="template", id="template-{{ template.id }}",
-                          ng-value='template.id', ng-model="data.creation_template",
-                          data-required="true")
+                    input(
+                        type="radio"
+                        name="template"
+                        id="template-{{ template.id }}"
+                        ng-value='template.id'
+                        ng-model="data.creation_template"
+                        data-required="true"
+                    )
                     label.backlog(for="template-{{ template.id }}")
-                        span.icon( ng-class="'icon-'+template.slug")
+                        svg.icon(ng-class="'icon-'+template.slug")
+                            use(xlink:href="{{'#icon-' + template.slug }}")
                         h2 {{ template.name }}
                     p {{ template.description }}
 
         fieldset
-            a.button-next.button-green(href="#", title="{{'PAGINATION.NEXT' | translate}}", translate="PAGINATION.NEXT")
+            a.button-next.button-green(
+                href="#"
+                title="{{'PAGINATION.NEXT' | translate}}"
+                translate="PAGINATION.NEXT"
+            )
 
     section.wizard-step.create-step2.active(data-step="step2")
         div.title
@@ -24,15 +34,35 @@ form
         div.template-wrapper
             div.template-inner
                 fieldset
-                    input(type="text", name="name", ng-model="data.name", data-required="true", placeholder="{{'COMMON.FIELDS.NAME' | translate}}", maxlength="45")
+                    input(
+                        type="text"
+                        name="name"
+                        ng-model="data.name"
+                        data-required="true"
+                        placeholder="{{'COMMON.FIELDS.NAME' | translate}}"
+                        maxlength="45"
+                    )
                 fieldset
-                    textarea(name="description", ng-model="data.description", data-required="true",  ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}")
+                    textarea(
+                        name="description"
+                        ng-model="data.description"
+                        data-required="true"
+                        ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}"
+                    )
                 fieldset.wizard-action
                     div
-                        a.button-prev.button.button-gray(href="#", title="{{'PAGINATION.PREVIOUS' | translate}}", translate="PAGINATION.PREVIOUS")
-                        button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}", translate="COMMON.CREATE")
+                        a.button-prev.button.button-gray(
+                            href="#"
+                            title="{{'PAGINATION.PREVIOUS' | translate}}"
+                            translate="PAGINATION.PREVIOUS"
+                        )
+                        button.button-green.submit-button(
+                            type="submit"
+                            title="{{'COMMON.CREATE' | translate}}"
+                            translate="COMMON.CREATE"
+                        )
 
-                    button(type="submit", class="hidden")
+                    button.hidden(type="submit")
 
 div.progress-bar
     div.progress-state
@@ -43,4 +73,5 @@ div.progress-bar
         div.bar
 
 a.close(href="#" title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-delete
+        use(xlink:href="#icon-delete")
diff --git a/app/partials/search/lightbox-search.jade b/app/partials/search/lightbox-search.jade
index 189c4890..328deb21 100644
--- a/app/partials/search/lightbox-search.jade
+++ b/app/partials/search/lightbox-search.jade
@@ -1,8 +1,9 @@
 a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.SEARCH.TITLE")
     fieldset
         input(type="text", name="text", id="search-text", placeholder="{{'LIGHTBOX.SEARCH.PLACEHOLDER_SEARCH' | translate}}", data-required="true")
     fieldset
-        button.button-green.submit-button(type="submit", title="{{' LIGHTBOX.SEARCH.TITLE' | translate}}", translate="LIGHTBOX.SEARCH.TITLE")
\ No newline at end of file
+        button.button-green.submit-button(type="submit", title="{{' LIGHTBOX.SEARCH.TITLE' | translate}}", translate="LIGHTBOX.SEARCH.TITLE")
diff --git a/app/partials/task/related-task-create-form.jade b/app/partials/task/related-task-create-form.jade
index 35f0f4f9..997b8a60 100644
--- a/app/partials/task/related-task-create-form.jade
+++ b/app/partials/task/related-task-create-form.jade
@@ -2,15 +2,19 @@
     .task-name
         input(type='text', placeholder="{{'TASK.PLACEHOLDER_SUBJECT' | translate}}")
         .task-settings
-          a.icon.icon-floppy(href='', title="{{'COMMON.SAVE' | translate}}")
-          a.icon.icon-delete.cancel-edit(href='', title="{{'COMMON.CANCEL' | translate}}")
+          svg.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+              use(xlink:href="#icon-save")
+          svg.icon.icon-close.cancel-edit(href='', title="{{'COMMON.CANCEL' | translate}}")
+              use(xlink:href="#icon-close")
 
 .status(tg-related-task-status='newTask', ng-model='newTask', not-auto-save='true')
   a.task-status(href='', title="{{'TASK.TITLE_SELECT_STATUS' | translate}}")
     span.task-status-bind
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
 
 .assigned-to(tg-related-task-assigned-to-inline-edition='newTask', not-auto-save='true')
   .task-assignedto(title="{{'COMMON.FIELDS.ASSIGNED_TO' | translate}}")
     figure.avatar
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
diff --git a/app/partials/task/related-task-row-edit.jade b/app/partials/task/related-task-row-edit.jade
index 6023b2ae..93f32d63 100644
--- a/app/partials/task/related-task-row-edit.jade
+++ b/app/partials/task/related-task-row-edit.jade
@@ -2,15 +2,19 @@
     .task-name
         input(type='text', value!='<%- task.subject %>', placeholder="{{'TASK.PLACEHOLDER_SUBJECT' | translate}}")
         .task-settings
-          a.icon.icon-floppy(href='', title="{{'COMMON.SAVE' | translate}}")
-          a.icon.icon-delete.cancel-edit(href='', title="{{'COMMON.CANCEL' | translate}}")
+          svg.icon.icon-save.save-task(title="{{'COMMON.SAVE' | translate}}")
+              use(xlink:href="#icon-save")
+          svg.icon.icon-close.cancel-edit(title="{{'COMMON.CANCEL' | translate}}")
+              use(xlink:href="#icon-close")
 
 .status(tg-related-task-status='task', ng-model='task')
   a.task-status(href='', title="{{'TASK.TITLE_SELECT_STATUS' | translate}}")
     span.task-status-bind
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
 
 .assigned-to(tg-related-task-assigned-to-inline-edition='task')
   .task-assignedto(title="{{'COMMON.FIELDS.ASSIGNED_TO' | translate}}")
     figure.avatar
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
diff --git a/app/partials/task/related-task-row.jade b/app/partials/task/related-task-row.jade
index 0a51af0d..7b99c113 100644
--- a/app/partials/task/related-task-row.jade
+++ b/app/partials/task/related-task-row.jade
@@ -1,23 +1,25 @@
 .tasks
     .task-name
-        .icon.icon-iocaine
         a.clickable(
             tg-nav="project-tasks-detail:project=project.slug,ref=task.ref"
             title!="#<%- task.ref %> <%- task.subject %>")
+            svg.icon.icon-iocaine
+                use(xlink:href="#icon-iocaine")
             span #<%- task.ref %>
             span <%- task.subject %>
         .task-settings
             <% if(perms.modify_task) { %>
-            a.icon.icon-edit(
+            svg.icon.icon-edit.edit-task(
                 href=""
                 title="{{'COMMON.EDIT' | translate}}"
             )
+                use(xlink:href="#icon-edit")
             <% } %>
             <% if(perms.delete_task) { %>
-            a.icon.icon-delete.delete-task(
-                href=""
+            svg.icon.icon-trash.delete-task(
                 title="{{'COMMON.DELETE' | translate}}"
             )
+                use(xlink:href="#icon-trash")
             <% } %>
 
 .status(
@@ -30,7 +32,8 @@
     )
         span.task-status-bind
         <% if(perms.modify_task) { %>
-        span.icon.icon-arrow-bottom
+        svg.icon.icon-arrow-down
+            use(xlink:href="#icon-arrow-down")
         <% } %>
 
 .assigned-to(
@@ -42,5 +45,6 @@
     )
         figure.avatar
         <% if(perms.modify_task) { %>
-        span.icon.icon-arrow-bottom
+        svg.icon.icon-arrow-down
+            use(xlink:href="#icon-arrow-down")
         <% } %>
diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade
index f9570518..962f1bfe 100644
--- a/app/partials/task/task-detail.jade
+++ b/app/partials/task/task-detail.jade
@@ -62,16 +62,20 @@ div.wrapper(
                         )
 
                     div.issue-nav
-                        a.icon.icon-arrow-left(
+                        a(
                             ng-show="previousUrl"
                             tg-bo-href="previousUrl"
                             title="{{'TASK.PREVIOUS' | translate}}"
                         )
-                        a.icon.icon-arrow-right(
+                            svg.icon.icon-arrow-left
+                                use(xlink:href='#icon-arrow-left')
+                        a(
                             ng-show="nextUrl"
                             tg-bo-href="nextUrl"
                             title="{{'TASK.NEXT' | translate}}"
                         )
+                            svg.icon.icon-arrow-right
+                                use(xlink:href='#icon-arrow-right')
             .subheader
                 div.tags-block(tg-tag-line, ng-model="task", required-perm="modify_task")
                 tg-created-by-display.ticket-created-by(ng-model="task")
diff --git a/app/partials/team/leave-project.jade b/app/partials/team/leave-project.jade
index b9d52ae0..04fa75c4 100644
--- a/app/partials/team/leave-project.jade
+++ b/app/partials/team/leave-project.jade
@@ -1,3 +1,7 @@
-a.leave-project(ng-click="leave()", href="")
-    span.icon.icon-delete
-    | {{ 'TEAM.ACTION_LEAVE_PROJECT' | translate }}
+a.leave-project(
+    ng-click="leave()"
+    href=""
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
+    span {{ 'TEAM.ACTION_LEAVE_PROJECT' | translate }}
diff --git a/app/partials/team/team-filter.jade b/app/partials/team/team-filter.jade
index d23c8644..67ccfcd0 100644
--- a/app/partials/team/team-filter.jade
+++ b/app/partials/team/team-filter.jade
@@ -1,10 +1,20 @@
 ul
     li
-        a(ng-class="{active: !filtersRole.id}", ng-click="ctrl.setRole()", href="")
+        a(
+            ng-class="{active: !filtersRole.id}"
+            ng-click="ctrl.setRole()"
+            href=""
+        )
           span.title(translate="TEAM.SECTION_FILTER_ALL")
-          span.icon.icon-arrow-right
+          svg.icon.icon-arrow-right
+              use(xlink:href="#icon-arrow-right")
 
     li(ng-repeat="role in roles")
-        a(ng-class="{active: role.id == filtersRole.id}", ng-click="ctrl.setRole(role)", href="")
+        a(
+            ng-class="{active: role.id == filtersRole.id}"
+            ng-click="ctrl.setRole(role)"
+            href=""
+        )
             span.title(tg-bo-bind="role.name")
-            span.icon.icon-arrow-right
+            svg.icon.icon-arrow-right
+                use(xlink:href="#icon-arrow-right")
diff --git a/app/partials/team/team-member-current-user.jade b/app/partials/team/team-member-current-user.jade
index b5d81ce1..f8fa273e 100644
--- a/app/partials/team/team-member-current-user.jade
+++ b/app/partials/team/team-member-current-user.jade
@@ -1,17 +1,20 @@
 .row
     .username
-        figure.avatar
+        .avatar
             img(tg-bo-src="currentUser.photo", tg-bo-alt="currentUser.full_name_display")
 
-            figcaption
+            .avatar-data
                 span.name(tg-bo-bind="currentUser.full_name_display")
 
                 span.position(tg-bo-bind="currentUser.role_name")
 
                 div(tg-leave-project="", projectid="{{projectId}}")
 
-    .member-stats(tg-team-member-stats, stats="stats",
-                                        user="currentUser.user",
-                                        issuesEnabled="issuesEnabled",
-                                        tasksenabled="tasksEnabled",
-                                        wikienabled="wikiEnabled")
+    .member-stats(
+        tg-team-member-stats
+        stats="stats"
+        ser="currentUser.user"
+        issuesEnabled="issuesEnabled"
+        tasksenabled="tasksEnabled"
+        wikienabled="wikiEnabled"
+    )
diff --git a/app/partials/team/team-member-stats.jade b/app/partials/team/team-member-stats.jade
index c271ffe0..161683b0 100644
--- a/app/partials/team/team-member-stats.jade
+++ b/app/partials/team/team-member-stats.jade
@@ -1,22 +1,37 @@
 .attribute(ng-if="issuesEnabled")
-    span.icon.icon-briefcase(ng-style="{'opacity': stats.closed_bugs[userId]}",
-                             ng-class="{'top': stats.closed_bugs[userId] == 1}")
+    svg.icon.icon-briefcase(
+        ng-style="{'opacity': stats.closed_bugs[userId]}"
+        ng-class="{'top': stats.closed_bugs[userId] == 1}"
+    )
+        use(xlink:href="#icon-briefcase")
 
 .attribute(ng-if="tasksEnabled")
-    span.icon.icon-iocaine(ng-style="{'opacity': stats.iocaine_tasks[userId]}",
-                           ng-class="{'top': stats.iocaine_tasks[userId] == 1}")
+    svg.icon.icon-iocaine(
+        ng-style="{'opacity': stats.iocaine_tasks[userId]}"
+        ng-class="{'top': stats.iocaine_tasks[userId] == 1}"
+    )
+        use(xlink:href="#icon-iocaine")
 
 .attribute(ng-if="wikiEnabled")
-    span.icon.icon-writer(ng-style="{'opacity': stats.wiki_changes[userId]}",
-                          ng-class="{'top': stats.wiki_changes[userId] == 1}")
+    svg.icon.icon-edit(
+        ng-style="{'opacity': stats.wiki_changes[userId]}"
+        ng-class="{'top': stats.wiki_changes[userId] == 1}"
+    )
+        use(xlink:href="#icon-edit")
 
 .attribute(ng-if="issuesEnabled")
-    span.icon.icon-bug(ng-style="{'opacity': stats.created_bugs[userId]}",
-                       ng-class="{'top': stats.created_bugs[userId] == 1}")
+    svg.icon.icon-bug(
+        ng-style="{'opacity': stats.created_bugs[userId]}"
+        ng-class="{'top': stats.created_bugs[userId] == 1}"
+    )
+        use(xlink:href="#icon-bug")
 
 .attribute(ng-if="tasksEnabled")
-    span.icon.icon-tasks(ng-style="{'opacity': stats.closed_tasks[userId]}",
-                         ng-class="{'top': stats.closed_tasks[userId] == 1}")
+    svg.icon.icon-task(
+        ng-style="{'opacity': stats.closed_tasks[userId]}"
+        ng-class="{'top': stats.closed_tasks[userId] == 1}"
+    )
+        use(xlink:href="#icon-task")
 
 .attribute
     span.points(ng-bind="stats.totals[userId]")
diff --git a/app/partials/team/team-members.jade b/app/partials/team/team-members.jade
index 55df4055..342d0bf6 100644
--- a/app/partials/team/team-members.jade
+++ b/app/partials/team/team-members.jade
@@ -1,9 +1,9 @@
 .row.member(ng-repeat="user in memberships | membersFilter:filtersQ:filtersRole")
     .username
-        figure.avatar
+        .avatar
             img(tg-bo-src="user.photo", tg-bo-alt="user.full_name_display")
 
-            figcaption
+            .avatar-data
                 a.name(tg-nav="user-profile:username=user.username",
                        title="{{::user.full_name_display}}") {{::user.full_name_display}}
                 span.position {{::user.role_name}}
diff --git a/app/partials/us/us-client-requirement-button.jade b/app/partials/us/us-client-requirement-button.jade
index b8d7a506..d9cb54a1 100644
--- a/app/partials/us/us-client-requirement-button.jade
+++ b/app/partials/us/us-client-requirement-button.jade
@@ -3,7 +3,8 @@ label.button-gray.client-requirement(
     class!="<% if(canEdit){ %>is-editable<% }; %> <% if(isRequired){ %>active<% }; %>"
     title="{{ 'COMMON.CLIENT_REQUIREMENT' | translate }}"
 )
-        include ../../svg/client-requirement.svg
+    svg.icon.icon-client-requirement
+        use(xlink:href="#icon-client-requirement")
 input(
     type="checkbox"
     id="client-requirement"
diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade
index 65b6f893..58b89303 100644
--- a/app/partials/us/us-detail.jade
+++ b/app/partials/us/us-detail.jade
@@ -55,16 +55,20 @@ div.wrapper(
                         span.block-description-title(translate="COMMON.BLOCKED")
                         span.block-description(ng-bind="us.blocked_note || ('US.BLOCKED' | translate)")
                     div.issue-nav
-                        a.icon.icon-arrow-left(
+                        a(
                             ng-show="previousUrl"
                             tg-bo-href="previousUrl"
                             title="{{'US.PREVIOUS' | translate}}"
                         )
-                        a.icon.icon-arrow-right(
+                            svg.icon.icon-arrow-left
+                                use(xlink:href="#icon-arrow-left")
+                        a(
                             ng-show="nextUrl"
                             tg-bo-href="nextUrl"
                             title="{{'US.NEXT' | translate}}"
                         )
+                            svg.icon.icon-arrow-right
+                                use(xlink:href="#icon-arrow-right")
             .subheader
                 .tags-block(tg-tag-line, ng-model="us", required-perm="modify_us")
                 tg-created-by-display.ticket-created-by(ng-model="us")
diff --git a/app/partials/us/us-status-button.jade b/app/partials/us/us-status-button.jade
index 64f9caaf..5066a9ab 100644
--- a/app/partials/us/us-status-button.jade
+++ b/app/partials/us/us-status-button.jade
@@ -4,7 +4,8 @@ span.detail-status-inner.js-edit-status(
 )
     span <%- status.name %>
     <% if(editable){ %>
-    span.icon.icon-arrow-bottom
+    svg.icon.icon-arrow-down
+        use(xlink:href="#icon-arrow-down")
     <% }%>
 
     ul.pop-status.popover
diff --git a/app/partials/us/us-team-requirement-button.jade b/app/partials/us/us-team-requirement-button.jade
index e34338b1..9a4d186d 100644
--- a/app/partials/us/us-team-requirement-button.jade
+++ b/app/partials/us/us-team-requirement-button.jade
@@ -3,7 +3,8 @@ label.button-gray.team-requirement(
     class!=" <% if(canEdit){ %>is-editable<% }; %> <% if(isRequired){ %>active<% }; %>"
     title="{{ 'COMMON.TEAM_REQUIREMENT' | translate }}"
 )
-    include ../../svg/team-requirement.svg
+    svg.icon.icon-team-requirement
+        use(xlink:href="#icon-team-requirement")
 
 input(
     type="checkbox"
diff --git a/app/partials/user/lightbox/lightbox-delete-account.jade b/app/partials/user/lightbox/lightbox-delete-account.jade
index 5befed76..f7915fdd 100644
--- a/app/partials/user/lightbox/lightbox-delete-account.jade
+++ b/app/partials/user/lightbox/lightbox-delete-account.jade
@@ -1,5 +1,6 @@
 a.close(href="", title="{{'close' | translate}}")
-    span.icon.icon-delete
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.SECTION_NAME")
     p
diff --git a/app/partials/wiki/editable-wiki-content.jade b/app/partials/wiki/editable-wiki-content.jade
index 2faf3b51..e5729ed0 100644
--- a/app/partials/wiki/editable-wiki-content.jade
+++ b/app/partials/wiki/editable-wiki-content.jade
@@ -2,7 +2,11 @@ include ../common/components/wysiwyg.jade
 
 .view-wiki-content
     section.wysiwyg(tg-bind-html='wiki.html')
-    span.edit.icon.icon-edit(title="{{'COMMON.EDIT' | translate}}", ng-if="wiki")
+    svg.edit.icon.icon-edit(
+        title="{{'COMMON.EDIT' | translate}}"
+        ng-if="wiki"
+    )
+        use(xlink:href="#icon-edit")
 
 .edit-wiki-content(style='display: none;')
     textarea(ng-attr-placeholder="{{'WIKI.PLACEHOLDER_PAGE' | translate}}",
@@ -10,5 +14,7 @@ include ../common/components/wysiwyg.jade
     +wysihelp
 
     span.action-container
-        a.save.icon.icon-floppy(href='', title="{{'COMMON.SAVE' | translate}}")
-        a.cancel.icon.icon-delete(href='', title="{{'COMMON.CANCEL' | translate}}")
+        svg.save.icon.icon-save(title="{{'COMMON.SAVE' | translate}}")
+            use(xlink:href="#icon-save")
+        svg.cancel.icon.icon-close(title="{{'COMMON.CANCEL' | translate}}")
+            use(xlink:href="#icon-close")
diff --git a/app/partials/wiki/wiki-nav.jade b/app/partials/wiki/wiki-nav.jade
index 8e2c97bc..4d3fa0da 100644
--- a/app/partials/wiki/wiki-nav.jade
+++ b/app/partials/wiki/wiki-nav.jade
@@ -8,7 +8,8 @@ nav
       a(title!="<%- link.title %>")
           span.link-title <%- link.title %>
           <% if (deleteWikiLinkPermission) { %>
-          span.icon.icon-delete
+          svg.icon.icon-trash
+              use(xlink:href="#icon-trash")
           <% } %>
       input(type="text" placeholder="{{'COMMON.FIELDS.NAME' | translate}}" class="hidden" value!="<%- link.title %>")
     <% }) %>
diff --git a/app/partials/wiki/wiki.jade b/app/partials/wiki/wiki.jade
index 40f525d4..f7f04cb0 100644
--- a/app/partials/wiki/wiki.jade
+++ b/app/partials/wiki/wiki.jade
@@ -24,5 +24,6 @@ div.wrapper(ng-controller="WikiDetailController as ctrl",
         )
 
         a.remove(href="", ng-click="ctrl.delete()", ng-if="wiki.id", title="{{'WIKI.REMOVE' | translate}}", tg-check-permission="delete_wiki_page")
-            span.icon.icon-delete
+            svg.icon.icon-trash
+                use(xlink:href="#icon-trash")
             span(translate="WIKI.REMOVE")
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index e4f13781..7c57383b 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -30,7 +30,6 @@
     }
     .icon {
         color: $white;
-        margin-right: .3rem;
     }
 }
 
@@ -43,12 +42,8 @@
         color: $blackish;
         transition: color .2s linear;
     }
-    &:hover,
-    &.active {
-        span,
-        .icon {
-            color: $primary;
-        }
+    .icon {
+        margin-right: .5rem;
     }
     &:visited {
         color: $blackish;
@@ -118,7 +113,10 @@ a.button-gray {
     background: $primary;
     padding: .35rem .5rem;
     .icon {
+        fill: currentColor;
         margin-right: 0;
+        position: relative;
+        top: 1px;
     }
     &:hover {
         background: $primary-light;
diff --git a/app/styles/components/editor-help.scss b/app/styles/components/editor-help.scss
index 64880b9a..5e77956a 100644
--- a/app/styles/components/editor-help.scss
+++ b/app/styles/components/editor-help.scss
@@ -13,17 +13,20 @@
 
 .help-markdown,
 .help-button {
-    @extend %xsmall;
     &:hover {
         span {
             transition: color .2s linear;
         }
         .icon {
-            color: $primary-light;
-            transition: color .2s linear;
+            fill: $primary-light;
+            transition: fill .2s linear;
         }
     }
+    span {
+        vertical-align: text-top;
+    }
     .icon {
+        fill: $gray-light;
         margin-right: .2rem;
     }
 }
diff --git a/app/styles/components/estimation.scss b/app/styles/components/estimation.scss
index 39a0f6e3..f9d47a2b 100644
--- a/app/styles/components/estimation.scss
+++ b/app/styles/components/estimation.scss
@@ -13,7 +13,6 @@
         min-height: 2rem;
         padding: .5rem 1rem;
         position: relative;
-        transition: color .3s linear;
         &.clickable {
             &:hover,
             &.active {
@@ -22,7 +21,8 @@
                 .points,
                 .role,
                 .icon-arrow-bottom {
-                    color: $whitish;
+                    color: currentColor;
+                    fill: currentColor;
                 }
             }
         }
@@ -34,13 +34,15 @@
             .role,
             .icon-arrow-bottom {
                 @extend %text;
-                color: $whitish;
+                color: currentColor;
+                fill: currentColor;
             }
         }
-        .icon-arrow-bottom {
-            color: $gray-light;
+        .icon-arrow-down {
+            fill: currentColor;
+            height: .6rem;
             margin-left: .25rem;
-            vertical-align: middle;
+            width: .6rem;
         }
         .points {
             @extend %light;
diff --git a/app/styles/components/filter.scss b/app/styles/components/filter.scss
index 5aa0a398..86994832 100644
--- a/app/styles/components/filter.scss
+++ b/app/styles/components/filter.scss
@@ -23,8 +23,10 @@
         padding: 8px 10px;
     }
     .name {
+        @include ellipsis(100%);
         background: darken($whitish, 10%); // Fallback
         display: block;
+        padding-right: 2rem;
         width: 100%;
     }
     .number {
@@ -33,15 +35,14 @@
         right: 0;
         top: 0;
     }
-    .icon-delete {
-        color: $grayer;
+    .remove-filter {
+        fill: $gray;
         position: absolute;
         right: .5rem;
-        top: .5rem;
-        transition: color .3s linear;
+        top: .75rem;
+        transition: fill .2s linear;
         &:hover {
-            color: $red;
-            transition: color .3s linear;
+            fill: $red;
         }
     }
 }
diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss
index 70a6480e..37406516 100644
--- a/app/styles/components/kanban-task.scss
+++ b/app/styles/components/kanban-task.scss
@@ -9,10 +9,9 @@
         margin-bottom: 0;
     }
     &:hover {
-        .icon-edit,
-        .icon-drag-h {
-            color: $card-dark;
+        .icon-edit {
             display: block;
+            fill: $card-dark;
             opacity: 1;
             transition: color .3s linear, opacity .3s linear;
         }
@@ -96,15 +95,14 @@
         bottom: .5rem;
         position: absolute;
     }
-    .icon-edit,
-    .icon-drag-h {
-        @extend %large;
-        color: $card-hover;
+    .icon-edit {
+        @include svg-size(1.1rem);
+        fill: $card-hover;
         opacity: 0;
         position: absolute;
-        transition: opacity .2s linear;
         &:hover {
-            color: darken($card-hover, 15%);
+            cursor: pointer;
+            fill: darken($card-hover, 15%);
             transition: color .3s linear;
         }
     }
diff --git a/app/styles/components/markitup.scss b/app/styles/components/markitup.scss
index ebb6e881..dd121e40 100644
--- a/app/styles/components/markitup.scss
+++ b/app/styles/components/markitup.scss
@@ -35,4 +35,8 @@
         min-height: 2rem;
         padding: .3rem;
     }
+    .content {
+        background: $white;
+        margin-bottom: 0;
+    }
 }
diff --git a/app/styles/components/notification-message.scss b/app/styles/components/notification-message.scss
index a0c93c13..4a79a15d 100644
--- a/app/styles/components/notification-message.scss
+++ b/app/styles/components/notification-message.scss
@@ -49,6 +49,7 @@
 
 .notification-message-error {
     background: rgba($red, .9);
+    opacity: 1;
     top: 0;
     transform: translateY(-100%);
     width: 100%;
@@ -60,10 +61,10 @@
     &.inactive {
         transition: all .6s ease-in-out;
     }
-    .icon-notification-error {
-        @extend %xxlarge;
-        display: inline;
-        vertical-align: sub;
+    .icon-error {
+        @include svg-size(3rem);
+        fill: $white;
+        margin-right: .5rem;
     }
     .warning {
         @extend %xlarge;
@@ -79,8 +80,9 @@
             margin: 0;
         }
     }
-    .icon-delete {
-        color: $white;
+    .icon-close {
+        cursor: pointer;
+        fill: $white;
         position: absolute;
         right: 1rem;
         top: 1rem;
@@ -131,7 +133,7 @@
     .close {
         margin-right: 1rem;
         width: 2rem;
-        path {
+        svg {
             fill: $white;
         }
     }
diff --git a/app/styles/components/private.scss b/app/styles/components/private.scss
index 943986c3..9758e999 100644
--- a/app/styles/components/private.scss
+++ b/app/styles/components/private.scss
@@ -3,9 +3,7 @@
     margin-left: .5rem;
     width: .5rem;
     svg {
-        @include svg-size();
-    }
-    path {
+        @include svg-size(.5rem);
         fill: $gray-light;
         transition: fill .3s linear;
     }
diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss
index 7e789061..ee01cf4b 100644
--- a/app/styles/components/summary.scss
+++ b/app/styles/components/summary.scss
@@ -139,8 +139,11 @@ $summary-background: $grayer;
         margin-right: 2rem;
     }
     .icon {
-        font-size: 1.4rem;
+        fill: currentColor;
+        height: 1.5rem;
         margin-right: .4rem;
+        vertical-align: middle;
+        width: 1.5rem;
         &.icon-stats {
             color: $primary;
             float: right;
@@ -171,10 +174,11 @@ $summary-background: $grayer;
     margin-bottom: 1rem;
     padding: 2rem 6rem;
     svg {
-        @include svg-size(5rem);
-        flex-basis: 5rem;
+        @include svg-size(4rem);
+        flex-basis: 4rem;
         flex-shrink: 0;
-        margin-right: 1rem;
+        fill: $primary-dark;
+        margin-right: 2rem;
     }
     p {
         margin: 0;
@@ -189,9 +193,6 @@ $summary-background: $grayer;
         margin: 0;
         text-transform: uppercase;
     }
-    path {
-        fill: $primary-dark;
-    }
     a {
         @extend %bold;
         animation: blink 2s infinite;
diff --git a/app/styles/components/tag.scss b/app/styles/components/tag.scss
index 235c061f..2e0254ac 100644
--- a/app/styles/components/tag.scss
+++ b/app/styles/components/tag.scss
@@ -41,8 +41,15 @@
         margin-right: .25rem;
         padding: .4rem;
         width: 14rem;
-        +.icon-floppy {
-            margin-left: .5rem;
+    }
+    .icon-save {
+        @include svg-size();
+        cursor: pointer;
+        fill: $grayer;
+        margin-left: .5rem;
+        &:hover {
+            fill: $primary;
+            transition: .2s linear;
         }
     }
     .tag {
@@ -50,14 +57,23 @@
         margin: 0 .5rem .5rem 0;
         padding: .5rem;
     }
+    .icon-close {
+        @include svg-size(.7rem);
+        fill: $gray-light;
+        margin-left: .25rem;
+        &:hover {
+            cursor: pointer;
+            fill: $red;
+        }
+    }
     .add-tag {
         color: $gray-light;
         &:hover {
             color: $primary-light;
         }
     }
-    .icon-plus {
-        @extend %large;
+    .icon-add {
+        @include svg-size(.9rem);
     }
     .add-tag-text {
         @extend %small;
diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss
index 65788966..7fa2daa4 100644
--- a/app/styles/components/taskboard-task.scss
+++ b/app/styles/components/taskboard-task.scss
@@ -8,8 +8,8 @@
     &:hover {
         .icon-edit,
         .icon-drag-h {
-            color: $card-dark;
             display: block;
+            fill: $card-dark;
             opacity: 1;
             transition: color .3s linear, opacity .3s linear;
         }
@@ -25,14 +25,14 @@
         background: $red;
         border: 1px solid darken($red, 10%);
         color: $white;
-        a,
+        svg,
         span {
             color: $white;
+            fill: $white;
         }
         &:hover {
-            .icon-edit,
-            .icon-drag-h {
-                color: $white;
+            .icon-edit {
+                fill: currentColor;
             }
         }
     }
@@ -80,14 +80,15 @@
         }
     }
     .icon-iocaine {
-        @extend %large;
         background: $black;
         border-radius: 5px;
-        color: $white;
+        fill: $white;
+        height: 1.75rem;
         left: .2rem;
-        padding: .1rem;
+        padding: .25rem;
         position: absolute;
         top: 1rem;
+        width: 1.75rem;
     }
     .task-assigned {
         @extend %small;
@@ -118,26 +119,21 @@
         bottom: .5rem;
         position: absolute;
     }
-    .icon-edit,
-    .icon-drag-h {
-        @extend %large;
+    .icon-edit {
+        @include svg-size(1.1rem);
         bottom: .5rem;
-        color: $card-hover;
+        cursor: pointer;
+        fill: $card-hover;
         opacity: 0;
         position: absolute;
         &:hover {
-            color: $card-dark;
+            fill: $card-dark;
         }
     }
     .icon-edit,
     .loading {
         right: 1rem;
     }
-    .icon-drag-h {
-        @extend %xlarge;
-        cursor: move;
-        right: 45%;
-    }
 }
 
 .task-drag {
diff --git a/app/styles/components/track-btn.scss b/app/styles/components/track-btn.scss
index ba944611..b4c108e9 100644
--- a/app/styles/components/track-btn.scss
+++ b/app/styles/components/track-btn.scss
@@ -12,25 +12,23 @@
     display: inline-flex;
     position: relative;
     .track-inner {
-        align-items: stretch;
+        align-items: center;
         background: $whitish;
         border-radius: 4px 0 0 4px;
         display: flex;
         flex: 1;
         flex-basis: 140px;
+        justify-content: flex-start;
         margin-right: .1rem;
         min-width: 140px;
         &:hover {
             background: darken($whitish, 5%);
             transition: background .3s;
         }
-        span {
-            align-self: center;
-        }
-        .icon-arrow-up {
-            margin-left: auto;
-            padding: 0 .5rem;
-            transform: rotate(180deg);
+        .icon-arrow-down {
+            height: .6rem;
+            margin: 0 .5rem 0 auto;
+            width: .6rem;
         }
     }
     &:hover {
@@ -41,7 +39,7 @@
             background: rgba($primary-light, .2);
         }
         .track-icon {
-            path {
+            svg {
                 fill: $primary;
             }
         }
@@ -53,13 +51,9 @@
     .track-icon {
         padding: .3rem .6rem .3rem .75rem;
         svg {
-            height: 1.1rem;
+            fill: $grayer;
             position: relative;
             top: 2px;
-            width: 1.1rem;
-        }
-        path {
-            fill: $grayer;
         }
     }
     .track-button-counter {
@@ -79,7 +73,7 @@
                 color: $whitish;
                 transition: background .3s;
             }
-            path {
+            svg {
                 fill: $red-light;
             }
         }
@@ -121,7 +115,7 @@
     .watch-check {
         height: 1.25rem;
         width: 1.25rem;
-        path {
+        svg {
             fill: $primary-light;
         }
     }
@@ -155,7 +149,7 @@
             background: rgba($primary-light, .2);
             color: $primary;
             transition: all .3s;
-            path {
+            svg {
                 fill: $primary;
             }
         }
@@ -163,22 +157,18 @@
             background: $red;
             color: $whitish;
             svg {
+                fill: $red-light;
                 transform: rotate(180deg);
                 transition: all .3s;
             }
-            path {
-                fill: $red-light;
-            }
         }
     }
     svg {
+        fill: $gray-light;
         height: 1rem;
         width: 1rem;
     }
     span {
         display: block;
     }
-    path {
-        fill: $gray-light;
-    }
 }
diff --git a/app/styles/components/user-list.scss b/app/styles/components/user-list.scss
index 299014ae..01771bc1 100644
--- a/app/styles/components/user-list.scss
+++ b/app/styles/components/user-list.scss
@@ -47,12 +47,16 @@
             position: relative;
             transition: background .3s linear;
             transition-delay: .1s;
-            .icon-delete {
-                opacity: 1;
-                position: absolute;
-                right: 1rem;
-                top: 1.5rem;
-                transition: opacity .2s ease-in;
+        }
+        .remove-assigned-to {
+            fill: $grayer;
+            opacity: 1;
+            position: absolute;
+            right: 1rem;
+            top: 1.5rem;
+            transition: all .2s ease-in;
+            &:hover {
+                fill: $red;
             }
         }
     }
@@ -63,7 +67,7 @@
     margin-top: 1rem;
     .user-list-single {
         &:hover {
-            .icon-delete {
+            .delete-watcher {
                 opacity: 1;
                 transition: opacity .2s ease-in;
             }
@@ -73,14 +77,16 @@
         flex: 1;
         position: relative;
     }
-    .icon-delete {
+    .delete-watcher {
+        cursor: pointer;
+        fill: currentColor;
         opacity: 0;
         position: absolute;
         right: .5rem;
         top: 0;
         transition: all .2s ease-in;
         &:hover {
-            color: $red;
+            fill: $red;
             transition: color .3s ease-in;
         }
     }
diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss
index c2eba8f0..fdec382a 100644
--- a/app/styles/core/base.scss
+++ b/app/styles/core/base.scss
@@ -82,10 +82,6 @@ body {
     padding: 1rem 2rem;
 }
 
-.icon {
-    @extend %taiga;
-}
-
 .hidden {
     // scss-lint:disable ImportantRule
     display: none !important;
diff --git a/app/styles/core/elements.scss b/app/styles/core/elements.scss
index cfd2bbf5..3dc9f83e 100644
--- a/app/styles/core/elements.scss
+++ b/app/styles/core/elements.scss
@@ -31,10 +31,6 @@ sup {
     vertical-align: super;
 }
 
-.icon {
-    vertical-align: middle;
-}
-
 .clickable {
     cursor: pointer;
 }
diff --git a/app/styles/core/forms.scss b/app/styles/core/forms.scss
index 238bdbd8..ebd15ecd 100644
--- a/app/styles/core/forms.scss
+++ b/app/styles/core/forms.scss
@@ -41,9 +41,11 @@ textarea {
     }
 }
 .icon-capslock {
-    bottom: .6rem;
-    color: $gray;
+    bottom: .8rem;
     display: none;
+    fill: $gray;
+    height: .9rem;
     position: absolute;
     right: 1rem;
+    width: .9rem;
 }
diff --git a/app/styles/core/typography.scss b/app/styles/core/typography.scss
index f353c83c..18b984e4 100755
--- a/app/styles/core/typography.scss
+++ b/app/styles/core/typography.scss
@@ -117,188 +117,3 @@ a:visited {
         transition: color .3s linear;
     }
 }
-
-// Taiga Icons
-[data-icon]::before {
-
-    // scss-lint:disable ImportantRule
-    content: attr(data-icon);
-    font-family: 'taiga' !important;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    font-style: normal !important;
-    font-variant: normal !important;
-    font-weight: normal !important;
-    line-height: 1;
-    speak: none;
-    text-transform: none !important;
-}
-
-[class^='icon-']::before,
-[class*=' icon-']::before {
-
-    // scss-lint:disable ImportantRule
-    font-family: 'taiga' !important;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    font-style: normal !important;
-    font-variant: normal !important;
-    font-weight: normal !important;
-    line-height: 1;
-    speak: none;
-    text-transform: none !important;
-}
-
-.icon-bug::before {
-    content: 'a';
-}
-.icon-copy::before {
-    content: 'b';
-}
-.icon-minimize::before {
-    content: 'c';
-}
-.icon-maximize::before {
-    content: 'd';
-}
-.icon-comment::before {
-    content: 'e';
-}
-.icon-plus::before {
-    content: 'f';
-}
-.icon-attachments::before {
-    content: 'g';
-}
-.icon-edit::before {
-    content: 'h';
-}
-.icon-documents::before {
-    content: 'i';
-}
-.icon-delete::before {
-    content: 'j';
-}
-.icon-arrow-bottom::before {
-    content: 'k';
-}
-.icon-arrow-left::before {
-    content: 'l';
-}
-.icon-arrow-right::before {
-    content: 'm';
-}
-.icon-arrow-up::before {
-    content: 'n';
-}
-.icon-briefcase::before {
-    content: 'o';
-}
-.icon-caret-down::before {
-    content: 'p';
-}
-.icon-caret-up::before {
-    content: 'q';
-}
-.icon-check-square::before {
-    content: 'r';
-}
-.icon-notification-error::before {
-    content: 's';
-}
-.icon-settings::before {
-    content: 't';
-}
-.icon-document::before {
-    content: 'u';
-}
-.icon-warning::before {
-    content: 'v';
-}
-.icon-move::before {
-    content: 'w';
-}
-.icon-drag-v::before {
-    content: 'x';
-}
-.icon-filter::before {
-    content: 'y';
-}
-.icon-help::before {
-    content: 'z';
-}
-.icon-reload::before {
-    content: 'A';
-}
-.icon-writer::before {
-    content: 'B';
-}
-.icon-stats::before {
-    content: 'C';
-}
-.icon-floppy::before {
-    content: 'D';
-}
-.icon-warning-alt::before {
-    content: 'E';
-}
-.icon-video::before {
-    content: 'F';
-}
-.icon-bulk::before {
-    content: 'G';
-}
-.icon-vunfold::before {
-    content: 'H';
-}
-.icon-tasks::before {
-    content: 'I';
-}
-.icon-kanban::before {
-    content: 'J';
-}
-.icon-search::before {
-    content: 'K';
-}
-.icon-wiki::before {
-    content: 'L';
-}
-.icon-team::before {
-    content: 'M';
-}
-.icon-vfold::before {
-    content: 'N';
-}
-.icon-issues::before {
-    content: 'O';
-}
-.icon-iocaine::before {
-    content: 'P';
-}
-.icon-archive::before {
-    content: 'Q';
-}
-.icon-capslock::before {
-    content: 'R';
-}
-.icon-upload::before {
-    content: 'S';
-}
-.icon-github::before {
-    content: 'T';
-}
-.icon-timeline::before {
-    content: 'U';
-}
-.icon-scrum::before {
-    content: 'V';
-}
-.icon-project::before {
-    content: 'W';
-}
-.icon-heart::before {
-    content: 'X';
-}
-.icon-eye::before {
-    content: 'Y';
-}
diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss
index 15e473ee..df38b422 100644
--- a/app/styles/dependencies/helpers.scss
+++ b/app/styles/dependencies/helpers.scss
@@ -12,7 +12,6 @@
 %light {font-family: 'OpenSans-Light', Arial, Helvetica, sans-serif; }
 %text {font-family: 'OpenSans-Regular', Arial, Helvetica, sans-serif; }
 %bold {font-family: 'OpenSans-Semibold', Arial, Helvetica, sans-serif; }
-%taiga {font-family: 'taiga'; }
 %mono {font-family: 'courier new', 'monospace';}
 
 %lightbox {
@@ -25,14 +24,17 @@
     top: 0;
     z-index: 99910;
     .close {
-        @extend %xlarge;
-        color: $gray;
+        cursor: pointer;
+        fill: $gray;
         position: absolute;
-        right: 2rem;
-        top: 1rem;
-        transition: color .2s;
+        right: 3rem;
+        top: 3rem;
+        transition: fill .2s;
         &:hover {
-            color: $primary;
+            fill: $red-light;
+        }
+        svg {
+            @include svg-size(2rem);
         }
     }
     &.open {
diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss
index b9101fad..58fa132d 100644
--- a/app/styles/dependencies/mixins.scss
+++ b/app/styles/dependencies/mixins.scss
@@ -120,24 +120,18 @@
         display: flex;
         .icon {
             display: block;
-            margin-right: .2rem;
-            width: 16px;
+            margin-right: .25rem;
         }
         &.active {
             color: $primary;
-            path {
+            .icon {
                 fill: currentcolor;
             }
         }
     }
     .icon {
-        svg {
-            height: 1rem;
-            width: 1rem;
-        }
-        path {
-            fill: currentcolor;
-        }
+        @include svg-size(.75rem);
+        fill: $gray-light;
     }
 }
 
diff --git a/app/styles/dependencies/mixins/project-card.scss b/app/styles/dependencies/mixins/project-card.scss
index 2d1102e8..1c6e6365 100644
--- a/app/styles/dependencies/mixins/project-card.scss
+++ b/app/styles/dependencies/mixins/project-card.scss
@@ -26,7 +26,8 @@
         margin-top: auto;
         svg {
             @include svg-size(.8rem);
-            fill: $gray-light;
+            fill: currentColor;
+            margin-right: .25rem;
         }
         .svg-eye-closed {
             display: none;
@@ -40,7 +41,7 @@
         &.active {
             color: $primary;
             svg {
-                fill: $primary;
+                fill: currentColor;
             }
         }
     }
@@ -71,10 +72,8 @@
         }
     }
     .look-for-people {
-        svg {
-            @include svg-size(1rem);
-            fill: $gray-light;
-            margin: 0 .5rem;
-        }
+        @include svg-size(1rem);
+        fill: $gray-light;
+        margin: 0 .5rem;
     }
 }
diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss
index 77b905f8..044a93b4 100644
--- a/app/styles/layout/backlog.scss
+++ b/app/styles/layout/backlog.scss
@@ -11,8 +11,8 @@
         padding: .4rem 1.5rem;
         &.active,
         &:hover {
-            background: $gray;
-            color: $whitish;
+            background: $gray-light;
+            color: $gray;
         }
         &.active {
             &:hover {
diff --git a/app/styles/layout/ticket-detail.scss b/app/styles/layout/ticket-detail.scss
index b71fbed5..c2289163 100644
--- a/app/styles/layout/ticket-detail.scss
+++ b/app/styles/layout/ticket-detail.scss
@@ -79,7 +79,7 @@
             width: 100%;
         }
         .us-title-text:hover {
-            .icon-edit {
+            .edit {
                 opacity: 1;
                 transition: opacity .3s linear;
             }
@@ -99,13 +99,13 @@
             padding-right: 1rem;
             width: 100%;
         }
-        .icon-edit,
-        .icon-floppy {
-            @extend %large;
-            color: $gray-light;
+        .edit,
+        .save {
+            cursor: pointer;
+            fill: $gray-light;
             margin-left: .5rem;
         }
-        .icon-edit {
+        .edit {
             opacity: 0;
         }
         .us-related-task {
@@ -167,8 +167,9 @@
     position: absolute;
     right: 1rem;
     top: 1rem;
-    a {
-        @extend %xlarge;
+    svg {
+        @include svg-size(1.2rem);
+        fill: currentColor;
     }
 }
 
@@ -202,6 +203,7 @@
     &:hover {
         .view-description {
             .edit {
+
                 opacity: 1;
                 top: -1.5rem;
                 transition: all .2s linear;
@@ -240,23 +242,28 @@
         }
     }
     .edit {
-        color: $grayer;
+        cursor: pointer;
+        fill: $gray;
     }
     .view-description {
         .edit {
             background: $whitish;
+            height: 2rem;
             left: 0;
             opacity: 0;
             padding: .2rem .5rem;
             position: absolute;
             top: 0;
             transition: all .2s linear;
+            width: 2rem;
         }
     }
     .edit-description {
         margin-bottom: 2rem;
         .save {
-            top: .4rem;
+            cursor: pointer;
+            position: relative;
+            top: .3rem;
         }
         .edit {
             position: absolute;
diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss
index 50134ab9..dbec51e2 100644
--- a/app/styles/layout/wiki.scss
+++ b/app/styles/layout/wiki.scss
@@ -7,13 +7,11 @@
         @extend %small;
         color: $gray-light;
         &:hover {
-            span {
-                color: $grayer;
-                transition: color .2s linear;
-            }
+            color: $red-light;
+            transition: color .1s linear;
             .icon {
-                color: $red;
-                transition: color .2s linear;
+                fill: $red-light;
+                transition: fill .1s linear;
             }
         }
         .icon {
@@ -43,20 +41,25 @@
                 transition: all .2s linear;
             }
         }
-        .edit {
-            background: $whitish;
-            left: 0;
-            opacity: 0;
-            padding: .2rem .5rem;
-            position: absolute;
-            top: 0;
-            transition: all .2s linear;
+    }
+    .edit {
+        @include svg-size(2rem);
+        background: $whitish;
+        left: 0;
+        opacity: 0;
+        padding: .2rem .5rem;
+        position: absolute;
+        top: 0;
+        transition: all .2s linear;
+        &:hover {
+            cursor: pointer;
         }
     }
     .edit-wiki-content {
         .icon {
             &:hover {
-                color: $grayer;
+                cursor: pointer;
+                fill: $primary-dark;
                 opacity: .3;
                 transition: all .2s linear;
             }
diff --git a/app/styles/modules/admin/admin-common.scss b/app/styles/modules/admin/admin-common.scss
index b247f1e2..fe3fe486 100644
--- a/app/styles/modules/admin/admin-common.scss
+++ b/app/styles/modules/admin/admin-common.scss
@@ -10,11 +10,13 @@
     }
     .total {
         @extend %large;
+        align-items: center;
         background-color: $whitish;
         color: $grayer;
+        display: flex;
         padding: .3rem 1rem;
         &:hover {
-            .edit-value {
+            .icon-edit {
                 opacity: 1;
                 transition: opacity .3s linear;
             }
diff --git a/app/styles/modules/admin/admin-custom-attributes.scss b/app/styles/modules/admin/admin-custom-attributes.scss
index ee7a21d5..ef5a1767 100644
--- a/app/styles/modules/admin/admin-custom-attributes.scss
+++ b/app/styles/modules/admin/admin-custom-attributes.scss
@@ -27,7 +27,7 @@
             background: rgba($primary-light, .05);
             cursor: move;
             transition: background .2s linear;
-            .icon-drag-v,
+            .icon-drag,
             .custom-options {
                 opacity: 1;
                 transition: opacity .2s linear;
@@ -47,15 +47,15 @@
         border-bottom: 1px solid $whitish;
         color: $gray;
     }
-    .icon-drag-v {
-        color: $gray-light;
+    .icon-drag {
+        fill: $gray-light;
         opacity: 0;
         padding: 0 .1rem;
         transition: color .2s linear;
         vertical-align: middle;
         &:hover {
-            color: $gray;
             cursor: move;
+            fill: $gray;
             transition: color .2s linear;
         }
     }
@@ -83,15 +83,20 @@
         flex-shrink: 0;
         opacity: 0;
         text-align: center;
-        a {
-            color: $gray-light;
+        svg {
+            cursor: pointer;
+            fill: $gray-light;
             margin-right: .5rem;
             transition: color .2s linear;
             vertical-align: middle;
             &:hover {
-                color: $primary;
+                fill: $primary;
                 transition: color .2s linear;
             }
+            &.icon-trash,
+            &.icon-close {
+                fill: $red-light;
+            }
         }
     }
     .custom-options-wrapper {
diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss
index 1a02ff99..e928d937 100644
--- a/app/styles/modules/admin/admin-functionalities.scss
+++ b/app/styles/modules/admin/admin-functionalities.scss
@@ -23,10 +23,10 @@
             opacity: 1;
         }
         .icon {
-            @extend %xxlarge;
-            flex-basis: 60px;
-            margin: 0 auto;
-            min-width: 60px;
+            fill: $gray;
+            height: 3rem;
+            margin: 1rem auto;
+            width: 3rem;
         }
         .desc {
             text-align: center;
diff --git a/app/styles/modules/admin/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss
index 93b42f1d..5780eaf9 100644
--- a/app/styles/modules/admin/admin-membership-table.scss
+++ b/app/styles/modules/admin/admin-membership-table.scss
@@ -62,10 +62,10 @@
         }
     }
     .delete {
-        @extend %large;
-        color: $gray-light;
+        fill: $gray-light;
+        transition: fill .2s;
         &:hover {
-            color: $red;
+            fill: $red;
         }
     }
     .pending {
diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss
index b11656d4..cd817290 100644
--- a/app/styles/modules/admin/admin-roles.scss
+++ b/app/styles/modules/admin/admin-roles.scss
@@ -4,13 +4,23 @@
         @extend %light;
         color: $grayer;
     }
-    .edit-value {
-        @extend %medium;
-        color: $gray-light;
+    .icon {
+        &:hover {
+            fill: $primary;
+            transition: fill .2s linear;
+        }
+    }
+    .icon-edit {
         cursor: pointer;
+        fill: $gray-light;
         margin-left: .5rem;
         opacity: 0;
-        transition: opacity .3s linear;
+        transition: opacity .2s linear;
+    }
+    .icon-save {
+        fill: $gray-light;
+        margin-left: .5rem;
+        transition: fill .2s linear;
     }
     .edit-role {
         background-color: $whitish;
@@ -21,15 +31,6 @@
             background-color: $white;
             width: 50%;
         }
-        .icon-floppy {
-            color: $gray-light;
-            margin-left: .5rem;
-            transition: color.3s linear;
-            &:hover {
-                color: $primary;
-                transition: color.3s linear;
-            }
-        }
     }
     .any-computable-role {
         background: $red;
diff --git a/app/styles/modules/admin/admin-third-parties-webhooks.scss b/app/styles/modules/admin/admin-third-parties-webhooks.scss
index 8ef4fa0c..825314eb 100644
--- a/app/styles/modules/admin/admin-third-parties-webhooks.scss
+++ b/app/styles/modules/admin/admin-third-parties-webhooks.scss
@@ -1,5 +1,6 @@
 .admin-webhooks {
     .webhooks-table {
+        margin-bottom: 1rem;
         .row {
             border-bottom: 0;
             padding: .5rem 0;
@@ -60,14 +61,13 @@
         min-width: 100px;
         text-align: center;
         a {
-            color: $gray-light;
             margin-right: .5rem;
-            transition: color .2s linear;
-            vertical-align: middle;
+        }
+        svg {
+            fill: $gray-light;
             &:hover {
-                color: $primary;
-                transition: color .2s linear;
-
+                fill: $primary;
+                transition: fill .2s linear;
             }
         }
     }
diff --git a/app/styles/modules/admin/project-csv.scss b/app/styles/modules/admin/project-csv.scss
index e6f16a08..4c370888 100644
--- a/app/styles/modules/admin/project-csv.scss
+++ b/app/styles/modules/admin/project-csv.scss
@@ -13,8 +13,12 @@
             @extend %small;
             min-width: 110px;
         }
-        .icon {
+        .icon:not(.icon-clipboard) {
+            fill: currentColor;
+            height: .9rem;
             margin-right: .3rem;
+            vertical-align: middle;
+            width: .9rem;
         }
     }
     .field-with-options {
diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss
index 7ef3ae5b..d55a0516 100644
--- a/app/styles/modules/admin/project-values.scss
+++ b/app/styles/modules/admin/project-values.scss
@@ -9,11 +9,11 @@
         position: relative;
     }
     .icon {
-        @extend %large;
-        color: $gray-light;
+        cursor: pointer;
+        fill: $gray-light;
         opacity: 0;
         &:hover {
-            color: $grayer;
+            fill: $grayer;
             transition: all .2s ease-in;
         }
     }
@@ -61,16 +61,10 @@
 }
 
 .project-values-settings {
-    a {
-        @extend %large;
-        color: $gray;
+    svg {
         margin-right: .5rem;
-        &:hover {
-            color: $primary;
-            transition: color .3s linear;
-            .icon-delete {
-                color: $red;
-            }
+        &.icon-trash {
+            fill: $red-light;
         }
     }
 }
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 9b84249f..934d5b64 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -28,25 +28,12 @@
             flex-grow: 0;
             flex-shrink: 0;
         }
-        .votes {
-            color: $gray;
-            flex-basis: 65px;
-            flex-grow: 0;
-            flex-shrink: 0;
-            text-align: center;
-            &.inactive {
-                color: $gray-light;
-            }
-            &.is-voted {
-                color: $primary-light;
-            }
-        }
         .user-stories {
             overflow: hidden;
             width: 100%;
         }
         .status {
-            flex-basis: 100px;
+            flex-basis: 120px;
             flex-grow: 0;
             flex-shrink: 0;
         }
@@ -56,6 +43,30 @@
         }
 
     }
+    .votes {
+        color: $gray;
+        flex-basis: 65px;
+        flex-grow: 0;
+        flex-shrink: 0;
+        text-align: center;
+        &.inactive {
+            color: $gray-light;
+            svg {
+                fill: $gray-light;
+            }
+        }
+        &.is-voted {
+            color: $primary-light;
+            fill: $primary-light;
+        }
+        svg {
+            fill: $gray;
+            height: .75rem;
+            margin-right: .25rem;
+            vertical-align: middle;
+            width: .75rem;
+        }
+    }
     .status,
     .points {
         position: relative;
@@ -70,7 +81,8 @@
             }
         }
         .icon {
-            color: $gray-light;
+            @include svg-size(.75rem);
+            fill: currentColor;
             margin-left: .2rem;
         }
     }
@@ -122,7 +134,7 @@
         @extend %medium;
         border-bottom: 2px solid $gray-light;
         flex-wrap: nowrap;
-        padding-right: 30px;
+        padding-right: 1rem;
     }
     .points {
         cursor: pointer;
@@ -145,7 +157,7 @@
             transition: background .2s ease-in;
             transition-delay: .2s;
             .us-settings,
-            .icon-drag-v {
+            .icon-drag {
                 opacity: 1;
                 transition: all .2s ease-in;
             }
@@ -165,6 +177,11 @@
                 cursor: text;
             }
         }
+        .icon-arrow-down {
+            fill: $gray-light;
+            height: .7rem;
+            width: .7rem;
+        }
     }
     .sortable-placeholder {
         background: $whitish;
@@ -241,26 +258,24 @@
             top: -3px;
         }
     }
-    .us-settings a,
-    .icon-drag-v {
-        @extend %large;
-        color: $gray-light;
-        transition: all .2s ease-in;
-        width: 30px;
-        &:hover {
-            color: $grayer;
-            transition: all .2s ease-in;
-        }
-    }
     .us-settings {
         flex-shrink: 0;
-        margin: 0 0 0 2rem;
+        margin-left: 2rem;
         opacity: 0;
+        svg {
+            fill: $gray-light;
+            margin-right: .5rem;
+            transition: fill .2s ease-in;
+            &:hover {
+                fill: $primary-light;
+            }
+        }
     }
-    .icon-drag-v {
+    .icon-drag {
         cursor: move;
+        fill: $gray-light;
         opacity: 0;
-        padding: .1rem .5rem 0 0;
+        padding: .1rem;
     }
     .readonly {
         cursor: auto;
diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss
index 7ba4d2cb..7029229d 100644
--- a/app/styles/modules/backlog/sprints.scss
+++ b/app/styles/modules/backlog/sprints.scss
@@ -16,13 +16,9 @@
             background: $primary-light;
         }
         svg {
-            height: 1.4rem;
-            max-height: 1.4rem;
-            max-width: 1.5rem;
-            width: 1.5rem;
-        }
-        path {
             fill: $whitish;
+            height: 1.4rem;
+            width: 1.5rem;
         }
     }
     .filter-closed-sprints {
@@ -53,7 +49,7 @@
             @extend %title;
             @include ellipsis($width: 90%);
             display: inline-block;
-            margin-right: 3px;
+            margin-right: .5rem;
         }
     }
     .sprint {
@@ -69,24 +65,8 @@
                 transition: opacity .2s ease-in;
             }
         }
-        .icon {
-            display: inline-block;
-        }
-        .icon-arrow-up {
-            transform: rotate(90deg);
-            transition: all .2s linear;
-            vertical-align: baseline;
-            &.active {
-                transform: rotate(180deg);
-                transition: all .2s linear;
-            }
-            &:hover {
-                color: $primary-light;
-                transition: color .2s linear;
-            }
-        }
-        .icon-edit {
-            color: $gray-light;
+        .edit-sprint {
+            fill: $gray-light;
             opacity: 0;
             position: absolute;
             right: 0;
@@ -94,8 +74,9 @@
             transition: opacity .2s ease-in;
             vertical-align: baseline;
             &:hover {
-                color: $primary;
-                transition: color .2s ease-in;
+                cursor: pointer;
+                fill: $primary;
+                transition: fill .2s ease-in;
             }
         }
         .number {
@@ -129,6 +110,20 @@
             }
         }
     }
+    .compact-sprint {
+        transform: rotate(0);
+        transition: all .2s;
+        &.active {
+            transform: rotate(90deg);
+            transition: all .2s;
+        }
+        &:hover {
+            .icon {
+                fill: $primary-light;
+                transition: color .2s;
+            }
+        }
+    }
     .sprint-progress-bar {
         background: $gray-light;
         border-radius: 2px;
diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss
index dae0c4fb..67ed9612 100644
--- a/app/styles/modules/backlog/taskboard-table.scss
+++ b/app/styles/modules/backlog/taskboard-table.scss
@@ -89,11 +89,12 @@ $column-margin: 0 10px 0 0;
         }
         .icon {
             @extend %medium;
-            color: $gray-light;
+            fill: $gray-light;
             margin-right: .3rem;
-            transition: color .2s linear;
+            transition: fill .2s linear;
             &:hover {
-                color: $primary;
+                cursor: pointer;
+                fill: $primary;
             }
             &.hfold,
             &.hunfold {
@@ -157,8 +158,8 @@ $column-margin: 0 10px 0 0;
                 background: rgba($red, .6);
 
             }
-            .taskboard-userstory-box a,
-            .taskboard-userstory-box a:hover,
+            .taskboard-userstory-box svg,
+            .taskboard-userstory-box svg:hover,
             .points-value,
             .points-value:hover {
                 color: $white;
@@ -174,7 +175,7 @@ $column-margin: 0 10px 0 0;
                 @include ellipsis(100%);
             }
             .points-value,
-            .icon-plus,
+            .icon-add,
             .icon-bulk {
                 display: none;
             }
@@ -184,21 +185,23 @@ $column-margin: 0 10px 0 0;
     .taskboard-userstory-box {
         padding: .5rem .5rem .5rem 1.5rem;
         .icon {
-            color: $gray-light;
+            cursor: pointer;
+            fill: $gray-light;
             position: absolute;
             right: .5rem;
             top: .7rem;
-            transition: color .2s linear;
+            transition: fill .2s linear;
             &:hover {
-                color: $primary;
+                fill: $primary;
             }
-            &.icon-plus {
+            &.icon-add {
                 right: 2rem;
             }
-            &.icon-vfold,
-            &.icon-vunfold {
+            &.icon-fold-row,
+            &.icon-unfold-row {
                 left: 0;
                 right: inherit;
+                top: 1rem;
             }
         }
     }
diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss
index 71a41c07..907c3255 100644
--- a/app/styles/modules/common/assigned-to.scss
+++ b/app/styles/modules/common/assigned-to.scss
@@ -7,11 +7,9 @@
     padding: 1rem 0;
     position: relative;
     &:hover {
-        .assigned-to {
-            .icon-delete {
-                opacity: 1;
-                transition: opacity .3s linear;
-            }
+        .remove-user {
+            opacity: 1;
+            transition: opacity .3s linear;
         }
     }
     .loading-spinner {
@@ -60,15 +58,33 @@
         .assigned-to-options {
             display: inline-block;
         }
-        .icon-delete {
-            color: $gray-light;
-            opacity: 0;
-            position: absolute;
-            right: 0;
-            top: 2rem;
+        .user-assigned,
+        .assign-to-me {
+            color: $primary;
+            cursor: default;
             &:hover {
-                color: $red;
+                cursor: pointer;
             }
+            .icon {
+                fill: currentColor;
+                height: .75rem;
+                width: .75rem;
+            }
+            span {
+                @include ellipsis(80%);
+            }
+        }
+    }
+    .remove-user {
+        fill: $gray;
+        opacity: 0;
+        position: absolute;
+        right: .5rem;
+        top: 2rem;
+        &:hover {
+            cursor: pointer;
+            fill: $red;
+            transition: fill .2s;
         }
     }
     .user-assigned,
diff --git a/app/styles/modules/common/category-config.scss b/app/styles/modules/common/category-config.scss
index d0a29f25..43a5479d 100644
--- a/app/styles/modules/common/category-config.scss
+++ b/app/styles/modules/common/category-config.scss
@@ -9,6 +9,15 @@
         display: flex;
         padding: 1rem;
         position: relative;
+        &.open-drawer {
+            .icon {
+                transform: rotate(90deg);
+            }
+        }
+    }
+    .icon {
+        transform: rotate(0);
+        transition: all .4s;
     }
     .resume-title {
         width: 280px;
@@ -35,11 +44,6 @@
             }
         }
     }
-    .icon {
-        @extend %xlarge;
-        flex: 1;
-        text-align: right;
-    }
     .category-items {
         @include slide(400px, hidden);
         background-color: $whitish;
diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss
index 314c87de..fa1f15bb 100644
--- a/app/styles/modules/common/colors-table.scss
+++ b/app/styles/modules/common/colors-table.scss
@@ -10,6 +10,21 @@
             padding-left: 50px;
         }
     }
+    .table-main {
+        .row:hover {
+            background: lighten($primary, 60%);
+            cursor: move;
+            transition: background .2s ease-in;
+            .icon {
+                opacity: 1;
+                transition: opacity .2s ease-in;
+            }
+            .options-column {
+                opacity: 1;
+                transition: opacity .3s linear;
+            }
+        }
+    }
     form {
         &:last-child {
             .row {
@@ -23,19 +38,6 @@
         display: flex;
         justify-content: center;
         padding: 1rem;
-        &:hover {
-            background: lighten($primary, 60%);
-            cursor: move;
-            transition: background .2s ease-in;
-            .icon {
-                opacity: 1;
-                transition: opacity .2s ease-in;
-            }
-            .options-column {
-                opacity: 1;
-                transition: opacity .3s linear;
-            }
-        }
         &:last-child {
             border: 0;
         }
@@ -112,26 +114,27 @@
         width: 40px;
     }
     .icon {
-        @extend %large;
-        color: $gray-light;
+        cursor: pointer;
+        fill: $gray-light;
         margin-right: 1rem;
         opacity: 0;
         &:hover {
-            color: $primary;
+            fill: $primary;
             transition: all .2s ease-in;
         }
-        &.icon-check-square {
+        &.icon-check {
+            cursor: default;
+            fill: $primary;
             opacity: 1;
         }
-    }
-    .icon-delete {
-        &:hover {
-            color: $red;
+        &.icon-drag {
+            cursor: move;
+        }
+        &.icon-trash {
+            &:hover {
+                fill: $red-light;
+            }
         }
-    }
-    .icon-check-square {
-        @extend %large;
-        color: $primary;
     }
 
 }
diff --git a/app/styles/modules/common/custom-fields.scss b/app/styles/modules/common/custom-fields.scss
index ed9816b2..4adab4e5 100644
--- a/app/styles/modules/common/custom-fields.scss
+++ b/app/styles/modules/common/custom-fields.scss
@@ -8,15 +8,8 @@
         display: flex;
         justify-content: space-between;
         padding: .5rem 1rem;
-        .icon-arrow-bottom {
-            @extend %large;
+        .icon {
             cursor: pointer;
-            transform: rotate(-90deg);
-            transition: transform .2s linear;
-            &.open {
-                transform: rotate(0);
-                transition: transform .2s linear;
-            }
         }
     }
     .custom-fields-body {
@@ -37,14 +30,16 @@
                 margin-top: .5rem;
             }
         }
-        .custom-field-options {
-            opacity: 0;
-            transition: opacity .2s linear;
-            a {
-                color: $gray-light;
-            }
-            a:hover {
-                color: $primary;
+    }
+    .custom-field-options {
+        margin: 0;
+        opacity: 0;
+        transition: opacity .2s linear;
+        svg {
+            cursor: pointer;
+            fill: $gray-light;
+            &:hover {
+                fill: $primary;
             }
         }
     }
@@ -62,9 +57,6 @@
             line-height: .9rem;
         }
     }
-    .custom-field-options {
-        margin: 0;
-    }
     .custom-field-value {
         @extend %light;
         align-items: flex-start;
diff --git a/app/styles/modules/common/history.scss b/app/styles/modules/common/history.scss
index 96e4fdf4..f39e2247 100644
--- a/app/styles/modules/common/history.scss
+++ b/app/styles/modules/common/history.scss
@@ -7,7 +7,7 @@
     &:hover {
         .icon {
             color: $primary;
-            transform: rotate(180deg);
+            transform: rotate(90deg);
             transition: all .2s linear;
         }
     }
@@ -40,33 +40,40 @@
 }
 .history-tabs {
     @extend %title;
-    border-bottom: 3px solid $gray-light;
+    border-bottom: 1px solid $whitish;
+    border-top: 1px solid $whitish;
     margin-bottom: 0;
-    padding: .5rem 0;
     li {
         @extend %large;
         display: inline-block;
         &:first-child {
-            border-right: 1px solid $gray-light;
+            border-right: 1px solid $whitish;
         }
         &:last-child {
             border-right: 0;
         }
     }
     a {
+        background: $white;
         color: $gray-light;
-        padding: 0 2rem;
+        display: inline-block;
+        padding: .5rem 2rem;
+        position: relative;
         transition: color .2s ease-in;
         &.active {
-            color: $grayer;
+            color: $primary;
+            top: 1px;
         }
         &:hover {
-            color: $primary;
+            color: $grayer;
             transition: color .2s ease-in;
         }
     }
     .icon {
+        fill: currentColor;
+        height: .75rem;
         margin-right: .5rem;
+        width: .75rem;
     }
 }
 .add-comment {
@@ -110,6 +117,14 @@
     .preview-icon {
         position: absolute;
         right: 1rem;
+        top: .5rem;
+    }
+    .edit {
+        fill: $gray-light;
+        &:hover {
+            cursor: pointer;
+            fill: $primary;
+        }
     }
     .preview-icon {
         opacity: 0;
@@ -252,14 +267,15 @@
         margin-bottom: 0;
     }
     .comment-delete {
-        color: $red;
+        cursor: pointer;
+        fill: $red-light;
         opacity: 0;
         position: absolute;
-        right: 0;
+        right: .5rem;
         top: 2rem;
         transition: all .2s linear;
         &:hover {
-            color: $red-light;
+            fill: $red;
             transition: color .2s linear;
         }
     }
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 7f57453c..01347548 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -159,9 +159,6 @@
                 margin-left: .5rem;
             }
         }
-        .icon-delete {
-            @extend %large;
-        }
     }
     .extra-text {
         margin-top: 1rem;
@@ -173,13 +170,18 @@
         width: 80%;
     }
     .icon {
-        @extend %large;
+        fill: $gray;
         margin-left: .5rem;
+        transition: fill .2s;
     }
-    .icon-delete {
-        @extend %xlarge;
+    .icon-add {
         &:hover {
-            color: $red;
+            fill: $primary-light;
+        }
+    }
+    .icon-trash {
+        &:hover {
+            fill: $red;
         }
     }
     .button {
@@ -234,17 +236,18 @@
     }
     .delete-sprint {
         @extend %small;
-        color: $grayer;
-        display: block;
-        margin-top: 1rem;
-        text-align: right;
-        a {
-            color: $gray-light;
-            margin-left: .5rem;
+        color: $gray;
+        float: right;
+        margin: 1rem .25rem 0 0;
+        transition: color .3s linear;
+        .icon {
+            fill: currentColor;
+        }
+        &:hover {
+            color: $red;
             transition: color .3s linear;
-            &:hover {
-                color: $red;
-                transition: color .3s linear;
+            .icon {
+                fill: currentColor;
             }
         }
     }
diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 5f49450c..15f9db96 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -23,15 +23,17 @@ tg-project-menu {
     position: relative;
     text-align: center;
     a {
-        color: $white;
         display: block;
-        padding: .75rem .8rem;
+        padding: 1.1rem .8rem;
         position: relative;
     }
     a:hover {
         background: rgba($black, .2);
-        color: $primary-light;
         transition: color .3s linear;
+        svg {
+            fill: $primary-light;
+            transition: fill .3s linear;
+        }
         .helper {
             @extend %small;
             animation: slideLeft 200ms ease-in-out both;
@@ -60,6 +62,7 @@ tg-project-menu {
         }
     }
     svg {
+        fill: $white;
         height: 1.5rem;
         width: 1.5rem;
         path {
diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss
index e3aa2231..241cb037 100644
--- a/app/styles/modules/common/related-tasks.scss
+++ b/app/styles/modules/common/related-tasks.scss
@@ -101,7 +101,8 @@
             }
         }
         .icon {
-            color: $gray-light;
+            @include svg-size(.8rem);
+            fill: $gray-light;
             margin-left: .2rem;
             opacity: 0;
         }
@@ -116,6 +117,7 @@
     }
     .task-name {
         display: flex;
+        justify-content: space-between;
         position: relative;
         a {
             display: inline-block;
@@ -123,6 +125,10 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
+            svg,
+            span {
+                margin-right: .25rem;
+            }
         }
         svg,
         span {
@@ -144,26 +150,6 @@
             }
         }
     }
-    .blocked,
-    .blocked:hover {
-        background: $red-light;
-        color: $white;
-        a {
-            color: $white;
-            &:hover {
-                color: $white;
-            }
-        }
-        .icon {
-            color: $white;
-            &:hover {
-                color: $white;
-            }
-        }
-    }
-    .icon-iocaine {
-        display: none;
-    }
     .iocaine,
     .iocaine:hover {
         background: rgba($primary-light, .3);
@@ -173,21 +159,48 @@
             margin-right: .5rem;
             vertical-align: top;
         }
+        a,
+        svg {
+            color: $primary-dark;
+            fill: $primary-dark;
+            &:hover {
+                color: currentColor;
+                fill: currentColor;
+            }
+        }
+    }
+    .blocked,
+    .blocked:hover {
+        background: $red-light;
+        color: $white;
+        a,
+        svg {
+            color: $white;
+            fill: $white;
+            &:hover {
+                color: currentColor;
+                fill: currentColor;
+            }
+        }
+    }
+    .icon-iocaine {
+        display: none;
     }
     .task-settings {
-        margin: 0 0 0 2rem;
+        align-items: center;
+        display: flex;
         opacity: 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-        width: 10%;
-        a {
-            @extend %large;
-            color: $gray-light;
-            transition: all .2s ease-in;
+        svg {
+            @include svg-size(1.1rem);
+            fill: $gray-light;
+            margin-right: 2rem;
+            transition: fill .2s ease-in;
             &:hover {
-                color: $grayer;
-                transition: all .2s ease-in;
+                cursor: pointer;
+                fill: $grayer;
+            }
+            &.icon-close:hover {
+                fill: $red-light;
             }
         }
     }
@@ -213,6 +226,8 @@
             white-space: nowrap;
         }
         .icon {
+            @include svg-size(.8rem);
+            fill: $gray-light;
             opacity: 0;
             position: absolute;
             right: .5rem;
diff --git a/app/styles/modules/common/ticket-data.scss b/app/styles/modules/common/ticket-data.scss
index c97d7e36..b5723c38 100644
--- a/app/styles/modules/common/ticket-data.scss
+++ b/app/styles/modules/common/ticket-data.scss
@@ -11,17 +11,20 @@
     }
     .detail-status {
         @extend %small;
-        display: inline-block;
+        display: flex;
         margin-left: .25rem;
         position: relative;
-        .icon-arrow-bottom {
+        .icon-arrow-down {
+            @include svg-size(.75rem);
+            fill: currentColor;
             margin-left: .25rem;
         }
     }
     .detail-status-inner {
+        align-items: center;
         color: $white;
         display: flex;
-        justify-content: center;
+        justify-content: flex-start;
         padding: .15rem .25rem;
         text-transform: uppercase;
     }
@@ -44,6 +47,8 @@
     @extend %normal;
     margin-bottom: 1rem;
     .icon {
+        @include svg-size(.7rem);
+        color: currentColor;
         margin-left: .25rem;
     }
 }
@@ -115,7 +120,8 @@
     .ticket-watch-inner {
         display: flex;
     }
-    .track-icon {
+    svg {
+        margin-right: .25rem;
         position: relative;
         top: 2px;
     }
@@ -130,7 +136,7 @@
         text-align: center;
         text-transform: uppercase;
         transition: background .25s;
-        path {
+        svg {
             fill: $white;
         }
         &:hover {
diff --git a/app/styles/modules/common/wizard.scss b/app/styles/modules/common/wizard.scss
index 75c60ac7..494c9048 100644
--- a/app/styles/modules/common/wizard.scss
+++ b/app/styles/modules/common/wizard.scss
@@ -94,8 +94,8 @@
                 transition: background .3s ease-in;
             }
             .icon {
-                @extend %xxlarge;
-                color: $white;
+                @include svg-size(3rem);
+                fill: currentColor;
             }
         }
         h2 {
diff --git a/app/styles/modules/filters/filters.scss b/app/styles/modules/filters/filters.scss
index 527f44cc..e1309796 100644
--- a/app/styles/modules/filters/filters.scss
+++ b/app/styles/modules/filters/filters.scss
@@ -8,13 +8,17 @@
             vertical-align: baseline;
         }
     }
-    h2 {
+    .breadcrumb {
         @extend %large;
         margin-top: 1rem;
         .icon-arrow-right {
-            @extend %medium;
+            @include svg-size(.7rem);
+            margin: 0 .25rem;
             vertical-align: middle;
         }
+        .back {
+            color: $gray-light;
+        }
     }
     input {
         background: $grayer;
@@ -79,8 +83,10 @@
         }
     }
     a {
+        align-items: center;
         color: $grayer;
-        display: block;
+        display: flex;
+        justify-content: space-between;
         padding: .5rem 0 .5rem .5rem;
         transition: color .2s ease-in;
         &:hover {
@@ -93,9 +99,11 @@
         }
     }
     .icon {
-        color: $grayer;
+        fill: currentColor;
         float: right;
+        height: .9rem;
         opacity: 0;
         transition: opacity .2s ease-in;
+        width: .9rem;
     }
 }
diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss
index d9468859..9b03dc47 100644
--- a/app/styles/modules/issues/issues-table.scss
+++ b/app/styles/modules/issues/issues-table.scss
@@ -73,6 +73,12 @@
         &.is-voted {
             color: $primary-light;
         }
+        svg {
+            @include svg-size(.75rem);
+            fill: $gray;
+            margin-right: .25rem;
+            vertical-align: middle;
+        }
     }
     .subject {
         overflow: hidden;
@@ -99,6 +105,12 @@
         padding: 0 1rem;
         position: relative;
         text-align: left;
+        .icon {
+            @include svg-size(.75rem);
+            fill: currentColor;
+            margin-left: .25rem;
+            vertical-align: middle;
+        }
     }
     .assigned-field {
         flex: 0 0 160px;
@@ -120,10 +132,11 @@
             white-space: nowrap;
         }
         .icon {
+            @include svg-size(.75rem);
             opacity: 0;
             position: absolute;
             right: 0;
-            top: .5rem;
+            top: .75rem;
             transition: opacity .3s linear;
         }
     }
diff --git a/app/styles/modules/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss
index 817c8a58..5de4736d 100644
--- a/app/styles/modules/kanban/kanban-table.scss
+++ b/app/styles/modules/kanban/kanban-table.scss
@@ -21,12 +21,7 @@ $column-margin: 0 10px 0 0;
             opacity: .8;
             padding: .5rem 0;
             transition: opacity .3s linear;
-            .icon-plus,
-            .icon-bulk,
-            .icon-vfold,
-            .icon-vunfold,
-            .icon-open-eye,
-            .icon-closed-eye,
+            .option:not(.hunfold),
             span {
                 display: none;
             }
@@ -86,51 +81,19 @@ $column-margin: 0 10px 0 0;
         span {
             @include ellipsis(65%);
         }
-        .icon {
-            @extend %medium;
-            color: $gray-light;
+        .option {
             margin-right: .3rem;
-            transition: color .2s linear;
-            &.hfold,
-            &.hunfold {
-                display: inline-block;
-                transform: rotate(90deg);
-            }
         }
-    }
-    .icon-open-eye,
-    .icon-closed-eye {
-        display: inline-block;
-        svg {
+        .icon {
             fill: $gray-light;
-            height: 1.1rem;
-            margin-top: .25rem;
-            width: 1.1rem;
-
-        }
-        &:hover {
-            svg {
+            height: 1rem;
+            transition: color .2s linear;
+            width: 1rem;
+            &:hover {
                 fill: $primary;
-
             }
         }
     }
-    .icon-open-eye {
-        .svg-eye-closed {
-            display: none;
-        }
-        .svg-eye-open {
-            display: block;
-        }
-    }
-    .icon-closed-eye {
-        .svg-eye-closed {
-            display: block;
-        }
-        .svg-eye-open {
-            display: none;
-        }
-    }
 }
 
 .kanban-table-body {
diff --git a/app/styles/modules/search/search-filter.scss b/app/styles/modules/search/search-filter.scss
index 742bd0b7..b25c5fc0 100644
--- a/app/styles/modules/search/search-filter.scss
+++ b/app/styles/modules/search/search-filter.scss
@@ -11,12 +11,12 @@
         padding: 1rem 1.25rem;
         &:hover {
             transition: color .3s linear;
-            .icon {
-                margin-right: .4rem;
-            }
             .name {
                 padding-left: 5px;
             }
+            .icon {
+                fill: currentColor;
+            }
         }
         &.active {
             border-left: 1px solid $whitish;
@@ -25,11 +25,12 @@
             position: relative;
             top: 1px;
             .icon {
-                color: $primary-light;
+                fill: $primary-light;
             }
         }
     }
     .icon {
+        fill: currentColor;
         margin-right: .4rem;
     }
     .name {
diff --git a/app/styles/modules/search/search-in.scss b/app/styles/modules/search/search-in.scss
index 19eecf56..8b30b855 100644
--- a/app/styles/modules/search/search-in.scss
+++ b/app/styles/modules/search/search-in.scss
@@ -12,7 +12,7 @@
         top: .7rem;
     }
     .icon-search {
-        color: $gray-light;
+        fill: $gray-light;
     }
     .loading-spinner {
         margin-top: .1rem;
diff --git a/app/styles/modules/team/team-filters.scss b/app/styles/modules/team/team-filters.scss
index e638fe0d..e32092b1 100644
--- a/app/styles/modules/team/team-filters.scss
+++ b/app/styles/modules/team/team-filters.scss
@@ -3,37 +3,38 @@
         margin-bottom: 1rem;
         position: relative;
     }
-    nav {
-        li {
-            @extend %larger;
-            @extend %title;
-            border-bottom: 1px solid $gray-light;
-            text-transform: uppercase;
-            &:last-child {
-                border-bottom: 0;
-            }
-        }
-        a {
-            display: block;
-            padding: 1rem 0 1rem 1rem;
-            &:hover,
-            &.active {
-                color: $primary;
-                transition: color .3s linear;
-            }
-            &.active.icon {
-                opacity: 1;
-                transition: opacity .3s linear;
-            }
-        }
-        .active {
-            opacity: 1;
-            transition: opacity .3s linear;
+    li {
+        @extend %large;
+        @extend %text;
+        border-bottom: 1px solid $gray-light;
+        text-transform: uppercase;
+        &:last-child {
+            border-bottom: 0;
         }
         .icon {
-            color: $blackish;
-            float: right;
+            fill: $blackish;
             opacity: 0;
+            transition: opacity .3s linear;
         }
     }
+    a {
+        align-content: center;
+        align-items: center;
+        display: flex;
+        justify-content: space-between;
+        padding: 1rem 0 1rem 1rem;
+        &:hover,
+        &.active {
+            color: $primary;
+            transition: color .3s linear;
+            .icon {
+                fill: currentColor;
+                opacity: 1;
+            }
+        }
+    }
+    .active {
+        opacity: 1;
+        transition: opacity .3s linear;
+    }
 }
diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss
index a75332d4..a84e4660 100644
--- a/app/styles/modules/team/team-table.scss
+++ b/app/styles/modules/team/team-table.scss
@@ -19,8 +19,8 @@
         position: relative;
         text-align: center;
         .icon {
-            color: $blackish;
-            font-size: 1.8rem;
+            @include svg-size(1.75rem);
+            fill: $gray;
         }
         .points {
             @extend %larger;
@@ -28,7 +28,7 @@
             color: $grayer;
         }
         .top {
-            color: $primary-light;
+            fill: $primary-light;
             opacity: 1;
         }
         &:hover {
@@ -39,15 +39,17 @@
     }
     .leave-project {
         @extend %small;
-        color: $gray-light;
-        display: block;
+        color: $red-light;
         .icon {
+            @include svg-size(.8rem);
+            fill: currentColor;
             margin-right: .2rem;
         }
         &:hover {
+            color: $red;
             .icon {
-                color: $red;
-                transition: color .3s linear;
+                color: currentColor;
+                transition: fill .3s linear;
             }
         }
     }
@@ -69,12 +71,12 @@
         display: flex;
         img {
             flex-basis: 66px;
-            flex-grow: 1;
-            max-width: 66px;
+            flex-grow: 0;
+            flex-shrink: 0;
+            width: 66px;
         }
-        figcaption {
+        .avatar-data {
             margin-left: 1rem;
-            width: 65%;
             span {
                 overflow: hidden;
                 text-overflow: ellipsis;
diff --git a/app/styles/modules/wiki/wiki-nav.scss b/app/styles/modules/wiki/wiki-nav.scss
index 39c20db9..f1f72c76 100644
--- a/app/styles/modules/wiki/wiki-nav.scss
+++ b/app/styles/modules/wiki/wiki-nav.scss
@@ -7,21 +7,26 @@
         &:hover {
             .icon {
                 opacity: 1;
-                transition: opacity 1s linear;
+                transition: opacity .2s linear;
+                transition-delay: .2s;
             }
         }
         a {
-            display: block;
+            align-items: center;
+            display: flex;
+            justify-content: space-between;
             padding: 1rem 0 1rem 1rem;
             span {
                 cursor: pointer;
             }
         }
         .icon {
-            color: $blackish;
-            float: right;
+            fill: $gray-light;
             opacity: 0;
-            transition: opacity 1s linear;
+            &:hover {
+                cursor: pointer;
+                fill: $red;
+            }
         }
         input {
             @extend %text;
diff --git a/app/svg/activity.svg b/app/svg/activity.svg
deleted file mode 100644
index 66e8684f..00000000
--- a/app/svg/activity.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 21.7">
-  <g transform="matrix(.55 0 0 .55 -2.17 -2.34)">
-    <path d="M32 12l4.6 4.6-9.8 9.7-8-8L4 33.3 6.8 36l12-12 8 8 12.6-12.6L44 24V12z"/>
-  </g>
-</svg>
diff --git a/app/svg/add.svg b/app/svg/add.svg
deleted file mode 100644
index 77a2901a..00000000
--- a/app/svg/add.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" version="1.1">
-    <path d="m462.1 73.3 0 352.3-352.4 0 0 75.8 352.4 0 0 352.3 75.8 0 0-352.3 352.4 0 0-75.8-352.4 0 0-352.3-75.8 0z"/>
-</svg>
diff --git a/app/svg/attachment.svg b/app/svg/attachment.svg
deleted file mode 100644
index 784be839..00000000
--- a/app/svg/attachment.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1000 1000">
-    <path transform="translate(91.675 74.66) scale(17.01355)" d="M15 36C8.92 36 4 31.07 4 25s4.92-11 11-11h21c4.42 0 8 3.58 8 8s-3.58 8-8 8H19c-2.76 0-5-2.24-5-5s2.24-5 5-5h15v3H19c-1.1 0-2 .89-2 2s.9 2 2 2h17c2.76 0 5-2.24 5-5s-2.24-5-5-5H15c-4.42 0-8 3.58-8 8s3.58 8 8 8h19v3H15z"/>
-</svg>
diff --git a/app/svg/check.svg b/app/svg/check.svg
deleted file mode 100644
index d97a17c3..00000000
--- a/app/svg/check.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20.681641 20.683598">
-    <g transform="matrix(.45977 0 0 .45977 -.884 -.962)">
-        <path d="M18 32.34L9.66 24l-2.83 2.83L18 38l24-24-2.83-2.83z" />
-    </g>
-</svg>
diff --git a/app/svg/client-requirement.svg b/app/svg/client-requirement.svg
deleted file mode 100644
index fd20989a..00000000
--- a/app/svg/client-requirement.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M106.8 0v54.4H-.4v239h176.8v-25H24.6v-189h24v95h237v-95h24V176h25V54.3H231.8V0h-125zm25 25h75v29.4h-75V25zM73.6 79.4h187v70h-187v-70zm81 20v28.5h25V99.2h-25zM200.4 200v200h200V200h-200zm25 25h150v27.4L360.8 240l-74 88-49.8-42-11.6 14v-75zm150 36.7V375h-150v-66l45.2 38.2 19 16 16.2-19 69.6-82.5z"/>
-</svg>
diff --git a/app/svg/dashboard.svg b/app/svg/dashboard.svg
deleted file mode 100644
index 1b2061a2..00000000
--- a/app/svg/dashboard.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 22.009972 21.659925" preserveAspectRatio="xMidYMid meet">
-    <g transform="translate(-448.78 -314.69)">
-        <path d="m448.78 314.69h5.4412v5.4995h-5.4412zM457.06 314.69 457.06 314.69h5.4412v5.4995h-5.4412zM465.35 314.69h5.4412v5.4995h-5.4412zM448.78 322.8h5.4412v5.4995h-5.4412zM457.06 322.8h5.4412v5.4995h-5.4412zM465.35 322.8h5.4412v5.4995h-5.4412zM448.78 330.85h5.4412v5.4995h-5.4412zM457.06 330.85h5.4412v5.4995h-5.4412zM465.35 330.85h5.4412v5.4995h-5.4412z" class="s0"/>
-    </g>
-</svg>
diff --git a/app/svg/discover.svg b/app/svg/discover.svg
deleted file mode 100644
index 5334c1bb..00000000
--- a/app/svg/discover.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22.009972 21.659925">
-  <path d="M9.5 21.9c-4.2-.6-7.7-3.48-9.03-7.5-.4-1.2-.56-2.34-.53-3.76.05-1.7.37-3 1.1-4.5.52-1.06 1.47-2.37 2.26-3.1C5 1.43 6.88.5 9.16.07c.62-.1 2.28-.15 2.98-.07 4.17.48 7.7 3.26 9.16 7.2.26.7.47 1.6.58 2.44.1.9.08 2.33-.07 3.2-.82 4.6-4.38 8.17-9 9-.8.14-2.52.17-3.3.06zm-.9-2.2c.16-.3.82-1.08 1-1.2l.4-.26c.3-.2.44-.4.66-1.02.3-.82.26-1.36-.07-1.56-.1-.04-.4-.14-.7-.22-.53-.14-1.05-.37-1.2-.54-.05-.05-.13-.23-.18-.4-.1-.37-.26-.48-.86-.66-.4-.12-.5-.13-1.53-.13-1.07 0-1.1 0-1.25-.1-.17-.16-.55-.7-.55-.82 0-.05-.04-.13-.08-.18-.06-.1-.13-.1-.42-.1-.2 0-.38 0-.42-.04-.17-.15 0-.74.3-1.06.17-.2.3-.2.72-.1.73.22 1 .48 1 1.04 0 .28.1.46.2.35.03-.04.1-.36.13-.73.16-1.34.24-1.58.7-2 .34-.33.63-.47.9-.43.16.02.3 0 .67-.16.65-.26 1-.46 1.3-.77.3-.3.38-.5.28-.85-.24-.82-.87-1.4-1.53-1.4-.3 0-.55.14-1.26.7-.2.17-.46.35-.58.4-.2.1-.22.1-.38.04-.23-.12-.34-.36-.35-.74 0-.36.06-.55.35-1 .4-.62.96-1.1 1.3-1.1.08 0 .23.1.38.24.3.27.46.33.95.33.3 0 .36-.02.47-.13.16-.15.16-.2 0-.53-.14-.3-.55-.7-.9-.9-.5-.3-1.27-.38-2.14-.22-.4.08-.47.1-.8.38-.22.17-.58.5-.82.76-1.3 1.36-2.1 2.94-2.46 4.83-.1.47-.16 2-.1 2.27.03.23.44.7.94 1.13.44.36.7.5 1.3.7.57.18.85.38 1 .7.13.25.14.33.14.93 0 .76.06 1 .42 1.7.22.44.42 1.04.62 1.85.05.22.06.23.68.54.63.3 1.43.6 1.6.62.06 0 .14-.07.2-.16zm8.23-1.62c1.53-1.28 2.62-3 3.1-4.92.2-.8.24-1.17.24-2.2 0-.6-.03-1.15-.07-1.4C19.75 7.6 18.95 6 17.62 4.6c-.62-.65-.8-.8-.96-.72-.15.06-.56.57-1.05 1.3-.52.78-.52.8.05 1 .44.17.55.24.48.36-.02.04-.36.36-.74.7-.4.36-.82.76-.95.9-.25.24-.36.5-.25.63.1.1 0 .2-.27.37-.42.22-.5.33-.5.64 0 .4-.22.95-.78 2.05-.5.98-.52 1-.52 1.36 0 .54.2.85.65 1.03.1.03.45.08.82.1.5.04.75.1 1 .2.6.2.7.35.96 1.44.1.4.24.88.32 1.06.07.2.18.5.23.73.15.5.2.65.27.65.04 0 .24-.14.46-.32zM11.43 5.7c.1-.06.33-.22.47-.34l.62-.5c.2-.13.55-.44.8-.67.37-.38.44-.47.72-1.05.17-.35.3-.67.3-.7 0-.1-.35-.24-.94-.4-.8-.22-1.3-.3-2.26-.32-1-.03-1.08 0-1.08.24 0 .2.1.27.46.34.27.06.3.08.33.24.02.1.05.43.07.73.03.47.02.6-.07.9-.17.54-.14 1.43.06 1.67.08.1.25.05.52-.13z"/>
-</svg>
diff --git a/app/svg/empty-project.svg b/app/svg/empty-project.svg
deleted file mode 100644
index fdc92148..00000000
--- a/app/svg/empty-project.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 13.918466 15.58737">
-    <g transform="translate(35.885 -420.63)">
-        <path d="m-33.7 420.63-1.1367 0.86544 2.1761 2.8582h-0.1537l-0.41375 0.71665h1.1131l0.69906 0.91817h-4.4694l1.7562 6.7859h7.8797l2.6214 3.443 1.1368-0.86544-11.209-14.722zm10.832 2.7082c-0.04845-0.001-0.07702 0.003-0.07702 0.003h-3.1127l-0.58461 1.0124h-2.5114l0.54562 0.71664h5.7028l-1.4845 5.5403 0.64029 0.84099 1.6351-6.102s0.34262-1.1438-0.01538-1.6091c-0.26845-0.34893-0.59278-0.39911-0.73815-0.40239z"/>
-    </g>
-</svg>
diff --git a/app/svg/eye.svg b/app/svg/eye.svg
deleted file mode 100644
index 98489d10..00000000
--- a/app/svg/eye.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg viewbox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-    <g class="svg-eye-open" transform="matrix(23.23754 0 0 23.23754 -45.7 -45.7)">
-        <path d="M24 9C14 9 5.46 15.22 2 24c3.46 8.78 12 15 22 15s18.54-6.22 22-15C42.54 15.22 34.01 9 24 9zm0 25c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10zm0-16c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6z"/>
-        <path d="M24 9C14 9 5.46 15.22 2 24c3.46 8.78 12 15 22 15s18.54-6.22 22-15C42.54 15.22 34.01 9 24 9zm0 25c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10zm0-16c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6z"/>
-    </g>
-    <path class="svg-eye-closed"
-        d="M868.85-1.186L678.848 188.818c-52.86-16.963-109.225-26.135-167.776-26.135-232.374 0-430.823 144.537-511.225 348.563 31.983 81.16 82.664 152.884 146.713 209.86L7.345 860.32l92.728 92.726L961.58 91.54 868.85-1.185zM511.07 278.87c23.543 0 46.266 3.52 67.683 10.042l-83.85 83.85c-64.01 7.416-114.9 58.304-122.316 122.316l-83.85 83.85c-6.522-21.418-10.04-44.14-10.04-67.682 0-128.272 104.103-232.375 232.374-232.375zm348.86 9.03L725.707 422.12c11.42 27.452 17.738 57.554 17.738 89.126 0 128.27-104.103 232.375-232.375 232.375-31.57 0-61.67-6.317-89.122-17.738l-100.3 100.3C380.686 847.92 444.48 859.81 511.07 859.81c232.377 0 430.826-144.537 511.228-348.562-34.56-87.697-90.9-164.385-162.37-223.346zM649.86 497.968l-152.068 152.07c4.372.413 8.8.633 13.277.633 76.918 0 139.427-62.508 139.427-139.424 0-4.48-.22-8.907-.635-13.278z"/>
-</svg>
diff --git a/app/svg/flag.svg b/app/svg/flag.svg
deleted file mode 100644
index 2612a5cf..00000000
--- a/app/svg/flag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" enable-background="new 0 0 100 100" viewBox="0 0 14.7 20.3" height="20.3" width="14.7" y="0" x="0" version="1.1"><path d="M2.9 4C2 4.5 1 5.4 0.8 5.6L0.7 5.5 0 5.9 8.3 20.3 9.1 19.9 5.4 13.6c0.2-0.2 1.2-1.1 2.1-1.6 1.8-1.1 2.7-0.8 4.5-1.9 1.8-1 2.6-2.3 2.6-2.3L10.2 0C10.2 0 9.3 1.2 7.5 2.2 5.7 3.3 4.7 2.9 2.9 4Z" fill="#f00"/></svg>
\ No newline at end of file
diff --git a/app/svg/gallery.svg b/app/svg/gallery.svg
deleted file mode 100644
index d9f205bc..00000000
--- a/app/svg/gallery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
-    <path d="M107.855 133.83h359.073v333.794H107.855zM533.072 133.83h359.074v333.794H533.072zM107.855 532.376h359.073V866.17H107.855zM533.072 532.376h359.074V866.17H533.072z" />
-</svg>
diff --git a/app/svg/graph.svg b/app/svg/graph.svg
deleted file mode 100644
index b4a28d94..00000000
--- a/app/svg/graph.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg viewbox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-    <g transform="rotate(-90 510.712 712.45) scale(89.12866)">
-        <path d="M3 3h8v2H3zm0 4h10v2H3zm0 4h4v2H3z"/>
-    </g>
-</svg>
diff --git a/app/svg/help.svg b/app/svg/help.svg
deleted file mode 100644
index b822b8fd..00000000
--- a/app/svg/help.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"/>
-</svg>
\ No newline at end of file
diff --git a/app/svg/hide.svg b/app/svg/hide.svg
deleted file mode 100644
index 0abadf8e..00000000
--- a/app/svg/hide.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="38.9mm" width="46.15mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 163.53744 137.83166">
- <g transform="translate(-380.2 -247.3)">
-  <path d="m418.3 247.3-10.6 7.583 18.15 25.36c-7.263 4.439-13.94 9.867-19.79 15.15-13.38 12.08-22.55 24.14-22.55 24.14l-3.282 4.311 3.64 4.013s32.55 37.09 74.69 37.09c8.514 0 16.8-1.763 24.64-4.556l17.71 24.75 10.6-7.582-93.21-130.2zm38.03 23.17c-2.47 0-4.912 0.2145-7.324 0.6089l8.889 12.44c31.54 0.7498 58.2 23.91 67.98 33.53-3.958 3.792-10.25 9.469-18.55 15.44-3.071 2.209-6.362 4.397-9.807 6.464l7.622 10.67c3.458-2.136 6.735-4.353 9.793-6.553 14.9-10.72 24.9-21.5 24.9-21.5l3.947-4.254-3.772-4.411s-35.36-42.43-83.67-42.43zm-22.72 20.61 5.5 7.685c-4.822 4.603-7.667 11.04-7.668 17.91 0.00019 13.68 11.09 24.77 24.77 24.77 4.017-0.001 7.935-0.9793 11.44-2.804l7.558 10.56c-5.565 1.704-11.18 2.716-16.63 2.716-27.08 0-51.8-20.38-61.02-28.94 3.586-4.258 9.506-10.92 17.25-17.91 5.695-5.14 12.19-10.11 18.82-13.98z"/>
- </g>
-</svg>
diff --git a/app/svg/iocaine.svg b/app/svg/iocaine.svg
deleted file mode 100644
index 868c76d0..00000000
--- a/app/svg/iocaine.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M239.7 0c-1.4 0-2.8 0-4 .3-27.7.5-55.4-.7-83 .6C138 4 129 21.7 135 35.5c.8 5 3.6 11.5 3.5 16h-28.8v25.3h20c-1.2 11.5-13.8 16.4-22.4 21.8C89 109 70.5 124 66.7 145.8c-4 20.5-.5 41.5-1.7 62 .3 56.4-1 112.8.7 169 2.5 14.4 17.2 24.6 31.4 23 54.4.4 108.8 0 163 .2 18-.3 35.8.4 53.5-1 13.7-3.3 23-17.4 21.5-31.2.5-55 0-110 .3-165-.3-18.2.3-36.6-1.2-54.8-3.8-22.5-22-39.2-41.4-49.4-9-5-20.4-10.5-22.4-21.7H290V64.7 51.5h-29c3-12.3 9.7-26 2.8-38.2-5-8.7-14.4-13.3-24-13.3zm-1.4 24.7c1.7 0 3.3.2 4 1.6-.6 4.8-3 9.2-4 14-1.4 3.3 0 8.6-2.8 11.2h-71.2c-1.8-8.8-5.7-17.8-5.8-26.6 2-.6 4 0 6-.2 23 .4 46 0 69 0 1.3.2 3 0 4.8 0zM154.8 77h91c0 16.5 12 30.4 26 38 14.3 8.7 32.8 17 37.5 34.8 2 4.6.6 7.2-4.8 5.7H89.7c1.4-15.3 14-27.2 27.3-33.8 14.8-8.5 32.4-18.2 36.3-36.3 1-2.5 0-7 1.5-8.5zm-18.6 103.7c15 6 23 21.2 35.3 30.8 6.6-4.7 14.2-7.8 22-9.2 14-3 28 2 40.5 8 11.8-9.6 18-18 28-25.8 6.3-6 17-3.3 17 5-8.2 14.5-21 23.4-32.5 34.6 8.5 12 12 27.4 8.5 41.6-.3 7.2-7.2 12-8 19 8 11.8 18.8 20 27.7 30.5 7.4 4.3 3.5 17.2-5 17-14.7-8.2-23.2-23.7-37-33-1.8 5.3 0 13.2-.3 19.6 1.4 6.4-3.5 12.7-10 13.3-12.7-.8-25.6 0-38.4-.5-7.4.5-10.3-7.8-9.8-14 0-5 3-13-3.3-15.4-12.7 6.2-20.8 17.5-34.4 26.7-4.8 6.6-16.2 1-15.6-6.5 10.2-16 27-25.3 40-38.6-15.4-15.5-15.2-42-2-58.8-7.8-10-18.2-18-26.8-27.3-7.3-3.8-4-16.7 4-16.8zM205 219h-2.2c-14.6 0-28.7 9.7-34 23.6-5.8 12.7.3 28.3 12 35.3 6.5 1.7 11 7.6 11.7 14.2 1.4 6.8-3 14.2.7 20.4 6.4 2.4 14.4 2.7 21 .4 2.2-7-.7-15.2.3-22.7 2.2-11 16-13.2 21-22.4 11-21-7.6-48.4-30.5-49zm-14.7 21.8c4.7 0 7.8 4.6 8.7 8.7 2 6.7-2.3 17-10.4 15.3-11.6-2.6-10.5-23.3 1.7-24zm27 0c4.4.2 7.2 4.2 8.2 8.2 2.3 6.7-1.8 17.2-10 15.8-11.7-2.3-11-23 1-24h1zM90 360.8c21.2 1 42.5-.2 63.8.3h156.6c0 4.7 2.4 13-4 14-15 1.4-29.8-.5-44.7.3-56.5-.2-113 .7-169.6-.5-4-3-2.7-10.2-2-14z" />
-</svg>
diff --git a/app/svg/like.svg b/app/svg/like.svg
deleted file mode 100644
index dd7c202d..00000000
--- a/app/svg/like.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg viewbox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-    <g transform="translate(94.258 13.08) scale(1.09227)">
-        <path d="M384 864c399-314 384-425 384-512s-72-192-192-192-192 128-192 128-72-128-192-128S0 265 0 352s-15 198 384 512z" />
-    </g>
-</svg>
diff --git a/app/svg/list.svg b/app/svg/list.svg
deleted file mode 100644
index f2ef5c24..00000000
--- a/app/svg/list.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
-    <path transform="matrix(31.97294 0 0 31.97294 5313.926 639.882)" d="M-162.75-2.5h3.75v-3.75h-3.75zm0 7.5h3.75V1.25h-3.75zm0-15h3.75v-3.75h-3.75zm7.5 7.5h16.875v-3.75h-16.875zm0 7.5h16.875V1.25h-16.875zm0-18.75V-10h16.875v-3.75z"/>
-</svg>
diff --git a/app/svg/location.svg b/app/svg/location.svg
deleted file mode 100644
index 2e4b6957..00000000
--- a/app/svg/location.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 28 40">
-    <g transform="translate(-10, -4)">
-        <title>Location</title>
-        <path d="m24 4c-8 0-14 6-14 14 0 10 14 26 14 26s14-16 14-26c0-8-6-14-14-14zm0 19c-2.8 0-5-2.2-5-5s2.2-5 5-5 5 2.2 5 5-2.2 5-5 5z"/>
-    </g>
-</svg>
diff --git a/app/svg/lock.svg b/app/svg/lock.svg
deleted file mode 100644
index d39b2ba0..00000000
--- a/app/svg/lock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400.00001">
-  <path d="M167 0C108.6 0 61.2 47.5 61.2 106v46.8H0V400h400V152.7h-61.2V106C338.8 47.5 291.4 0 233 0h-66zm0 25h66c45 0 80.8 36 80.8 81v46.8H86.2V106c0-45 35.8-81 80.8-81zM25 178h350V375H25V177.8zm162.5 51.4v89.6h25v-89.6h-25z" />
-</svg>
diff --git a/app/svg/organizations.svg b/app/svg/organizations.svg
deleted file mode 100644
index 4dca4867..00000000
--- a/app/svg/organizations.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20" width="22.2" version="1.1" viewBox="0 0 22.2 20" preserveAspectRatio="xMidYMid meet">
-    <g transform="translate(-451.01 -314.49)">
-        <path d="m451 314.5v20h8.7v-4.8h4.8v4.8h8.6v-20h-22.2zm2 2.1h4.8v4.8h-4.8v-4.8zm6.7 0h4.8v4.8h-4.8v-4.8zm6.7 0h4.8v4.8h-4.8v-4.8zm-13.5 6.3h4.8v4.8h-4.8v-4.8zm6.7 0h4.8v4.8h-4.8v-4.8zm6.7 0h4.8v4.8h-4.8v-4.8z" />
-    </g>
-</svg>
diff --git a/app/svg/project.svg b/app/svg/project.svg
deleted file mode 100644
index 6e3ce332..00000000
--- a/app/svg/project.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path d="M237.4 49.5v40h-186v49.7H0v211.3h400v-301H262.4zm25 25H375v251h-50V140h-.2v-.8H76.4v-24.7l186 1z"/>
-</svg>
diff --git a/app/svg/projects.svg b/app/svg/projects.svg
deleted file mode 100644
index e8c66014..00000000
--- a/app/svg/projects.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" viewBox="0 0 26.27 17.81">
-    <g transform="translate(-448.94 -316.58)">
-        <g transform="matrix(1.1133 0 0 1.1133 -624.82 369.48)">
-            <path d="m964.52-43.02h17.08l2.25 8.41 2.67-9.97h-17.5l0.7-1.22h10.47l0.99-1.72h5.28s0.78-0.11 1.38 0.68c0.61 0.79 0.03 2.73 0.03 2.73l-3.37 12.59h-17z"/>
-        </g>
-    </g>
-</svg>
diff --git a/app/svg/promote.svg b/app/svg/promote.svg
deleted file mode 100644
index 329e718f..00000000
--- a/app/svg/promote.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0v400h400V0H0zm25 25h162.5v350H25V25zm187.5 0H375v98.5H212.5V25zm-106 19.3L33.8 117l17.4 17.4L94 91.6V358h25V91.6l42.8 42.8 17.4-17.3-72.7-72.7zm106 104.2H375v107H212.5v-107zm0 132H375V375H212.5v-94.5z"/>
-</svg>
diff --git a/app/svg/recruit.svg b/app/svg/recruit.svg
deleted file mode 100644
index fa8dcf32..00000000
--- a/app/svg/recruit.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 22 21.7" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M11 0L7.7 3l-4.3.3L3 7.6.4 10.8 3 14l.4 4.4 4.3.4 3.3 2.8 3.3-2.8 4.3-.4.3-4.3 2.7-3.2L19 7.6l-.4-4.3-4.3-.4L11 0zm0 5.3c1.5 0 2.8 1.2 2.8 2.8 0 1.6-1.3 2.8-2.8 2.8-1.5 0-2.8-1.2-2.8-2.7 0-1.5 1.3-2.7 2.8-2.7zm0 7c2 0 5.6 1 5.6 2.7v1.4H5.4V15c0-1.8 3.7-2.8 5.6-2.8z"/>
-</svg>
diff --git a/app/svg/remove.svg b/app/svg/remove.svg
deleted file mode 100644
index 6097c7df..00000000
--- a/app/svg/remove.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
-    <path d="M749.2 197.3 500 446.4 250.8 197.2 197.2 250.8 446.4 500 197.3 749.2 250.8 802.7 500 553.6 749.2 802.8 802.8 749.2 553.6 500 802.7 250.8 749.2 197.3Z"/>
-</svg>
diff --git a/app/svg/search.svg b/app/svg/search.svg
deleted file mode 100644
index 8c58b6ec..00000000
--- a/app/svg/search.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22.009972 21.659925">
-  <g transform="matrix(.02222 0 0 .02222 .316 .03)">
-    <path d="M960 832L711 583c35.4-58.2 57-125.8 57-199C768 172 596 0 384 0S0 172 0 384s172 384 384 384c73.2 0 140.8-21.6 199-57l249 249c17.5 17.5 46.5 17.4 64 0l64-64c17.5-17.5 17.5-46.5 0-64zM384 640c-141.4 0-256-114.6-256-256s114.6-256 256-256 256 114.6 256 256-114.6 256-256 256z"/>
-  </g>
-</svg>
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
new file mode 100644
index 00000000..cd74aed7
--- /dev/null
+++ b/app/svg/sprite.svg
@@ -0,0 +1,369 @@
+<svg height="0" style="position: absolute; width: 0; height: 0;" version="1.1" width="0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="icon-iocaine" viewBox="0 0 1024 1024">
+            <title>iocaine</title>
+            <path class="path1"
+                d="M613.658 0c-3.54 0-7.091 0.225-10.619 0.699-70.636 1.408-141.466-1.833-211.986 1.587-37.804 7.936-60.948 53.517-45.542 88.858 2.109 12.795 9.257 29.535 9.139 40.584h-73.738v65.213h51.474c-3.405 29.655-35.712 42.196-57.779 55.916-46.546 26.419-94.093 64.614-103.898 120.356-10.227 52.465-1.293 106.273-4.36 159.035 0.827 144.205-2.36 288.563 1.787 432.691 6.569 36.488 43.971 62.572 80.435 58.388 139.121 1.203 278.272-0.189 417.382 0.673 45.512-0.87 91.387 1.147 136.678-2.808 34.877-8.166 58.957-44.416 54.989-79.685 1.216-140.723-0.23-281.472 0.717-422.195-0.707-46.787 0.748-93.814-2.926-140.442-10.112-57.498-56.658-100.413-106.401-126.382-22.648-12.966-52.257-26.836-57.19-55.539h3.866c4.25 0.545 8.724 0.538 13.158 0h33.556v-31.002c0.064-1.132 0.064-2.245 0-3.338v-30.871h-74.138c7.567-31.309 24.717-66.726 6.958-97.741-12.442-22.262-36.782-33.946-61.568-33.989zM610.15 63.173c4.357-0.072 8.259 0.614 9.779 4.070-1.088 12.298-7.278 23.68-9.505 35.738-4.004 8.678-0.556 22.17-7.526 28.749h-182.17c-4.787-22.492-14.659-45.542-15.078-67.86 5.048-1.331 10.412-0.154 15.549-0.297 58.798 0.998 117.663-0.118 176.422 0.082 3.343 0.415 8.166-0.415 12.526-0.486zM396.314 196.941h232.842c-0.243 42.463 30.687 78.029 66.591 97.083 36.792 22.712 84.070 43.635 95.959 89.472 5.089 11.827 1.756 18.371-12.201 14.651-183.245-0.087-366.848 0.174-549.862-0.133 3.599-39.025 36.027-69.645 69.99-86.564 37.806-21.594 82.772-46.523 92.826-92.731 2.734-6.543-0.046-17.797 3.845-21.78zM348.741 462.643c37.996 15.301 59.156 54.118 90.394 78.833 16.691-11.948 36.183-19.999 56.428-23.475 35.814-8.1 71.352 5.018 103.357 20.045 30.38-24.205 46.188-45.901 72.179-65.708 15.693-15.094 42.765-8.422 42.939 12.836-20.787 36.956-53.368 59.73-82.918 88.586 21.555 30.216 30.625 69.773 21.683 106.066-0.783 18.662-18.514 30.502-20.769 48.456 20.813 30.428 48.397 51.374 71.122 78.31 19.021 10.888 8.975 43.848-12.672 43.172-37.76-20.736-59.387-60.57-94.894-84.173-4.518 13.368-0.223 33.723-0.627 50.010 3.584 16.289-8.934 32.548-25.349 34.028-32.768-1.766-65.723 0.384-98.555-0.87-18.918 1.178-26.358-20.045-25.101-35.64-0.051-12.948 7.68-33.546-8.576-39.634-32.138 15.514-52.813 44.518-87.782 67.904-12.173 17.004-41.505 3.021-39.724-16.594 25.933-40.543 69.13-64.691 101.934-98.778-39.209-39.56-38.492-107.75-4.854-150.51-20.014-25.974-46.446-45.875-68.516-69.939-18.58-9.733-10.593-42.586 10.296-42.918zM524.9 560.399c-1.889-0.051-3.789-0.033-5.693 0.059-37.427-0.128-73.536 24.916-86.897 60.475-15.045 32.584 0.709 72.602 30.828 90.373 16.358 4.698 28.237 19.835 29.696 36.736 3.602 17.357-7.834 36.285 1.649 52.142 16.41 6.108 36.956 6.973 54.182 1.172 5.24-17.836-2.202-38.868 0.461-58.143 5.548-28.426 40.96-33.928 53.752-57.3 28.127-53.921-19.52-123.86-77.983-125.517zM487.089 616.399c12.16-0.287 20.070 11.807 22.426 22.408 5.274 16.973-5.898 43.32-26.675 39.117-29.665-6.738-26.957-59.715 4.25-61.522zM556.526 616.43c11.105 0.538 18.304 10.752 20.659 21.082 5.957 17.132-4.447 44.032-25.702 40.468-29.737-5.862-27.745-58.616 2.77-61.524 0.776-0.051 1.536-0.061 2.273-0.026zM230.075 923.758c54.469 2.732 109.053-0.614 163.571 0.768h401.044c-0.179 11.73 6.060 33.116-10.691 35.22-37.952 3.83-76.006-0.904-114.107 1.080-144.691-0.479-289.459 1.697-434.099-1.254-10.45-7.46-7.117-26.235-5.74-35.814z"></path>
+        </symbol>
+        <symbol id="icon-lock" viewBox="0 0 1024 1024">
+            <title>lock</title>
+            <path class="path1"
+                d="M427.571 0c-149.486 0-270.822 121.6-270.822 271.411v119.639h-156.749v632.95h1024v-632.96h-156.749v-119.642c0-149.811-121.349-271.411-270.822-271.411h-168.832zM427.571 64.136h168.832c115.141 0 206.838 91.889 206.838 207.276v119.639h-582.502v-119.639c0-115.384 91.692-207.276 206.83-207.276zM64 455.201h896v504.678h-896v-504.678zM480 586.721v229.325h64v-229.325h-64z"></path>
+        </symbol>
+        <symbol id="icon-promote" viewBox="0 0 1024 1024">
+            <title>promote</title>
+            <path class="path1"
+                d="M0 0v1024h1024v-1024h-1024zM64 64h416v896h-416v-896zM544 64h416v252.16h-416v-252.16zM272.589 113.485l-186.163 186.163 44.524 44.524 109.64-109.645v681.83h64v-681.83l109.645 109.645 44.518-44.518-186.163-186.168zM544 380.16h416v273.92h-416v-273.92zM544 718.080h416v241.92h-416v-241.92z"></path>
+        </symbol>
+        <symbol id="icon-trash" viewBox="0 0 1024 1024">
+            <title>trash</title>
+            <path class="path1"
+                d="M273.382 0v143.726h-273.382v64h119.77v816.282h780.8v-816.282h123.43v-64h-277.018v-143.726zM337.382 64h345.6v79.726h-345.6zM183.782 207.726h89.6v682.982h64v-682.982h140.8v682.982h64v-682.982h140.8v682.982h64v-682.982h89.6v752.282h-652.8z"></path>
+        </symbol>
+        <symbol id="icon-unlock" viewBox="0 0 1024 1024">
+            <title>unlock</title>
+            <path class="path1"
+                d="M427.571 0c-146.12 0-265.318 116.191-270.618 261.325h64.036c5.158-110.612 94.822-197.197 206.592-197.197h168.832c115.139 0 206.835 91.886 206.835 207.273v119.639h-803.249v632.947h1024v-632.96h-156.749v-119.642c0-149.806-121.352-271.411-270.822-271.411zM64 455.194h896v504.678h-896zM480 586.701v229.325h64v-229.325z"></path>
+        </symbol>
+        <symbol id="icon-client-requirement" viewBox="0 0 1024 1024">
+            <title>client-requirement</title>
+            <path class="path1"
+                d="M273.375 0v139.336h-274.289v611.84h452.388v-64h-388.388v-483.84h61.425v243.2h606.72v-243.2h61.455v247.224h64v-306.47h-0.036v-4.754h-263.278v-139.336h-320zM337.375 64h192v75.336h-192v-75.336zM188.511 203.336h478.72v179.2h-478.72v-179.2zM395.871 254.228v73.139h64v-73.134h-64zM512.914 512v512h512v-512h-512zM576.914 576h384v70.060l-37.179-31.345-189.765 225.075-127.219-107.256-29.837 35.387v-191.921zM960.914 669.901v290.099h-384v-168.909l164.731 138.885 219.269-260.076z"></path>
+        </symbol>
+        <symbol id="icon-project" viewBox="0 0 1024 1024">
+            <title>project</title>
+            <path class="path1" d="M607.821 126.72v102.4h-476.16v127.206h-131.661v540.954h1024v-770.56h-352.179zM671.821 190.72h288.179v642.56h-128v-474.675h-0.415v-2.278h-635.924v-63.206l476.16 2.419z"></path>
+        </symbol>
+        <symbol id="icon-team-requirement" viewBox="0 0 1024 1024">
+            <title>team-requirement</title>
+            <path class="path1"
+                d="M404.421 0c-139.443 0-253.171 113.725-253.171 253.169s113.725 253.176 253.171 253.176c139.443 0 253.174-113.728 253.174-253.171s-113.731-253.174-253.174-253.174zM404.421 64c104.858 0 189.174 84.314 189.174 189.169 0 104.858-84.319 189.176-189.174 189.176-104.858 0-189.171-84.316-189.171-189.171 0-104.858 84.314-189.171 189.171-189.171zM512.914 512v512h512v-512h-512zM404.396 546.9c-224.645 0.056-404.216 201.055-405.181 444.972l-0.128 32.128h452.388v-64h-386.68c15.329-197.402 162.803-349.041 339.602-349.1h0.026c15.949 0 31.657 1.254 47.053 3.651v-64.632c-15.437-1.971-31.13-3.021-47.068-3.021zM576.914 576h384v70.060l-37.179-31.345-189.765 225.075-127.219-107.256-29.837 35.387v-191.921zM960.914 669.901v290.099h-384v-168.909l164.731 138.885 219.269-260.076z"></path>
+        </symbol>
+        <symbol id="icon-add" viewBox="0 0 1024 1024">
+            <title>add</title>
+            <path class="path1" d="M480 0v480h-480v64h480v480h64v-480h480v-64h-480v-480h-64z"></path>
+        </symbol>
+        <symbol id="icon-scrum" viewBox="0 0 1024 1024">
+            <title>scrum</title>
+            <path class="path1" d="M0 0v1024h1024v-1024h-960zM64 64h416v896h-416zM544 64h416v252.16h-416zM544 380.16h416v273.92h-416zM544 718.080h416v241.92h-416z"></path>
+        </symbol>
+        <symbol id="icon-bulk" viewBox="0 0 1024 1024">
+            <title>bulk</title>
+            <path class="path1"
+                d="M0 0v64h214.976v-64h-214.976zM330.176 0v64h693.824v-64h-693.824zM0 335.36v64h214.976v-64h-214.976zM330.176 335.36v64h693.824v-64h-693.824zM0 652.8v64h214.976v-64h-214.976zM330.176 652.8v64h693.824v-64h-693.824zM0 960v64h214.976v-64h-214.976zM330.176 960v64h693.824v-64h-693.824z"></path>
+        </symbol>
+        <symbol id="icon-close" viewBox="0 0 1024 1024">
+            <title>close</title>
+            <path class="path1" d="M44.518 0l-44.518 44.526 467.482 467.474-467.482 467.482 44.518 44.518 467.482-467.482 467.482 467.482 44.518-44.518-467.482-467.482 467.482-467.474-44.518-44.526-467.482 467.482-467.482-467.482z"></path>
+        </symbol>
+        <symbol id="icon-dashboard" viewBox="0 0 1024 1024">
+            <title>dashboard</title>
+            <path class="path1"
+                d="M0 0v296.96h296.96v-296.96h-296.96zM360.96 0v296.96h296.96v-296.96h-296.96zM721.92 0v296.96h302.080v-296.96h-302.080zM0 360.96v296.96h296.96v-296.96h-296.96zM360.96 360.96v296.96h296.96v-296.96h-296.96zM721.92 360.96v296.96h302.080v-296.96h-302.080zM0 721.92v302.080h296.96v-302.080h-296.96zM360.96 721.92v302.080h296.96v-302.080h-296.96zM721.92 721.92v302.080h302.080v-302.080h-302.080z"></path>
+        </symbol>
+        <symbol id="icon-discover" viewBox="0 0 1024 1024">
+            <title>discover</title>
+            <path class="path1"
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c50.98 0 99.932 8.492 145.554 24.11 15.905 133.478-41.797 135.48-96.402 244.69-205.594 411.177 276.372 55.386 303.539 109.714 82.34 164.685-107.684 261.253-17.382 366.848-37.274 42.017-82.335 76.964-132.959 102.579-85.233-74.982-144.059-75.121-180.439 47.524-7.265 0.351-14.566 0.538-21.914 0.538-53.596 0-104.96-9.377-152.561-26.565 83.028-77.747 11.981-329.119-50.637-454.349-35.546-71.101 142.111-271.677 95.091-365.719-8.635-17.267-23.892-24.020-43.308-23.199 47.283-16.929 98.245-26.171 151.416-26.171zM75.945 408.686c59.29 100.058 212.28 198.477 39.030 300.8-1.229 1.341-2.253 2.811-3.174 4.334-30.572-60.621-47.8-129.167-47.8-201.82 0-35.574 4.147-70.154 11.945-103.314z"></path>
+        </symbol>
+        <symbol id="icon-drag" viewBox="0 0 1024 1024">
+            <title>drag</title>
+            <path class="path1" d="M363.52 0v296.96h296.96v-296.96zM363.52 360.96v296.96h296.96v-296.96zM363.52 721.92v302.080h296.96v-302.080z"></path>
+        </symbol>
+        <symbol id="icon-exclamation" viewBox="0 0 1024 1024">
+            <title>exclamation</title>
+            <path class="path1"
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM480 162.918v473.052h64v-473.052h-64zM480 714.514v146.57h64v-146.568h-64z"></path>
+        </symbol>
+        <symbol id="icon-flag" viewBox="0 0 1024 1024">
+            <title>flag</title>
+            <path class="path1"
+                d="M185.615 0c-170.665 0-185.615 0.051-185.615 0.051v1023.949h64v-460.792c17.72-0.026 9.795-0.036 121.615-0.036 180.419 0 286.277 44.846 431.345 69.164 145.065 24.32 407.040-53.76 407.040-53.76v-563.164s-261.975 78.072-407.040 53.752c-145.068-24.317-269.21-69.164-431.345-69.164zM186.826 66.074c116.511-0.571 230.328 30.408 343.926 54.118 140.526 36.232 288.077 15.647 426.68-18.988v426.002c-37.847 9.618-75.738 18.534-114.094 25.746-98.862 23.808-202.734 21.059-301.376-2.432-153.549-47.206-315.546-58.156-475.374-54.469 0.143-143.206-0.486-286.418 0.246-429.624 39.997 0.115 79.992-0.261 119.987-0.358z"></path>
+        </symbol>
+        <symbol id="icon-fold-column" viewBox="0 0 1024 1024">
+            <title>fold-column</title>
+            <path class="path1" d="M405.888 512l-362.040-362.040-45.256 45.256 316.785 316.785-316.785 316.785 45.256 45.256zM1025.408 195.215l-45.256-45.256-362.040 362.040 362.040 362.040 45.256-45.256-316.785-316.785z"></path>
+        </symbol>
+        <symbol id="icon-fold-row" viewBox="0 0 1024 1024">
+            <title>fold-row</title>
+            <path class="path1" d="M512 618.112l-362.040 362.040 45.256 45.256 316.785-316.785 316.785 316.785 45.256-45.256zM195.215-1.408l-45.256 45.256 362.040 362.040 362.040-362.040-45.256-45.256-316.785 316.785z"></path>
+        </symbol>
+        <symbol id="icon-graph" viewBox="0 0 1024 1024">
+            <title>graph</title>
+            <path class="path1" d="M960 0v1024h64v-1024h-64zM652.8 292.57v731.43h64v-731.43h-64zM335.36 577.83v446.17h64v-446.17h-64zM0 789.944v234.056h64v-234.056h-64z"></path>
+        </symbol>
+        <symbol id="icon-issues" viewBox="0 0 1024 1024">
+            <title>issues</title>
+            <path class="path1"
+                d="M0 0v1024h1024v-1024h-1024zM64 64h896v896h-896v-896zM510.866 139.2l-189.765 225.075-127.222-107.256-41.254 48.932 176.148 148.508 231.020-274.010-48.929-41.249zM510.866 548.8l-189.765 225.075-127.222-107.256-41.254 48.932 176.148 148.508 231.020-274.010-48.929-41.249z"></path>
+        </symbol>
+        <symbol id="icon-kanban" viewBox="0 0 1024 1024">
+            <title>kanban</title>
+            <path class="path1" d="M0 0v1024h1024v-1024zM64 64h243.2v896h-243.2zM371.2 64h284.16v896h-284.16zM719.36 64h240.64v896h-240.64z"></path>
+        </symbol>
+        <symbol id="icon-like-empty" viewBox="0 0 1024 1024">
+            <title>like-empty</title>
+            <path class="path1"
+                d="M775.526 0.051c-161.362-3.994-260.677 227.96-262.51 232.274-1.823-4.288-100.805-235.469-261.796-232.261-30.088 0.602-62.344 9.395-96.525 29.422-265.277 155.397-216.197 594.77 358.111 994.273v0.241l0.205-0.128 0.205 0.128v-0.241c566.574-373.642 623.393-838.876 358.118-994.273-33.917-19.866-65.933-28.698-95.808-29.435zM254.029 62.080c36.467 0.589 72.312 17.178 97.262 44.25 85.75 76.5 122.496 189.788 164.659 293.409 25.446-77.281 52.301-155.407 98.304-223.386 35.277-51.571 81.37-104.581 146.752-113.907 77.23-1.428 143.334 56.865 175.119 123.894 46.95 103.084 25.075 222.72-20.628 322.007-86.085 183.086-237.036 326.922-401.562 440.627-52.198-37.934-102.707-78.167-150.548-121.431-106.112-97.213-203.372-208.635-261.11-341.806-25.252-61.471-43.679-128.095-41.51-195.21 4.923-95.782 65.313-191.020 156.974-223.491 11.912-3.569 24.136-5.151 36.291-4.956z"></path>
+        </symbol>
+        <symbol id="icon-like" viewBox="0 0 1024 1024">
+            <title>like</title>
+            <path class="path1"
+                d="M251.22 0.064c-30.088 0.602-62.344 9.4-96.52 29.422-265.28 155.402-216.202 594.775 358.106 994.278v0.236l0.205-0.123 0.205 0.123v-0.238c566.579-373.642 623.391-838.874 358.113-994.278-217.037-127.14-356.142 197.729-358.316 202.842-1.818-4.288-100.8-235.469-261.791-232.261z"></path>
+        </symbol>
+        <symbol id="icon-question" viewBox="0 0 1024 1024">
+            <title>question</title>
+            <path class="path1"
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM510.175 166.92c-62.687 0-122.785 15.063-180.301 45.189l26.931 61.619c29.517-14.909 55.688-25.101 78.51-30.579 22.822-5.78 46.254-8.673 70.298-8.673 37.427 0 66.033 8.517 85.811 25.559 20.086 16.737 30.126 40.627 30.126 71.665 0 24.952-5.478 46.259-16.435 63.905-10.65 17.651-36.664 43.971-78.049 78.966-29.824 25.559-50.212 49.905-61.166 73.032-10.957 22.822-16.435 52.037-16.435 87.642v24.643h58.885v-15.060c0-28.91 4.864-52.040 14.605-69.386 10.040-17.344 30.428-39.099 61.164-65.27 38.341-33.472 63.296-57.664 74.86-72.576 11.564-15.214 20.234-31.191 26.015-47.928 6.088-17.042 9.132-36.667 9.132-58.88 0-52.037-16.128-92.365-48.384-120.965-32.256-28.605-77.445-42.906-135.567-42.906zM449.28 714.514v146.57h64v-146.568h-64z"></path>
+        </symbol>
+        <symbol id="icon-search" viewBox="0 0 1024 1024">
+            <title>search</title>
+            <path class="path1"
+                d="M427.866 0c-232.947 0-422.528 189.573-422.528 422.523s189.578 422.528 422.528 422.528c101.545 0 194.836-36.040 267.789-95.974l274.926 274.924 48.077-48.077-274.081-274.079c65.807-74.522 105.812-172.339 105.812-279.322 0-232.95-189.576-422.523-422.523-422.523zM427.866 67.994c196.204 0 354.534 158.326 354.534 354.529 0 196.206-158.331 354.534-354.534 354.534-196.206 0-354.534-158.328-354.534-354.534 0-196.204 158.328-354.534 354.534-354.534z"></path>
+        </symbol>
+        <symbol id="icon-settings" viewBox="0 0 1024 1024">
+            <title>settings</title>
+            <path class="path1"
+                d="M360 0v145.034l-102.554-102.554-214.963 214.963 102.554 102.554h-145.037v304h145.039l-102.559 102.559 214.963 214.958 102.554-102.554v145.039h304v-145.044l102.561 102.559 214.963-214.958-102.561-102.554h145.039v-304h-145.039l102.554-102.561-214.956-214.963-102.559 102.561v-145.039h-304zM424 64h176v235.551l166.561-166.561 124.449 124.447-166.559 166.561h235.548v176h-235.556l166.566 166.561-124.449 124.442-166.559-166.559v235.558h-176v-235.556l-166.554 166.561-124.452-124.452 166.564-166.554h-235.561v-176h235.551l-166.554-166.559 124.449-124.454 166.554 166.559v-235.546zM512 317.146c-107.238 0-194.854 87.616-194.854 194.854s87.616 194.86 194.854 194.86c107.238 0 194.86-87.621 194.86-194.86s-87.621-194.854-194.86-194.854zM512 381.146c72.653 0 130.86 58.204 130.86 130.854 0 72.653-58.209 130.86-130.86 130.86-72.653 0-130.854-58.209-130.854-130.86 0-72.653 58.204-130.854 130.854-130.854z"></path>
+        </symbol>
+        <symbol id="icon-team" viewBox="0 0 1024 1024">
+            <title>team</title>
+            <path class="path1"
+                d="M644.006 0c-130.729 0-237.345 113.725-237.345 253.171 0 139.443 106.616 253.174 237.343 253.174 130.729 0 237.356-113.728 237.356-253.171s-106.627-253.174-237.35-253.174zM644.006 64c98.304 0 177.357 84.314 177.357 189.171s-79.053 189.174-177.357 189.174c-98.304 0-177.347-84.316-177.347-189.171 0-104.858 79.040-189.171 177.344-189.171zM336.366 117.596c-115.717 0-210.092 100.659-210.092 224.095 0 123.43 94.374 224.102 210.092 224.102 63.739 0 108.877-17.626 147.456-65.69-86.072-38.072-134.758-141.627-134.758-246.932 0-47.48 12.365-91.971 33.83-130.012-14.976-3.635-30.548-5.565-46.528-5.565zM643.981 546.9c-210.606 0.056-378.949 201.052-379.853 444.969l-0.128 32.128h760l-0.128-32.128c-0.904-243.935-169.267-444.938-379.884-444.972zM332.91 600.545c-13.548 0.205-23.235 1.144-23.235 1.144-186.419 0.051-308.762 177.966-309.565 393.869l-0.11 28.442h206.405l0.128-32.128c0.604-162.885 60.127-310.49 172.787-388.037-15.45-2.959-32.86-3.492-46.413-3.29zM643.981 610.9h0.026c165.76 0.036 304.038 151.68 318.413 349.1h-636.813c14.374-197.402 152.627-349.038 318.374-349.1z"></path>
+        </symbol>
+        <symbol id="icon-timeline" viewBox="0 0 1024 1024">
+            <title>timeline</title>
+            <path class="path1" d="M0 0v64h1024v-64h-1024zM0 335.36v64h1024v-64h-1024zM0 652.8v64h1024v-64h-1024zM0 960v64h1024v-64h-1024z"></path>
+        </symbol>
+        <symbol id="icon-unfold-column" viewBox="0 0 1024 1024">
+            <title>unfold-column</title>
+            <path class="path1" d="M-1.408 512l362.040 362.040 45.256-45.256-316.785-316.785 316.785-316.785-45.256-45.256zM618.112 828.785l45.256 45.256 362.040-362.040-362.040-362.040-45.256 45.256 316.785 316.785z"></path>
+        </symbol>
+        <symbol id="icon-unfold-row" viewBox="0 0 1024 1024">
+            <title>unfold-row</title>
+            <path class="path1" d="M512 1025.408l362.040-362.040-45.256-45.256-316.785 316.785-316.785-316.785-45.256 45.256zM828.785 405.888l45.256-45.256-362.040-362.040-362.040 362.040 45.256 45.256 316.785-316.785z"></path>
+        </symbol>
+        <symbol id="icon-unwatch" viewBox="0 0 1024 1024">
+            <title>unwatch</title>
+            <path class="path1"
+                d="M201.344 170.004l-45.248 45.256 47.703 47.706c-129.385 82.132-204.687 197.21-203.791 247.107 1.469 81.754 205.911 335.24 511.992 338.573 84.966 0.927 162.112-18.235 229.286-48.195l53.545 53.545 45.261-45.256-638.748-638.735zM512 171.489c-68.646 0-132.029 12.57-189.117 33.011l57.211 57.211c41.459-11.546 84.319-17.915 127.268-18.529 157.983-1.58 313.549 76.836 409.17 202.071 14.28 21.998 38.886 45.43 31.391 74.030-33.587 66.335-84.716 122.171-145.408 164.849l50.903 50.906c107.418-79.014 170.048-178.22 170.58-224.965 0.963-84.736-201.498-338.58-512-338.58zM514.099 308.424c-2.35 0-4.703 0.038-7.058 0.123-23.073 0.205-45.696 4.897-66.898 13.215l61.402 61.399c3.533-0.287 7.076-0.448 10.619-0.44 62.472-1.426 120.077 49.203 126.446 111.196 1.344 9.050 1.546 18.13 0.781 27.090l61.071 61.069c20.096-53.402 17.887-115.338-9.964-165.88-33.58-64.64-103.578-107.587-176.397-107.768zM255.532 314.696l86.84 86.84c-13.005 19.942-22.495 42.163-27.277 65.766-19.901 84.465 22.907 177.935 99.116 219.028 63.25 36.731 145.746 32.732 206.725-6.231l65.382 65.382c-24.11 9.096-48.804 16.42-73.769 21.811-183.327 38.252-382.523-41.779-498.022-188.237-15.196-24.325-42.565-45.701-40.192-77.112 41.221-78.572 105.382-142.551 181.197-187.249zM396.838 456l169.774 169.774c-7.16 3.354-14.682 6.031-22.52 7.872-59.418 16.41-126.899-16.742-149.44-73.754-14.625-33.093-12.657-71.585 2.189-103.892z"></path>
+        </symbol>
+        <symbol id="icon-user" viewBox="0 0 1024 1024">
+            <title>user</title>
+            <path class="path1"
+                d="M512 0c-139.443 0-253.166 113.725-253.166 253.169s113.725 253.176 253.169 253.176c139.448 0 253.179-113.728 253.179-253.174-0.003-139.446-113.733-253.171-253.181-253.171zM512 64c104.858 0 189.179 84.314 189.179 189.169 0 104.858-84.319 189.176-189.176 189.176-104.852 0-189.166-84.316-189.166-189.174s84.311-189.171 189.164-189.171zM511.974 546.9c-224.64 0.056-404.209 201.052-405.176 444.969l-0.128 32.128h810.662l-0.128-32.128c-0.973-243.935-180.557-444.938-405.217-444.972zM511.974 610.9h0.026c176.819 0.036 324.308 151.68 339.643 349.1h-679.27c15.334-197.402 162.806-349.041 339.61-349.1z"></path>
+        </symbol>
+        <symbol id="icon-wiki" viewBox="0 0 1024 1024">
+            <title>wiki</title>
+            <path class="path1"
+                d="M46.298 0l-0.067 89.702-46.231-17.446v844.984l512 106.76 512-106.757v-844.984l-45.696 17.198v-87.619l-467.72 162.017-464.289-163.855zM100.513 88.325l379.41 133.366v662.963l-379.412-133.366v-662.963zM923.489 88.325v662.963l-379.407 133.371v-662.971l379.407-133.366z"></path>
+        </symbol>
+        <symbol id="icon-archive" viewBox="0 0 1024 1024">
+            <title>archive</title>
+            <path class="path1"
+                d="M512.65 0l-512.571 136.453v736.753l511.964 150.794 511.956-150.794v-736.932l-0.512 0.148-510.84-136.422zM60.262 217.508l421.258 124.083v609.91l-421.258-124.083v-609.907zM963.819 217.508v609.91l-421.261 124.083v-609.912l421.261-124.083zM105.247 319.135v122.86l318.072 97.3v-122.86l-318.077-97.3z"></path>
+        </symbol>
+        <symbol id="icon-arrow-down" viewBox="0 0 1024 1024">
+            <title>arrow-down</title>
+            <path class="path1" d="M975.688 234.772l-466.061 464.031-461.199-461.517-45.271 45.24 506.355 506.701 511.334-509.1-45.158-45.356z"></path>
+        </symbol>
+        <symbol id="icon-arrow-left" viewBox="0 0 1024 1024">
+            <title>arrow-left</title>
+            <path class="path1" d="M789.228 975.688l-464.031-466.061 461.517-461.199-45.24-45.271-506.701 506.355 509.1 511.334 45.356-45.158z"></path>
+        </symbol>
+        <symbol id="icon-arrow-right" viewBox="0 0 1024 1024">
+            <title>arrow-right</title>
+            <path class="path1" d="M234.772 975.688l464.031-466.061-461.517-461.199 45.24-45.271 506.701 506.355-509.1 511.334-45.356-45.158z"></path>
+        </symbol>
+        <symbol id="icon-arrow-up" viewBox="0 0 1024 1024">
+            <title>arrow-up</title>
+            <path class="path1" d="M975.688 789.228l-466.061-464.031-461.199 461.517-45.271-45.24 506.355-506.701 511.334 509.1-45.158 45.356z"></path>
+        </symbol>
+        <symbol id="icon-attachment" viewBox="0 0 1024 1024">
+            <title>attachment</title>
+            <path class="path1"
+                d="M662.461 0.492l-573.568 572.526 45.215 45.294 528.353-527.393 226.542 226.084-617.208 616.082-136.796-136.515 519.439-518.495 44.329 44.237-424.929 424.159 45.215 45.297 470.316-469.463-134.938-134.651-610.028 608.922 227.389 226.934 707.802-706.509-317.13-316.513z"></path>
+        </symbol>
+        <symbol id="icon-briefcase" viewBox="0 0 1024 1024">
+            <title>briefcase</title>
+            <path class="path1" d="M318.72 81.736v128.369h-318.72v732.16h1024v-732.16h-318.72v-128.369h-384zM382.72 145.736h258.56v64.369h-258.56zM64 274.104h80.64v256h734.72v-256h80.64v604.16h-896zM208.64 274.104h606.72v192h-606.72zM480 339.4v64h64v-64z"></path>
+        </symbol>
+        <symbol id="icon-bubble-empty" viewBox="0 0 1024 1024">
+            <title>bubble-empty</title>
+            <path class="path1" d="M0 0v768h175.544v256h66.696l165.471-256h616.289v-768zM64 64h896v640l-580.854 0.914-139.602 218.854v-155.768h0.031l0.041-64h-175.616z"></path>
+        </symbol>
+        <symbol id="icon-bubble" viewBox="0 0 1024 1024">
+            <title>bubble</title>
+            <path class="path1" d="M0 0v768h175.544v256h66.696l165.471-256h616.289v-768h-1024z"></path>
+        </symbol>
+        <symbol id="icon-bug" viewBox="0 0 1024 1024">
+            <title>bug</title>
+            <path class="path1"
+                d="M475.674 1.946c-85.051 0-154.522 69.466-154.522 154.514s69.471 154.511 154.522 154.511h73.139c85.051 0 154.516-69.463 154.516-154.511s-69.466-154.514-154.516-154.514h-73.139zM475.674 65.946h73.139c50.701 0 90.516 39.816 90.516 90.514s-39.816 90.511-90.514 90.511h-73.139c-50.701 0-90.522-39.813-90.522-90.511s39.821-90.514 90.522-90.514zM197.394 285.594l-45.253 45.261 105.848 105.856c-20.14 29.696-31.918 65.49-31.918 103.962v84.818h-131.213v64h131.215v84.813c0 36.582 10.691 70.715 29.051 99.517l-102.984 102.989 45.253 45.251 100.9-100.9c31.447 24.387 70.856 38.963 113.595 38.963h200.714c46.874 0 89.748-17.528 122.491-46.318l108.255 108.255 45.253-45.253-113.162-113.162c14.628-26.537 22.976-56.986 22.976-89.344v-84.813h130.726v-64h-130.729v-84.815c0-34.266-9.377-66.381-25.651-93.983l115.84-115.84-45.256-45.253-112.172 112.179c-32.205-26.778-73.556-42.918-118.574-42.918h-200.714c-40.87 0-78.694 13.325-109.427 35.809l-105.062-105.068zM411.886 418.854h68.352v477.261h-68.352c-68.040 0-121.815-53.778-121.815-121.815v-233.628c0-68.040 53.773-121.818 121.812-121.818zM544.238 418.854h68.362c68.037 0 121.815 53.778 121.815 121.815v233.626c0 68.040-53.775 121.818-121.812 121.818h-68.36v-477.261z"></path>
+        </symbol>
+        <symbol id="icon-capslock" viewBox="0 0 1024 1024">
+            <title>capslock</title>
+            <path class="path1" d="M509.517 105.644l-506.36 506.701 45.271 45.235 461.202-461.509 466.063 464.026 45.153-45.353-511.334-509.1zM0 854.356v64h1024v-64h-1024z"></path>
+        </symbol>
+        <symbol id="icon-check" viewBox="0 0 1024 1024">
+            <title>check</title>
+            <path class="path1" d="M0 0v1024h1024v-1024zM64 64h896v896h-896zM848.786 226.24l-445.765 481.075-229.622-209.656-41.254 48.932 278.548 250.906 487.022-530.002z"></path>
+        </symbol>
+        <symbol id="icon-clipboard" viewBox="0 0 1024 1024">
+            <title>clipboard</title>
+            <path class="path1"
+                d="M202.24-0.179v129.093l-202.24-0.11v895.375h729.6v-234.419h-64v170.419h-601.6v-644.385h601.6v287.086h64v-474.076h-64v0.11h-138.24v-129.093h-325.12zM266.24 63.821h197.12v96.44h0.32v32.653h201.92v58.88h-601.6v-58.88h202.24v-129.093zM129.165 393.242v64h468.838v-64h-468.836zM522.76 515.302l-181.020 181.018 181.020 181.020 45.256-45.253-103.759-103.767h559.744v-64h-559.749l103.764-103.764-45.253-45.256zM129.165 541.722v64h228.086v-64h-228.083zM129.165 690.202v64h150.246v-64h-150.246zM129.165 833.562v64h258.854v-64h-258.854z"></path>
+        </symbol>
+        <symbol id="icon-document" viewBox="0 0 1024 1024">
+            <title>document</title>
+            <path class="path1"
+                d="M477.23 0l-355.63 355.246v668.754h780.8v-1024h-425.17zM513.070 64h325.33v896h-652.8v-568.914h327.47v-327.086zM357.939 520.422v64h406.246v-64h-406.246zM536.1 668.902v64h228.086v-64h-228.086zM295.345 817.382v64h468.838v-64h-468.836z"></path>
+        </symbol>
+        <symbol id="icon-documents" viewBox="0 0 1024 1024">
+            <title>documents</title>
+            <path class="path1" d="M121.6 355.246v668.754h780.8v-1024h-425.17zM513.070 64h325.33v896h-652.8v-568.914h327.47z"></path>
+        </symbol>
+        <symbol id="icon-downvote" viewBox="0 0 1024 1024">
+            <title>downvote</title>
+            <path class="path1" d="M512 793.6l512-563.2h-1024z"></path>
+        </symbol>
+        <symbol id="icon-edit" viewBox="0 0 1024 1024">
+            <title>edit</title>
+            <path class="path1" d="M740.291 1.894l-601.078 601.070-136.397 419.141 420.081-141.030 598.287-598.285zM740.291 92.403l190.387 190.387-526.556 526.548-188.306-192.466zM181.486 680.046l160.735 160.735-153.636 51.922-57.472-57.472z"></path>
+        </symbol>
+        <symbol id="icon-error" viewBox="0 0 1024 1024">
+            <title>error</title>
+            <path class="path1"
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM275.256 230.001l-45.256 45.251 236.744 236.749-236.744 236.744 45.256 45.256 236.744-236.744 236.744 236.744 45.256-45.256-236.744-236.744 236.744-236.749-45.253-45.251-236.749 236.744z"></path>
+        </symbol>
+        <symbol id="icon-filters-empty" viewBox="0 0 1024 1024">
+            <title>filters-empty</title>
+            <path class="path1" d="M0 75.131l416 457.6v236.938l192 179.2v-416.138l416-457.6h-1024zM138.921 136.571h746.179l-338.54 372.398v298.47l-66.186-61.788 0.41-235.331-341.86-373.75z"></path>
+        </symbol>
+        <symbol id="icon-filters" viewBox="0 0 1024 1024">
+            <title>filters</title>
+            <path class="path1" d="M0 75.131l416 457.6v236.938l192 179.2v-416.138l416-457.6h-1024z"></path>
+        </symbol>
+        <symbol id="icon-github" viewBox="0 0 1024 1024">
+            <title>github</title>
+            <path class="path1"
+                d="M0 560.801q0 128 38.4 204.262 41.068 81.070 127.468 120.003 87.465 41.062 178.662 50.662 82.138 9.6 177.070 9.6 41.068 0 102.932-3.2 51.738-3.2 110.131-14.131 58.404-10.931 100.536-28.534 48-20.262 88.532-54.664 40.535-34.401 62.935-79.734 37.332-76.262 37.332-204.262 0-146.138-83.732-244.27 16.532-49.6 16.532-104 0-71.997-30.932-133.862-63.468 0-113.331 22.4-49.869 22.4-118.136 75.732-83.732-19.738-172.8-19.738-97.068 0-189.868 21.338-69.862-54.938-119.731-77.338t-113.331-22.4q-31.47 61.34-31.47 133.87 0 54.938 16.532 105.070-83.732 98.127-83.732 243.195zM137.6 669.064q0-75.73 43.469-126.397 43.464-50.67 114.399-50.67 28.262 0 120 13.338 46.932 6.93 96.532 6.93t97.068-6.932q93.332-13.338 120-13.338 70.932 0 114.132 50.67 43.2 50.662 43.2 126.397 0 53.868-19.732 94.932-19.738 39.468-49.331 62.669-29.604 23.199-75.469 37.069-75.735 22.93-178.135 22.93h-103.465q-50.668 0-91.735-4.8-43.732-4.27-88-18.67-44.262-14.4-73.062-36.265-31.47-24.52-50.67-65.326-19.2-40.801-19.2-92.534zM236.268 669.064q0 25.070 8 50.67 8 27.732 27.469 47.734 19.464 19.999 43.464 19.999 25.6 0 44.8-20.8 33.6-38.938 33.6-97.603 0-24.532-6.932-50.132-8-27.73-27.469-47.731-19.466-19.999-43.999-19.999-25.6 0-44.8 21.332-34.132 36.8-34.132 96.532zM630.4 669.064q0 25.070 8 50.67 8 27.735 27.2 47.734t43.2 19.999q26.132 0 45.332-20.8 33.6-38.938 33.6-97.603 0-22.932-7.465-50.132-8-27.73-27.469-47.731-19.466-19.999-43.999-19.999-25.6 0-43.732 21.332-34.668 36.8-34.668 96.532z"></path>
+        </symbol>
+        <symbol id="icon-maximize" viewBox="0 0 1024 1024">
+            <title>maximize</title>
+            <path class="path1"
+                d="M0 0v325.519h63.734v-216.182l277.88 279.278 45.066-45.292-277.88-279.273h215.099v-64.051h-323.899zM700.101 0v64.051h215.104l-277.88 279.27 45.066 45.294 277.875-279.278v216.182h63.734v-325.519h-323.899zM341.614 635.384l-277.88 279.27v-216.174h-63.734v325.519h323.899v-64.051h-215.099l277.88-279.27-45.066-45.294zM682.391 635.384l-45.069 45.292 277.88 279.27h-215.104v64.054h323.901v-325.519h-63.731v216.174l-277.875-279.27z"></path>
+        </symbol>
+        <symbol id="icon-minimize" viewBox="0 0 1024 1024">
+            <title>minimize</title>
+            <path class="path1"
+                d="M45.066 0l-45.066 45.286 277.88 279.278h-215.101v64.051h323.901v-325.522h-63.736v216.177l-277.88-279.27zM978.936 0l-277.88 279.27v-216.177h-63.736v325.522h323.901v-64.051h-215.101l277.88-279.278-45.064-45.286zM62.776 635.384v64.051h215.101l-277.878 279.278 45.066 45.286 277.878-279.27v216.177h63.736v-325.522h-323.901zM637.317 635.384v325.522h63.736v-216.177l277.88 279.27 45.066-45.286-277.88-279.281h215.101v-64.051h-323.901z"></path>
+        </symbol>
+        <symbol id="icon-move" viewBox="0 0 1024 1024">
+            <title>move</title>
+            <path class="path1"
+                d="M794.004 118.164l-45.256 45.256 152.742 152.74h-901.491v64h901.491l-152.742 152.74 45.256 45.256 229.996-229.996zM229.996 445.844l-229.996 229.996 229.996 229.996 45.256-45.256-152.742-152.74h901.491v-64h-901.491l152.742-152.74z"></path>
+        </symbol>
+        <symbol id="icon-reload" viewBox="0 0 1024 1024">
+            <title>reload</title>
+            <path class="path1"
+                d="M509.394 0c-233.518 0-429.484 165.98-447.278 381.896h60.073c17.953-175.969 181.99-317.737 387.205-317.737 182.817 0 332.954 112.517 376.243 261.486l-153.408-44.155-15.462 61.97 242.309 69.745 64.924-260.285-57.69-16.604-34.412 137.951c-62.42-161.050-229.647-274.266-422.502-274.266zM64.927 610.796l-64.927 260.285 57.69 16.604 34.412-137.951c62.42 161.050 229.647 274.266 422.502 274.266 233.523 0 429.486-165.98 447.283-381.896h-60.076c-17.953 175.967-181.99 317.737-387.205 317.737-182.817 0-332.954-112.517-376.243-261.486l153.408 44.155 15.462-61.97-242.309-69.745z"></path>
+        </symbol>
+        <symbol id="icon-save" viewBox="0 0 1024 1024">
+            <title>save</title>
+            <path class="path1" d="M0 0v1024h1024v-797.199l-226.801-226.801h-733.199zM232.924 68.859h558.147v342.697h-558.147zM616.883 119.434v220.16h110.080v-220.16z"></path>
+        </symbol>
+        <symbol id="icon-upload" viewBox="0 0 1024 1024">
+            <title>upload</title>
+            <path class="path1" d="M509.517 0l-352.76 355.354 45.271 45.524 277.972-280.028v744.174h64v-739.661l278.093 278.047 45.153-45.645zM0 959.59v64.41h1024v-64.41z"></path>
+        </symbol>
+        <symbol id="icon-upvote" viewBox="0 0 1024 1024">
+            <title>upvote</title>
+            <path class="path1" d="M512 230.4l512 563.2h-1024z"></path>
+        </symbol>
+        <symbol id="icon-writer" viewBox="0 0 1024 1024">
+            <title>writer</title>
+            <path class="path1"
+                d="M956.918 0c-3.584 0.758-149.99 33.782-305.971 85.171-79.708 26.26-163.092 57.866-234.691 94.321s-131.917 76.168-165.699 128.197c-61.824 95.206-74.56 225.979-74.803 333.338-0.2 85.069 8.448 155.786 12.083 181.811l-187.837 201.162 93.993-0.289 147.005-158.354c31.788 4.362 89.759 10.982 156.017 11.871 99.533 1.331 217.201-7.265 295.88-67.046 41.426-31.473 78.024-87.235 115.21-154.532 37.189-67.297 73.336-146.099 105.242-221.558 63.823-150.904 110.653-288.735 110.653-288.735l-58.56-23.099s-46.195 135.834-108.846 283.981c-11.277 26.67-23.101 53.714-35.251 80.41h-172.831v67.174h141.036c-11.592 23.519-23.314 46.259-35.034 67.466-2.714 4.908-5.432 9.708-8.156 14.451h-214.513v67.18h171.674c-17.364 24.102-33.48 42.419-46.574 52.367-55.066 41.838-164.762 56.033-259.154 54.769-40.33-0.538-73.882-2.934-100.275-5.581l701.642-755.799zM871.562 90.593l-627.799 672.346c-2.944-29.251-5.765-69.914-5.645-121.743 0.23-101.023 15.455-220.943 63.544-294.999 9.318-14.349 24.781-29.967 44.902-45.875v200.893h62.367v-242.552c10.829-6.254 22.162-12.424 33.971-18.437 13.507-6.876 27.589-13.609 42.074-20.198v138.977h62.367v-165.504c39.88-15.928 81.28-30.72 121.838-44.083 75.53-24.883 147.789-44.826 202.378-58.824z"></path>
+        </symbol>
+        <symbol id="icon-watch" viewBox="0 0 1024 1024">
+            <title>watch</title>
+            <path class="path1"
+                d="M512 173.404c-310.502 0-513.464 256.829-511.995 338.58 1.469 81.756 205.911 335.24 511.995 338.575s511.027-253.837 511.995-338.575c0.965-84.736-201.498-338.58-511.995-338.58zM507.359 245.094c157.983-1.58 313.549 76.836 409.172 202.071 14.277 21.998 38.886 45.43 31.386 74.030-65.152 128.691-196.237 217.984-335.368 248.013-183.327 38.252-382.523-41.779-498.022-188.237-15.196-24.328-42.565-45.701-40.192-77.112 82.55-157.348 257.050-256.256 433.024-258.765zM514.092 310.341c-2.345 0-4.698 0.033-7.053 0.118-90.429 0.799-174.003 70.231-191.944 158.756-19.901 84.467 22.907 177.938 99.116 219.034 75.254 43.699 177.761 29.765 238.843-32.138 63.191-59.699 79.429-161.807 37.44-238.003-33.58-64.635-103.578-107.584-176.397-107.766z"></path>
+        </symbol>
+        <symbol id="icon-check-empty" viewBox="0 0 1024 1024">
+            <title>check-empty</title>
+            <path class="path1" d="M975.199 128l-633.541 676.948-300.511-284.032-41.147 49.395 349.312 325.688 674.688-726.354z"></path>
+        </symbol>
+        <symbol id="icon-task" viewBox="0 0 1024 1024">
+            <title>task</title>
+            <path class="path1"
+                d="M415.391-0.543v73.472l-71.071 0.026v-73.492h-64v73.498h-69.12v-0.113h-64v951.69h729.6v-951.69l-131.169 0.026v-73.416h-64v73.426l-71.071 0.026v-73.439h-64v73.446h-67.169v-73.454h-64zM211.2 136.968h69.12v54.495h64v-54.495h71.071v54.495h64v-54.495h67.169v54.495h64v-54.495h71.071v54.495h64v-54.495h67.169v115.2h-601.6v-115.2zM211.2 316.168h601.6v644.383h-601.6v-644.38zM276.365 393.613v64h78.356v-64h-78.356zM418.721 393.613v64h326.484v-64h-326.487zM276.365 542.093v64h78.356v-64h-78.356zM418.721 542.093v64h326.367v-64h-326.367zM276.365 690.573v64h78.356v-64h-78.356zM418.721 690.573v64h325.33v-64h-325.33zM276.365 833.933v64h78.356v-64h-78.356zM418.721 833.933v64h326.418v-64h-326.42z"></path>
+        </symbol>
+        <symbol id="icon-api" viewBox="0 0 1024 1024">
+            <title>api</title>
+            <path class="path1"
+                d="M516.326 0c-39.188 0-74.688 5.32-103.224 15.45-14.269 5.064-26.921 11.169-37.983 20.454-11.059 9.28-21.837 24.123-21.837 42.854 0 0.358 0.026 0.701 0.036 1.055l-94.707 55.296c-25.792 2.189-49.285 6.917-69.338 14.034-14.269 5.064-26.926 11.169-37.99 20.454-10.662 8.947-21.028 23.081-21.76 40.868l-99.553 58.122 3.571 484.316 481.725 271.096 477.24-272.274 1.523-479.037-98.698-59.53c0-0.238 0.026-0.466 0.026-0.704 0-18.729-10.778-33.574-21.837-42.854-11.059-9.285-23.713-15.391-37.983-20.454-20.14-7.15-43.756-11.891-69.678-14.070l-86.682-52.275c0.113-1.331 0.179-2.673 0.179-4.045 0-18.729-10.77-33.572-21.832-42.854-11.059-9.283-23.718-15.386-37.99-20.454-28.529-10.122-64.020-15.447-103.209-15.447zM516.326 64.768c32.973 0 62.797 5.069 81.549 11.725 2.094 0.742 3.441 1.5 5.23 2.268-1.787 0.768-3.139 1.526-5.233 2.268-18.749 6.656-48.576 11.72-81.549 11.72s-62.807-5.069-81.556-11.72c-2.094-0.742-3.446-1.498-5.233-2.268 1.792-0.768 3.139-1.528 5.233-2.271 18.749-6.656 48.581-11.725 81.554-11.725zM386.028 129.459c8.274 5.146 17.28 9.139 27.072 12.616 28.536 10.127 64.036 15.45 103.219 15.45 39.188 0 74.683-5.32 103.219-15.447 9.677-3.436 18.596-7.378 26.796-12.442l17.618 10.179c-12.48 2.419-24.156 5.54-34.854 9.336-14.267 5.064-26.924 11.169-37.985 20.454-11.059 9.28-21.837 24.125-21.837 42.854 0 18.734 10.778 33.574 21.837 42.854 11.059 9.285 23.718 15.391 37.985 20.454 28.539 10.13 64.033 15.45 103.219 15.45s74.685-5.32 103.219-15.447c12.575-4.46 23.885-9.738 33.966-17.28l62.351 35.999-415.859 235.84-415.795-235.853 58.36-33.695c9.242 6.323 19.466 10.993 30.707 14.984 28.536 10.13 64.033 15.45 103.219 15.45 39.183 0 74.685-5.32 103.219-15.447 14.272-5.064 26.924-11.169 37.985-20.454 11.059-9.28 21.837-24.12 21.837-42.854 0-18.729-10.778-33.574-21.837-42.854-11.059-9.285-23.713-15.391-37.983-20.454-9.157-3.251-19.036-5.998-29.517-8.243l19.832-11.448zM292.49 198.477c32.973 0 62.804 5.059 81.554 11.715 2.094 0.742 3.443 1.495 5.233 2.266-1.792 0.768-3.139 1.526-5.233 2.271-18.749 6.656-48.581 11.717-81.554 11.717s-62.807-5.064-81.556-11.717c-2.094-0.742-3.443-1.503-5.233-2.273 1.792-0.773 3.139-1.526 5.233-2.268 18.749-6.656 48.581-11.715 81.556-11.715zM732.316 198.477c32.973 0 62.804 5.059 81.554 11.715 2.092 0.742 3.441 1.495 5.23 2.266-1.792 0.768-3.139 1.526-5.233 2.271-18.752 6.656-48.584 11.717-81.556 11.717s-62.804-5.064-81.556-11.717c-2.094-0.742-3.441-1.503-5.233-2.273 1.792-0.773 3.139-1.526 5.233-2.268 18.752-6.656 48.584-11.715 81.556-11.715zM516.321 272.522c-39.188 0-74.688 5.315-103.224 15.442-14.269 5.069-26.921 11.172-37.983 20.454-11.059 9.283-21.837 24.128-21.837 42.86s10.778 33.572 21.837 42.854c11.064 9.283 23.716 15.391 37.985 20.454 28.536 10.127 64.036 15.447 103.219 15.447 39.188 0 74.683-5.32 103.219-15.447 14.269-5.064 26.926-11.172 37.99-20.454 11.059-9.283 21.832-24.123 21.832-42.854s-10.772-33.577-21.837-42.86c-11.059-9.283-23.716-15.386-37.985-20.454-28.536-10.127-64.031-15.442-103.219-15.442zM516.321 337.29c32.973 0 62.797 5.061 81.549 11.717 2.094 0.742 3.441 1.498 5.23 2.268-1.787 0.768-3.139 1.523-5.233 2.268-18.749 6.656-48.576 11.72-81.549 11.72s-62.807-5.069-81.556-11.72c-2.094-0.742-3.446-1.498-5.233-2.268 1.792-0.768 3.139-1.528 5.233-2.271 18.749-6.656 48.581-11.717 81.554-11.717zM94.72 360.55l389.371 224.801v362.117l-389.371-224.806v-362.112zM933.427 362.811v359.040l-389.376 224.809v-359.048l389.376-224.804z"></path>
+        </symbol>
+        <symbol id="icon-customize" viewBox="0 0 1024 1024">
+            <title>customize</title>
+            <path class="path1"
+                d="M740.291 1.889l-601.078 601.075-136.397 419.149 420.078-141.038 57.201-57.201c-25.226-4.974-73.692-15.168-75.054-15.455l-0.922 0.916-188.306-192.461 524.477-524.477 190.387 190.387-121.262 121.257 10.284 80.225 201.485-201.485-280.893-280.893zM721.49 417.774c-28.303 0-31.882 0.22-35.546 2.186-7.181 3.85-7.921 6.861-10.752 43.479-1.416 18.271-3.059 33.812-3.653 34.534-0.589 0.73-5.473 2.56-10.849 4.063-15.447 4.326-29.952 10.156-45.786 18.412-8.064 4.198-15.304 7.642-16.095 7.642-0.794 0-11.812-8.858-24.489-19.686-28.467-24.32-29.268-24.934-34.035-25.948-6.835-1.452-12.526 2.616-34.348 24.568-21.427 21.55-24.865 26.452-23.406 33.344 0.983 4.634 1.748 5.64 25.907 33.856 10.836 12.652 19.699 23.667 19.699 24.484 0 0.819-3.438 8.082-7.642 16.143-8.256 15.834-14.090 30.336-18.414 45.786-1.505 5.376-3.328 10.266-4.055 10.854-0.727 0.594-16.269 2.235-34.534 3.648-36.618 2.831-39.634 3.579-43.487 10.76-1.964 3.661-2.184 7.24-2.184 35.546 0 28.303 0.22 31.88 2.184 35.543 3.84 7.163 6.912 7.926 42.89 10.691 17.946 1.382 33.434 2.747 34.422 3.041 1.111 0.333 2.883 4.498 4.634 10.916 4.265 15.631 10.061 30.116 18.545 46.395 4.204 8.064 7.642 15.329 7.642 16.146 0 0.819-8.463 11.366-18.806 23.45-29.839 34.849-29.714 34.637-25.19 43.991 3.584 7.393 43.136 46.254 49.037 48.174 7.514 2.445 11.023 0.317 39.096-23.7l26.099-22.323 14.405 7.57c17.326 9.106 34.867 16.195 48.64 19.648 6.835 1.715 10.368 3.187 10.757 4.49 0.323 1.068 1.708 16.62 3.080 34.56 2.757 35.981 3.52 39.050 10.68 42.89 3.661 1.966 7.245 2.186 35.546 2.186 28.303 0 31.882-0.22 35.546-2.186 7.16-3.84 7.923-6.912 10.68-42.89 1.37-17.94 2.755-33.467 3.067-34.504 0.376-1.254 4.659-2.985 12.705-5.14 15.027-4.027 28.334-9.441 45.645-18.565 7.332-3.866 14.042-7.030 14.907-7.030s11.942 8.863 24.62 19.694c12.677 10.829 24.806 21.053 26.962 22.72 5.555 4.301 12.588 4.288 18.834-0.038 7.956-5.517 42.906-41.651 44.902-46.438 3.4-8.136 2.15-10.332-22.111-38.792-12.324-14.464-22.41-27.018-22.41-27.904 0-0.891 3.162-7.616 7.027-14.95 9.126-17.306 14.541-30.618 18.565-45.645 2.158-8.046 3.891-12.329 5.14-12.708 1.039-0.312 16.563-1.69 34.509-3.064 35.978-2.757 39.048-3.523 42.888-10.683 1.964-3.661 2.184-7.24 2.184-35.546 0-28.303-0.218-31.88-2.181-35.543-3.855-7.186-6.861-7.928-43.482-10.742-22.036-1.69-33.741-3.054-34.775-4.050-0.858-0.824-2.596-5.545-3.866-10.488-3.456-13.501-9.843-29.42-18.365-45.765-4.204-8.064-7.647-15.355-7.647-16.205 0-0.852 9.815-13.010 21.811-27.021 23.485-27.433 25.626-30.991 23.188-38.492-1.91-5.862-40.786-45.453-48.12-49.006-8.812-4.262-10.458-3.372-39.757 21.555-14.495 12.326-26.998 22.413-27.786 22.413-0.794 0-8.056-3.456-16.154-7.68-15.839-8.269-34.33-15.616-48.113-19.123-5.274-1.344-8.812-2.893-9.139-4.006-0.294-0.998-1.664-16.486-3.039-34.432-2.765-35.978-3.533-39.048-10.696-42.888-3.661-1.966-7.245-2.186-35.546-2.186zM724.511 588.815c28.293 0.581 56.402 10.225 79.898 29.025 41.293 33.034 58.573 86.185 45.128 138.778-3.43 13.396-14.894 35.845-24.325 47.611-21.432 26.734-51.858 43.904-86.52 48.837-7.588 1.075-25.948 1.444-30.244 0.602-0.978-0.192-5.78-0.998-10.675-1.792-16.604-2.703-35.297-10.273-50.414-20.424-41.37-27.776-64.384-78.715-57.49-127.214 4.531-31.872 21.010-62.702 44.16-82.627 26.112-22.477 58.419-33.459 90.486-32.799zM181.484 680.046l160.737 160.735-153.636 51.917-57.472-57.467 50.373-155.187z"></path>
+        </symbol>
+        <symbol id="icon-feel-love" viewBox="0 0 1024 1024">
+            <title>feel-love</title>
+            <path class="path1"
+                d="M768.010 0.036c-156.923 3.218-253.192 228.045-254.996 232.289-1.818-4.288-100.803-235.469-261.793-232.261-30.093 0.602-62.344 9.395-96.525 29.422-265.277 155.397-216.2 594.77 358.108 994.273v0.241l0.205-0.128 0.205 0.128v-0.241c566.582-373.642 623.396-838.876 358.121-994.273-33.92-19.866-65.933-28.698-95.813-29.435-2.522-0.064-5.025-0.067-7.516-0.015zM364.191 400.051l45.97 44.524-101.53 104.824 101.53 104.819-45.972 44.529-144.589-149.358 144.589-149.343zM659.809 400.051l144.589 149.343-144.589 149.356-45.97-44.531 101.53-104.822-101.53-104.827 45.972-44.524zM537.646 404.959l59.069 24.645-115.2 276.116-59.069-24.645 115.2-276.116z"></path>
+        </symbol>
+        <symbol id="icon-highly-designed" viewBox="0 0 1024 1024">
+            <title>highly-designed</title>
+            <path class="path1"
+                d="M603-0.451l-490.906 490.906-111.404 342.313 343.091-115.174 488.627-488.637-229.409-229.404zM603 73.469l155.489 155.487-430.042 430.047-153.792-157.184 428.344-428.352zM146.611 553.403l131.277 131.277-125.473 42.404-46.943-46.938 41.139-126.74zM760.243 748.687c-46.822-0.422-98.322 6.042-153.528 20.92-96.835 26.097-153.088 76.109-202.030 114.509-48.947 38.4-88.105 65.915-168.589 67.584-79.296 1.644-117.079-27.725-140.5-57.772-23.424-30.042-28.201-42.514-28.201-42.514l-60.723 18.34s0.481 18.934 34.084 62.034c33.6 43.103 97.505 85.955 196.838 83.896 98.138-2.035 159.283-42.117 210.647-82.414 51.361-40.294 95.411-80.092 177.203-102.139 168.817-45.501 281.536 1.326 322.893 56.251 7.7 10.23 8.253 17.357 5.299 25.94s-11.494 19.42-28.867 28.621c-34.739 18.414-103.578 27.679-198.63-3.302-65.5-21.35-96.581-40.771-109.64-51.871-7.009-3.994-7.764-3.963-7.764-3.963l-56.095 34.739c3.19 4.198 5.811 6.011 18.278 16.717 22.861 19.438 61.857 41.677 132.961 64.852 108.306 35.302 196.206 29.358 254.254-1.403 29.030-15.38 50.9-37.619 60.211-64.666 9.306-27.044 3.976-58.102-14.515-82.662-43.612-57.917-125.891-98.381-234.286-101.517-3.080-0.087-6.18-0.154-9.3-0.179z"></path>
+        </symbol>
+        <symbol id="icon-integration" viewBox="0 0 1024 1024">
+            <title>integration</title>
+            <path class="path1"
+                d="M739.226 1021.253c-4.634-0.026-64.876-0.138-132.339-0.251-35.625-0.061-68.787-0.681-94.861-1.697-13.036-0.507-24.276-1.111-33.403-1.818-9.126-0.712-14.61-0.896-23.055-3.098-10.148-2.644-18.906-2.145-31.8-14.705-6.451-6.28-10.532-16.102-11.604-22.589-1.075-6.495-0.742-10.56-0.609-14.387 0.481-13.409 4.288-21.076 8.678-30.482 4.396-9.405 10.061-19.162 16.758-28.948 9.124-13.338 12.928-22.003 14.060-27.131 1.134-5.128 1.070-7.877-1.825-15.872-2.637-7.296-6.036-11.407-14.753-15.928-8.719-4.521-23.357-8.236-43.917-8.671-27.896-0.589-47.135 3.185-57.713 8.166-10.573 4.982-13.76 8.909-16.704 18.801-3.615 12.16-3.359 17.556-1.313 23.713 2.048 6.159 7.634 15.068 20.762 27.86 12.595 12.278 19.73 30.387 21.1 47.475 0.691 8.673 3.845 18.207-5.207 33.736-4.531 7.767-12.211 13.396-17.638 16.008-5.435 2.611-9.293 3.533-12.966 4.506-11.699 3.092-13.763 2.007-22.623 2.45-8.863 0.44-20.127 0.799-33.147 1.093-26.035 0.594-58.988 0.927-91.648 0.998-32.666 0.064-64.973-0.136-89.779-0.622-12.403-0.243-22.879-0.556-30.925-0.973-4.019-0.205-7.373-0.425-10.563-0.763-1.597-0.169-3.098-0.34-5.202-0.742-2.107-0.397-2.885 1.93-13.629-5.599-8.289-5.806-9.416-10.010-10.655-12.588-1.242-2.575-1.69-4.122-2.074-5.409-0.758-2.58-1.006-4.096-1.267-5.632-0.522-3.072-0.832-5.888-1.152-9.257-0.65-6.74-1.221-15.327-1.784-25.667-1.121-20.675-2.15-48.077-2.959-77.184-1.613-58.209-2.422-121.889-0.914-153.088 0.494-10.266 1.595-20.109 3.18-28.818 0.788-4.352 1.664-8.376 2.944-12.557s1.050-7.823 8.694-16.604c7.462-8.576 19.218-13.99 29.325-15.048 10.112-1.057 18.662 0.891 26.452 3.656 15.575 5.53 29.338 14.943 44.526 27.653 25.843 21.637 31.974 22.853 49.779 18.166 19.61-5.161 37.325-25.080 45.389-52.961 8.064-27.878 4.884-60.321-10.296-82.637-7.849-11.533-22.426-23.258-36.301-29.601-12.321-5.637-21.965-5.396-24.225-5.307-1.843 1.265-4.646 3.116-7.045 5.391-5.35 5.076-12.022 12.083-17.93 19.016-19.128 22.451-32.86 40.74-63.37 42.414-15.258 0.837-32.568-9.075-40.325-20.296-7.757-11.218-10.445-22.385-12.347-34.624-1.339-8.64-0.937-12.826-0.957-21.786s0.128-20.255 0.41-33.213c0.548-25.925 1.613-58.424 2.9-90.509s2.796-63.7 4.257-87.91c0.732-12.104 1.441-22.31 2.145-30.116 0.358-3.899 0.691-7.142 1.119-10.189 0.215-1.528 0.43-2.954 0.87-4.941 0.435-1.989-1.902-2.478 5.658-12.987 6.871-9.549 11.282-9.894 13.857-10.97s4.001-1.408 5.197-1.7c2.399-0.589 3.73-0.75 5.094-0.929 2.721-0.358 5.184-0.556 8.154-0.75 5.939-0.394 13.542-0.701 22.764-0.955 18.452-0.512 43.169-0.778 70.118-0.709 65.091 0.169 104.090-0.402 127.603-2.419s28.884-4.224 36.659-8.74c13.85-8.049 14.29-11.018 14.546-15.506s-3.174-17.828-18.245-37.683c-9.129-12.022-15.708-21.074-20.705-32.067-5-10.99-6.945-22.707-7.649-33.357 2.86-35.116 11.195-61.279 38.641-79.15 10.189-6.636 17.152-8.243 26.765-11.090 9.618-2.852 20.339-5.381 31.020-7.181h0.005c62.428-10.506 122.12 4.311 149.417 51.661 8.653 15.002 12.851 34.785 9.134 52.874-3.717 18.086-12.833 33.498-25.088 50.163-18.988 25.815-23.544 51.584-24.115 48.184v0.005c0.502 3.016 0.75 4.493 7.278 8.868 6.533 4.378 19.584 9.626 38.766 13.069-4.762-0.858 2.524 0.161 9.242 0.461 6.715 0.307 15.905 0.62 26.632 0.922 21.458 0.607 49.126 1.172 76.741 1.6 27.615 0.43 55.214 0.717 76.531 0.776 10.657 0.026 19.763 0 26.363-0.095 6.605-0.092 14.566-1.114 8.402-0.108 12.621-2.058 25.549 5.811 30.034 11.041 4.48 5.23 5.46 8.535 6.385 11.098 1.848 5.12 2.158 7.982 2.619 11.284 0.922 6.605 1.357 13.916 1.733 23.795 0.748 19.753 0.932 48.952 0.676 89.953-0.43 69.043 2.26 112.474 7.808 135.081 5.542 22.605 6.175 21.197 16.653 24.55 6.016 1.925 5.064 2.022 10.803 0.064 5.747-1.953 17.592-8.415 36.035-21.304 18.442-12.892 34.714-22.484 54.584-25.37 19.866-2.888 39.565 3.712 55.419 13.169 31.406 18.732 44.78 55.194 49.434 100.787 4.695 46.067-3.072 89.567-28.897 120.947-12.58 15.283-33.388 26.854-54.067 30.228-11.067 1.805-25.946 3.226-39.997-1.91-14.054-5.13-23.859-12.48-41.702-24.589-20.367-13.824-33.326-19.369-37.786-20.155-4.465-0.788-2.56-1.674-10.061 4.070-8.993 6.892-10.785 7.552-14.912 33.126-4.129 25.574-5.801 71.895-6.177 149.985-0.113 23.142-0.64 44.518-1.441 60.79-0.397 8.136-0.845 14.925-1.428 20.549-0.292 2.816-0.576 5.248-1.137 8.174-0.282 1.459-0.573 2.995-1.398 5.514s0.445 6.042-9.805 14.945c-9.436 8.2-13.96 8.049-19.041 9.267-5.082 1.224-9.984 1.851-15.642 1.823zM738.501 957.381h1.037c-0.282 0 0.563-0.090 0.404-0.051-0.082 0.026-0.32-0.351-1.441 0.051zM723.884 957.355c0.722-14.881 1.254-35.328 1.357-57.472 0.384-78.73 1.505-125.834 6.989-159.846 5.489-34.012 20.122-59.098 39.132-73.659 15.624-11.971 38.459-20.060 59.976-16.271 21.519 3.789 39.593 14.605 62.577 30.208 26.785 19.302 38.528 23.462 50.586 8.532 9.907-12.032 18.125-40.023 14.669-73.876-3.82-37.463-11.361-48.092-18.611-52.416-9.306-5.555-10.424-5.263-13.512-4.813-3.087 0.445-11.904 3.832-27.177 14.508-20.114 14.062-35.233 23.698-52.050 29.42-16.814 5.724-35.917 5.082-50.849 0.307-27.612-8.832-50.744-35.592-59.226-70.17-8.481-34.58-10.079-80.179-9.638-150.697 0.241-38.554-0.008-64.852-0.602-82.739-4.096 0.010-7.194 0.056-11.914 0.044-21.745-0.056-49.518-0.348-77.345-0.778-27.827-0.435-55.675-1.004-77.555-1.62-10.939-0.307-20.367-0.63-27.699-0.96-7.332-0.333-9.518 0.059-17.651-1.4-24.653-4.424-45.568-11.174-63.040-22.879-17.469-11.704-31.258-30.395-34.744-51.548-5.906-35.86 11.814-63.959 35.681-96.41 9.564-13.010 13.253-21.632 13.985-25.185 0.73-3.553 1.024-3.021-1.912-8.115-9.428-16.358-36.564-28.467-83.482-20.575-7.77 1.306-16.538 3.372-23.475 5.427-6.932 2.056-13.573 5.668-10.053 3.374-13.107 10.342-13.768 19.144-7.706 32.563 1.29 2.842 5.069 8.863 13.427 19.873 19.704 25.953 32.768 51.43 31.145 79.931-1.62 28.498-21.412 52.685-46.221 67.105-15.534 9.027-35.080 14.735-63.293 17.152-28.211 2.424-67.758 2.824-133.23 2.652-26.414-0.067-50.698 0.205-68.198 0.686-0.819 0.026-1.111 0.056-1.9 0.077-0.323 4.598-0.614 7.859-0.952 13.466-1.421 23.506-2.918 54.861-4.198 86.623-1.272 31.762-2.33 63.99-2.867 89.3-0.248 11.656-0.353 21.332-0.358 29.21 1.523-1.551 2.885-2.611 4.48-4.485 7.444-8.742 15.309-17.024 22.605-23.941 7.291-6.912 9.574-11.551 23.936-17.754 27.169-11.725 53.786-5.069 77.842 5.932 24.054 11 46.579 28.293 62.546 51.763 28.078 41.267 31.585 92.257 18.842 136.312-12.749 44.058-43.341 84.564-90.478 96.973-35.942 9.467-73.733-3.067-107.044-30.95-3.756-3.149-6.769-5.094-9.984-7.342-0.077 1.157-0.287 2.002-0.34 3.159-1.229 25.472-0.622 90.824 0.973 148.242 0.794 28.708 1.81 55.767 2.883 75.484 0.133 2.483 0.261 3.558 0.399 5.796 4.838 0.154 8.361 0.328 14.326 0.443 24.049 0.474 56.077 0.673 88.392 0.607 32.312-0.067 64.973-0.404 90.324-0.98 9.078-0.205 15.711-0.471 22.502-0.735-14.525-14.925-25.907-30.234-31.939-48.392-6.707-20.204-5.289-41.915 0.709-62.075 7.534-25.318 26.437-46.938 50.708-58.368 24.274-11.433 52.646-14.95 86.277-14.234 27.156 0.571 51.244 5.076 71.969 15.828 20.726 10.747 37.478 28.961 45.414 50.893 5.727 15.826 7.969 34.033 4.122 51.4-3.84 17.364-12.303 32.73-23.711 49.4-3.507 5.128-5.868 9.697-8.294 14.228 1.3 0.138 0.742 0.113 2.176 0.225 7.834 0.614 18.45 1.19 30.938 1.677 24.978 0.973 57.536 1.595 92.475 1.651 59.505 0.097 101.036 0.179 116.895 0.22zM51.602 954.795c-1.582-0.435-2.168-0.192-2.55-0.172 0.428 0.044 1.782 0.115 2.552 0.174zM69.491 701.463c0.571-1.221 0.369-1.516 0.266-1.183-0.044 0.133-0.197 0.911-0.269 1.178zM73.851 278.515c0.497-1.597 0.256-2.166 0.271-2.524-0.059 0.41-0.184 1.777-0.271 2.524z"></path>
+        </symbol>
+        <symbol id="icon-lend-hand" viewBox="0 0 1024 1024">
+            <title>lend-hand</title>
+            <path class="path1"
+                d="M258.519 65.162c-52.92-0.315-109.614 17.984-160.481 62.899-80.781 71.327-111.36 153.395-92.774 233.416 18.304 78.853 76.69 151.987 157.709 228.71l-30.438 30.541c-31.242 31.355-36.948 83.64-4.751 115.948 12.723 12.767 28.557 19.574 44.979 21.222 1.649 16.486 8.435 32.376 21.161 45.146 12.723 12.764 28.557 19.574 44.979 21.228 1.651 16.486 8.438 32.379 21.161 45.146 12.723 12.769 28.557 19.574 44.984 21.228 1.646 16.481 8.428 32.369 21.151 45.138 32.197 32.307 84.301 26.583 115.546-4.767l82.089-82.373 92.28 92.278 2.324 1.644s52.838 33.887 109.146 3.853c25.024-13.345 37.499-36.48 42.273-56.768 20.626 2.186 45.624-1.403 65.818-19.917 19.374-17.754 32.369-37.98 32.312-59.546-0.013-5.248-0.527-9.805-1.29-13.893 17.367-2.647 36.063-9.615 50.401-27.141 36.966-45.972 15.452-82.834 7.296-101.248-8.166-18.406-39.245-49.946-39.245-49.946 22.287-23.163 70.177-77.396 103.565-147.213 22.413-46.868 38.84-101.75 34.637-160.138-4.206-58.388-30.456-119.278-86.963-172.255-45.558-42.711-97.216-62.067-147.523-63.757-16.768-0.563-33.39 0.84-49.587 3.994-64.776 12.595-123.295 49.469-173.714 91.4-12.575 10.458-24.678 21.292-36.224 32.246-20.109-20.552-66.806-64.443-127.974-97.157-41.26-22.067-89.92-39.603-142.838-39.921zM258.109 132.529c38.031 0.225 76.708 13.363 111.475 31.956 54.19 28.979 96.461 69.445 112.64 86.042-54.154 59.668-87.869 111.427-87.869 111.427l-6.656 10.138 1.347 12.058s2.55 33.536 25.523 63.462c11.482 14.968 29.637 29.594 53.642 35.392 24.005 5.793 51.858 2.696 82.504-9.789 23.45-9.549 42.696-20.449 58.488-31.872 0 0 250.112 245.844 252.068 247.954 7.212 7.782 20.572 26.501 7.334 38.572-13.235 12.070-34.519 5.914-41.152-1.644-4.211-4.795-71.084-69.069-71.084-69.069-4.18-4.045-7.588-7.634-11.776-11.653-49.193-47.155-96.261-90.24-97.229-91.126l-0.63-0.594-0.364-0.338-45.85 49.352 109.338 103.091c20.109 19.443 40.586 39.352 56 55.373 9.344 9.715 17.203 18.278 22.461 24.507 7.071 7.997 17.229 20.8 4.562 32.033-12.664 11.233-26.957 3.553-39.322-4.403l-169.083-166.397-47.447 47.826 0.192 0.189 167.186 167.186s11.098 20.536-6.257 32.556c-17.352 12.019-33.357-2.322-38.264-5.315l-99.205-99.208c4.9-24.609-0.881-50.683-19.909-69.778-6.579-6.605-14.003-11.597-21.903-15.13 7.91-26.772 3.072-56.448-17.984-77.581-6.001-6.016-12.698-10.714-19.814-14.172 9.889-27.914 5.755-59.794-16.502-82.13-22.259-22.336-54.026-26.483-81.843-16.563-3.446-7.142-8.125-13.857-14.124-19.878-32.197-32.307-84.301-26.578-115.54 4.774l-42.527 42.675c-77.499-73.272-126.618-140.032-139.661-196.211-13.166-56.704 2.445-106.488 71.747-167.68 39.598-34.964 77.46-46.259 115.489-46.029zM787.128 141.299c34.509 0.402 67.891 13.133 103.173 46.208 45.806 42.941 62.776 85.345 65.843 127.949 3.072 42.598-9.165 86.408-28.211 126.234-28.713 60.037-71.534 108.664-90.911 129.009l-180.813-177.613c0.481-0.753 0.998-1.51 1.454-2.258 1.446-2.355 2.176-4.567 3.4-6.899 4.859 2.181 9.695 4.385 15.155 6.502 30.021 11.628 69.478 23.337 110.446 10.624 68.291-21.197 119.066-76.764 121.83-140.421l-67.302-2.924c-1.080 24.883-31.142 65.551-74.496 79.002-14.848 4.608-42.752-0.041-66.143-9.101-23.388-9.062-40.568-19.896-40.568-19.896l-51.72-32.794v61.243s1.050 4.664-8.013 19.438c-9.068 14.771-28.429 36.275-74.949 55.229-21.325 8.689-33.889 8.479-41.283 6.694s-11.617-5.197-16.010-10.921c-4.385-5.714-7.378-13.169-9.285-19.2 17.812-25.48 74.504-102.912 149.901-165.614 45.338-37.709 96.051-67.84 143.508-77.071 11.866-2.304 23.491-3.548 34.995-3.415zM315.73 540.582c2.391 0.197 4.26 1.070 5.325 2.138 2.834 2.847 4.301 11.418-4.762 20.506l-120.53 120.96c-9.057 9.088-17.597 7.616-20.434 4.769-2.834-2.842-4.301-11.418 4.762-20.506l120.525-120.955c5.663-5.683 11.121-7.237 15.112-6.912zM411.694 577.019c2.394 0.192 4.262 1.068 5.325 2.132 2.836 2.847 4.306 11.423-4.751 20.511l-150.359 150.886c-9.057 9.088-17.603 7.613-20.436 4.769-2.836-2.847-4.306-11.41 4.751-20.5l150.364-150.892c5.658-5.683 11.118-7.237 15.109-6.912zM448.010 673.326c2.394 0.195 4.262 1.068 5.325 2.135 2.836 2.847 4.301 11.418-4.756 20.506l-120.535 120.955c-9.057 9.088-17.595 7.619-20.429 4.774-2.842-2.847-4.306-11.423 4.749-20.511l120.535-120.955c5.663-5.683 11.123-7.235 15.114-6.907zM487.903 766.034c2.396 0.195 4.257 1.070 5.325 2.135 2.831 2.847 4.301 11.423-4.756 20.511l-94.29 94.618c-9.057 9.088-17.6 7.611-20.436 4.762-2.834-2.842-4.301-11.412 4.762-20.5l94.285-94.618c5.658-5.678 11.121-7.235 15.109-6.907z"></path>
+        </symbol>
+        <symbol id="icon-powerful" viewBox="0 0 1024 1024">
+            <title>powerful</title>
+            <path class="path1" d="M404.882 64.86c0 9.83-167.066 577.843-167.066 577.843l257.887-56.95-137.994 438.246 428.472-666.291-290.888 49.139 198.51-406.848z"></path>
+        </symbol>
+        <symbol id="icon-smiley" viewBox="0 0 1024 1024">
+            <title>smiley</title>
+            <path class="path1"
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM307.2 299.886c0 0 0 0 0 0-45.444 0-82.285 36.839-82.286 82.283 0 45.445 36.841 82.286 82.286 82.286s82.286-36.841 82.286-82.286c-0.001-45.444-36.842-82.284-82.286-82.284 0 0 0 0 0 0zM716.8 299.886c0 0 0 0 0 0-45.444 0-82.285 36.839-82.286 82.283 0 45.445 36.841 82.286 82.286 82.286 0 0 0 0 0 0 45.445 0 82.286-36.841 82.286-82.286s-36.842-82.284-82.286-82.284c0 0 0 0 0 0zM189.089 574.344c7.276 189.458 142.546 321.976 324.547 320.051 181.996-1.925 323.666-158.152 324.897-320.051h-649.444zM256.435 638.344h70.879v127.002c-37.299-34.066-62.73-78.208-70.879-127.002zM391.314 638.344h89.6v194.911c-32.192-3.571-62.387-12.288-89.6-25.17v-169.738zM544.914 638.344h89.6v170.565c-27.251 12.659-57.439 21.158-89.6 24.525v-195.087zM698.514 638.344h72.678c-8.279 49.567-34.406 94.316-72.678 128.596v-128.594z"></path>
+        </symbol>
+        <symbol id="icon-social-management" viewBox="0 0 1024 1024">
+            <title>social-management</title>
+            <path class="path1"
+                d="M143.168 0c-77.806 0-141.568 63.764-141.568 141.568 0 77.811 63.762 141.568 141.568 141.568 13.245 0 26.066-1.889 38.246-5.338l34.422 57.789c-76.48 56.438-126.223 147.164-126.223 249.216 0 170.598 138.982 309.581 309.581 309.581 88.499 0 168.479-37.412 224.973-97.229l52.378 39.532c-4.954 14.372-7.685 29.747-7.685 45.74 0 77.804 63.759 141.568 141.568 141.568 77.806 0 141.568-63.764 141.568-141.568 0-77.811-63.762-141.568-141.568-141.568-38.802 0-74.104 15.857-99.753 41.403l-47.56-35.896c28.941-47.071 45.658-102.41 45.658-161.562 0-49.779-11.853-96.855-32.845-138.583l117.683-86.226c24.095 18.964 54.395 30.349 87.224 30.349 77.806 0 141.568-63.762 141.568-141.568 0-77.809-63.762-141.573-141.568-141.573-77.809 0-141.573 63.764-141.573 141.568 0 21.949 5.074 42.778 14.106 61.371l-112.026 82.081c-56.788-71.235-144.256-117.002-242.145-117.002-45.701 0-89.124 9.979-128.223 27.863l-33.492-56.223c28.948-25.979 47.258-63.611 47.258-105.293 0-77.804-63.762-141.568-141.568-141.568zM143.168 64c43.22 0 77.568 34.355 77.568 77.568 0 43.223-34.348 77.568-77.568 77.568-43.218 0-77.568-34.345-77.568-77.568 0-43.213 34.35-77.568 77.568-77.568zM880.832 171.205c43.218 0 77.568 34.355 77.568 77.573s-34.35 77.568-77.568 77.568c-43.22 0-77.573-34.35-77.573-77.568 0-43.22 34.355-77.576 77.573-77.576zM399.194 339.218c136.013 0 245.581 109.576 245.581 245.588s-109.568 245.581-245.581 245.581c-136.013 0-245.586-109.568-245.586-245.581s109.573-245.586 245.586-245.586zM397.069 403.858c-65.134-1.024-116.89 74.757-90.726 134.82 7.414 19.259 21.156 35.891 38.277 47.327-58.947 25.882-93.96 90.793-93.023 153.784-0.154 12.301-1.311 24.968 10.496 24.602 87.867-1.787 194.995 0.384 282.872-0.195 11.494-69.924-23.578-148.57-89.882-177.981 46.472-30.751 59.709-103.352 21.363-145.684-19.174-23.281-49.126-37.499-79.378-36.675zM398.743 464.41c1.357-0.018 2.732 0.044 4.116 0.189 33.349 1.528 49.093 52.659 19.205 70.574-23.578 16.755-63.872-0.614-61.133-31.693 0.307-20.495 17.418-38.789 37.811-39.071zM401.311 635.384c38.211 0.607 70.382 32.735 80 67.917-54.477-0.056-108.954 0.154-163.423-0.154 10.040-35.244 41.298-67.379 79.708-67.722 1.244-0.051 2.483-0.061 3.712-0.041zM810.419 804.864c43.223 0 77.576 34.345 77.576 77.568 0 43.213-34.355 77.568-77.573 77.568-43.213 0-77.568-34.355-77.568-77.568 0-43.223 34.355-77.568 77.568-77.568z"></path>
+        </symbol>
+        <symbol id="icon-speak-up" viewBox="0 0 1024 1024">
+            <title>speak-up</title>
+            <path class="path1"
+                d="M0 0v768h175.544v256h66.696l165.471-256h616.289v-768h-1024zM64 64h896v640l-580.854 0.914-139.602 218.854v-155.768h0.031l0.041-64h-175.616v-640zM654.405 103.439c-87.194-2.156-140.864 123.187-141.855 125.517-0.986-2.319-54.477-127.24-141.471-125.507-16.261 0.325-33.69 5.076-52.16 15.898-143.35 83.968-116.833 321.408 193.516 537.285v0.128l0.115-0.069 0.102 0.077v-0.133c306.168-201.907 336.87-453.315 193.523-537.293-18.33-10.732-35.622-15.503-51.771-15.903z"></path>
+        </symbol>
+        <symbol id="icon-gallery" viewBox="0 0 1024 1024">
+            <title>gallery</title>
+            <path d="M107.855 133.83h359.073v333.794H107.855zM533.072 133.83h359.074v333.794H533.072zM107.855 532.376h359.073V866.17H107.855zM533.072 532.376h359.074V866.17H533.072z"/>
+        </symbol>
+        <symbol id="icon-list" viewBox="0 0 1024 1024">
+            <title>list</title>
+            <path transform="matrix(31.97294 0 0 31.97294 5313.926 639.882)" d="M-162.75-2.5h3.75v-3.75h-3.75zm0 7.5h3.75V1.25h-3.75zm0-15h3.75v-3.75h-3.75zm7.5 7.5h16.875v-3.75h-16.875zm0 7.5h16.875V1.25h-16.875zm0-18.75V-10h16.875v-3.75z"/>
+        </symbol>
+        <symbol id="icon-recruit" viewBox="0 0 1024 1024">
+            <title>Looking for people</title>
+            <path d="M510.5 3l-159 141.7-207 14.2-19.3 203L0 513.4l125.2 151.2 19.3 208 207 19 159 132.3 159-132.4 207-19 14.5-203L1021 518 896 362.2 876.6 159l-207-19-159-137zm0 250.5c72.3 0 135 56.7 135 132.3 0 75.7-62.7 132.4-135 132.4-72.2 0-134.8-56.7-134.8-127.6 0-71 62.6-127.7 134.8-127.7zm0 331c96.4 0 269.8 47 269.8 127.5v66.2H240.8V712c0-85 178.2-132.4 269.7-132.4z"/>
+        </symbol>
+        <symbol id="icon-activity" viewBox="0 0 1024 1024">
+            <title>Activity</title>
+            <path d="M715.5 206.7l117 117-249.3 246.8L379.7 367 3.2 748.6l71.2 68.7L379.7 512l203.5 203.5L903.8 395l117 117V206.7z"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/app/svg/team-requirement.svg b/app/svg/team-requirement.svg
deleted file mode 100644
index 154ea48c..00000000
--- a/app/svg/team-requirement.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M158 0c-54.5 0-99 44.4-99 99 0 54.4 44.5 98.8 99 98.8 54.4 0 99-44.4 99-99C257 44.5 212.3 0 158 0zm0 25c41 0 74 33 74 74s-33 73.8-74 73.8-74-33-74-74S117 25 158 25zm42.4 175v200h200V200h-200zM158 213.6C70.2 213.6 0 292.2-.3 387.4V400h176.7v-25h-151c6-77 63.5-136.3 132.6-136.4 6.2 0 12.3.5 18.4 1.5V215c-6-.8-12.2-1.2-18.4-1.2zm67.4 11.4h150v27.4L360.8 240l-74 88-49.8-42-11.6 14v-75zm150 36.7V375h-150v-66l45.2 38.2 19 16 16.2-19 69.6-82.5z"/>
-</svg>
diff --git a/app/svg/team.svg b/app/svg/team.svg
deleted file mode 100644
index fc0fc652..00000000
--- a/app/svg/team.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 22 21.7" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M15 9.8c1.6 0 3-1.3 3-3 0-1.6-1.4-3-3-3-1.7 0-3 1.4-3 3 0 1.7 1.3 3 3 3zm-8 0c1.7 0 3-1.3 3-3 0-1.6-1.3-3-3-3-1.6 0-3 1.4-3 3 0 1.7 1.4 3 3 3zm0 2c-2.2 0-7 1.2-7 3.5v2.4h14v-2.4c0-2.3-4.6-3.5-7-3.5zm8 0h-1c1 1 2 2 2 3.5v2.4h6v-2.4c0-2.3-4.7-3.5-7-3.5z"/>
-</svg>
diff --git a/app/svg/timeline.svg b/app/svg/timeline.svg
deleted file mode 100644
index 56c0347a..00000000
--- a/app/svg/timeline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" version="1.1" height="24px" width="24px">
-    <path d="m0 16.5 24 0 0-3-24 0 0 3zm0 6 24 0 0-3-24 0 0 3zm0-12 24 0 0-3-24 0 0 3zm0-9 0 3 24 0 0-3-24 0z"/>
-</svg>
diff --git a/app/svg/trash.svg b/app/svg/trash.svg
deleted file mode 100644
index 281f1d29..00000000
--- a/app/svg/trash.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path d="M106.8 0v56H0v25h46.8v319h305V81H400V56H291.8V0zm25 25h135v31h-135zm-60 56h35v267h25V81h55v267h25V81h55v267h25V81h35v294h-255z"/>
-</svg>
diff --git a/app/svg/unlock.svg b/app/svg/unlock.svg
deleted file mode 100644
index fe3188a5..00000000
--- a/app/svg/unlock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 400 400.00001" xmlns="http://www.w3.org/2000/svg">
-    <path d="M167 0C110 0 63.4 45.4 61.3 102h25c2-43 37-77 80.7-77h66c45 0 80.8 36 80.8 81v46.7H0V400h400V152.7h-61.2V106C338.8 47.5 291.4 0 233 0zM25 177.8h350v197H25zm162.5 51.4v89.6h25v-89.6z"/>
-</svg>
diff --git a/app/svg/unwatch.svg b/app/svg/unwatch.svg
deleted file mode 100644
index 9a305958..00000000
--- a/app/svg/unwatch.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 1024 1024">
-    <path d="M511.9 304.777c111.998 0 202.897 90.9 202.897 202.898 0 26.174-5.276 51.13-14.406 74.058L819.087 700.43c61.275-51.132 109.565-117.276 139.39-192.755C888.073 329.53 715 203.328 511.9 203.328c-56.813 0-111.19 10.145-161.71 28.406l87.65 87.45c22.928-8.928 47.885-14.407 74.06-14.407zM106.1 194.197l92.522 92.522 18.464 18.463C150.13 357.53 97.175 427.125 65.523 507.675 135.726 685.82 309 812.023 511.9 812.023c62.897 0 122.955-12.174 177.94-34.29l17.247 17.246 118.29 118.492 51.738-51.536L157.84 142.46l-51.738 51.738zM330.508 418.4l62.695 62.696c-1.826 8.724-3.043 17.45-3.043 26.58 0 67.16 54.58 121.738 121.74 121.738 9.13 0 17.854-1.217 26.375-3.043l62.696 62.696c-26.985 13.392-57.014 21.508-89.07 21.508-112 0-202.9-90.9-202.9-202.9 0-32.056 8.116-62.085 21.508-89.274zm174.695-31.855L633.03 514.37l.607-6.695c0-67.16-54.58-121.738-121.738-121.738l-6.697.608z"/>
-</svg>
diff --git a/app/svg/upvote.svg b/app/svg/upvote.svg
deleted file mode 100644
index 187d6159..00000000
--- a/app/svg/upvote.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   viewBox="0 0 1000 1000"
-   >
-  <path
-     d="m 140.67935,787.45652 718.6413,0 L 500,212.54348 Z"
-     />
-</svg>
diff --git a/app/svg/watch.svg b/app/svg/watch.svg
deleted file mode 100644
index cfce30c5..00000000
--- a/app/svg/watch.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" viewBox="0 0 1000 1000" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg">
-    <path d="m5.1e2 2.1e2c-2e2 0-3.7e2 1.3e2 -4.4e2 3e2 70 1.8e2 2.4e2 3e2 4.4e2 3e2s3.7e2 -1.3e2 4.4e2 -3e2c-60-1.8e2 -2.4e2 -3e2 -4.4e2 -3e2zm0 5.1e2c-1.1e2 0-2e2 -91-2e2 -2e2s91-2e2 2e2 -2e2 2e2 91 2e2 2e2 -91 2e2 -2e2 2e2zm0-3.2e2c-67 0-1.2e2 54-1.2e2 1.2e2 0 67 54 1.2e2 1.2e2 1.2e2 67 0 1.2e2 -54 1.2e2 -1.2e2 0-67-54-1.2e2 -1.2e2 -1.2e2z"/>
-</svg>
diff --git a/app/themes/high-contrast/custom.scss b/app/themes/high-contrast/custom.scss
index c566bacc..758a94ce 100644
--- a/app/themes/high-contrast/custom.scss
+++ b/app/themes/high-contrast/custom.scss
@@ -180,7 +180,7 @@ tg-project-menu {
         background: lighten($white, 20%);
         border-top: 3px solid $black;
         .icon {
-            color: $black;
+            fill: $black;
         }
     }
 }
diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss
index 7ada1f31..f17d0a73 100644
--- a/app/themes/material-design/custom.scss
+++ b/app/themes/material-design/custom.scss
@@ -155,7 +155,7 @@ tg-project-menu {
         background: lighten($primary-light, 20%);
         border-top: 3px solid $primary;
         .icon {
-            color: $primary;
+            fill: $primary;
         }
     }
 }
diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss
index 7a5ad4d7..8c64cb2b 100644
--- a/app/themes/taiga/custom.scss
+++ b/app/themes/taiga/custom.scss
@@ -135,7 +135,7 @@ tg-project-menu {
         background: $whitish;
         border-top: 3px solid $gray-light;
         .icon {
-            color: $gray-light;
+            fill: $gray-light;
         }
     }
 }

From a6cd236a51e75be7f7ecfcc90a3fee6b4256bcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 3 Feb 2016 13:44:13 +0100
Subject: [PATCH 041/155] Fix #3858: app-meta service doesn't overwrite the
 title of all the svg icons

---
 app/modules/services/app-meta.service.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/modules/services/app-meta.service.coffee b/app/modules/services/app-meta.service.coffee
index d0a4febf..e3382e7e 100644
--- a/app/modules/services/app-meta.service.coffee
+++ b/app/modules/services/app-meta.service.coffee
@@ -33,7 +33,7 @@ class AppMetaService
         return if not key
 
         if key == "title"
-            meta = $("title")
+            meta = $("head title")
 
             if meta.length == 0
                 meta = $("<title></title>")
@@ -41,7 +41,7 @@ class AppMetaService
 
             meta.text(value or "")
         else if key.indexOf("og:") == 0
-            meta = $("meta[property='#{key}']")
+            meta = $("head meta[property='#{key}']")
 
             if meta.length == 0
                 meta = $("<meta property='#{key}'/>")
@@ -49,7 +49,7 @@ class AppMetaService
 
             meta.attr("content", value or "")
         else
-            meta = $("meta[name='#{key}']")
+            meta = $("head meta[name='#{key}']")
 
             if meta.length == 0
                 meta = $("<meta name='#{key}'/>")
@@ -91,7 +91,7 @@ class AppMetaService
         )
 
     removeMobileViewport: () ->
-        $("meta[name=\"viewport\"]").remove()
+        $("head meta[name=\"viewport\"]").remove()
 
     setfn: (fn) ->
         @._listener() if @.listener

From d748a41e2896c6d3bf5b28e67acc95a4499d6c81 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 5 Feb 2016 09:33:19 +0100
Subject: [PATCH 042/155] user settings plugins support

---
 app/coffee/app.coffee                               |  5 +++++
 app/coffee/modules/base.coffee                      |  1 +
 app/coffee/modules/base/contrib.coffee              | 13 +++++++++++++
 app/partials/contrib/user-settings.jade             | 10 ++++++++++
 .../includes/modules/user-settings-menu.jade        |  7 +++++++
 5 files changed, 36 insertions(+)
 create mode 100644 app/partials/contrib/user-settings.jade

diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 5d782823..2a860aea 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -335,6 +335,10 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
     $routeProvider.when("/cancel-account/:cancel_token",
         {templateUrl: "user/cancel-account.html"})
 
+    # UserSettings - Contrib Plugins
+    $routeProvider.when("/user-settings/contrib/:plugin",
+        {templateUrl: "contrib/user-settings.html"})
+
     # User profile
     $routeProvider.when("/profile",
         {
@@ -594,6 +598,7 @@ init = ($log, $rootscope, $auth, $events, $analytics, $translate, $location, $na
     # Taiga Plugins
     $rootscope.contribPlugins = @.taigaContribPlugins
     $rootscope.adminPlugins = _.filter(@.taigaContribPlugins, {"type": "admin"})
+    $rootscope.userSettingsPlugins = _.filter(@.taigaContribPlugins, {"type": "userSettings"})
 
     $rootscope.$on "$translateChangeEnd", (e, ctx) ->
         lang = ctx.language
diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index feeb02f8..e0b8c33b 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -112,6 +112,7 @@ urls = {
     "user-settings-user-change-password": "/user-settings/user-change-password"
     "user-settings-user-avatar": "/user-settings/user-avatar"
     "user-settings-mail-notifications": "/user-settings/mail-notifications"
+    "user-settings-contrib": "/user-settings/contrib/:plugin"
 
 }
 
diff --git a/app/coffee/modules/base/contrib.coffee b/app/coffee/modules/base/contrib.coffee
index 3db5a643..e8607fef 100644
--- a/app/coffee/modules/base/contrib.coffee
+++ b/app/coffee/modules/base/contrib.coffee
@@ -56,3 +56,16 @@ class ContribController extends taiga.Controller
         return @.loadProject()
 
 module.controller("ContribController", ContribController)
+
+
+class ContribUserSettingsController extends taiga.Controller
+    @.$inject = [
+        "$rootScope",
+        "$scope",
+        "$routeParams"
+    ]
+
+    constructor: (@rootScope, @scope, @params) ->
+        @scope.currentPlugin = _.head(_.filter(@rootScope.userSettingsPlugins, {"slug": @params.plugin}))
+
+module.controller("ContribUserSettingsController", ContribUserSettingsController)
diff --git a/app/partials/contrib/user-settings.jade b/app/partials/contrib/user-settings.jade
new file mode 100644
index 00000000..2af06472
--- /dev/null
+++ b/app/partials/contrib/user-settings.jade
@@ -0,0 +1,10 @@
+doctype html
+
+div.wrapper(
+    ng-controller="ContribUserSettingsController as ctrl"
+    ng-init="section='user-settings'"
+)
+    sidebar.menu-secondary.sidebar.settings-nav(tg-user-settings-navigation)
+        include ../includes/modules/user-settings-menu
+
+    section.main(ng-include="currentPlugin.template")
\ No newline at end of file
diff --git a/app/partials/includes/modules/user-settings-menu.jade b/app/partials/includes/modules/user-settings-menu.jade
index 68afaab3..05a7cb7c 100644
--- a/app/partials/includes/modules/user-settings-menu.jade
+++ b/app/partials/includes/modules/user-settings-menu.jade
@@ -10,3 +10,10 @@ section.admin-menu
             li#usersettingsmenu-mail-notifications
                 a(href="", tg-nav="user-settings-mail-notifications", title="{{ 'USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS' | translate }}")
                     span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS")
+            li#usersettings-contrib(ng-repeat="plugin in userSettingsPlugins")
+                a(
+                    href=""
+                    tg-nav="user-settings-contrib:plugin=plugin.slug"
+                    ng-class="{active: plugin.slug == currentPlugin.slug}"
+                )
+                    span.title {{ plugin.name }}

From 1d3fcedfe10337136c8e9a0cd9ee09ecbebf814f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 9 Feb 2016 12:03:51 +0100
Subject: [PATCH 043/155] Fix summary order

---
 app/styles/components/summary.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss
index ee01cf4b..28d6aaa5 100644
--- a/app/styles/components/summary.scss
+++ b/app/styles/components/summary.scss
@@ -175,9 +175,9 @@ $summary-background: $grayer;
     padding: 2rem 6rem;
     svg {
         @include svg-size(4rem);
+        fill: $primary-dark;
         flex-basis: 4rem;
         flex-shrink: 0;
-        fill: $primary-dark;
         margin-right: 2rem;
     }
     p {

From ab4ae7fe1db9350511ae104a65f552285cff1b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 8 Feb 2016 09:16:28 +0100
Subject: [PATCH 044/155] Remove sign up link if not register enabled

---
 .../navigation-bar.directive.coffee           | 21 ++++++++++---------
 .../navigation-bar/navigation-bar.jade        | 14 ++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/modules/navigation-bar/navigation-bar.directive.coffee b/app/modules/navigation-bar/navigation-bar.directive.coffee
index c32a792f..bce9ea39 100644
--- a/app/modules/navigation-bar/navigation-bar.directive.coffee
+++ b/app/modules/navigation-bar/navigation-bar.directive.coffee
@@ -17,22 +17,16 @@
 # File: navigation-bar.directive.coffee
 ###
 
-NavigationBarDirective = (currentUserService, navigationBarService,
-      locationService, navUrlsService) ->
-
+NavigationBarDirective = (currentUserService, navigationBarService, locationService, navUrlsService, config) ->
     link = (scope, el, attrs, ctrl) ->
         scope.vm = {}
 
-        scope.$on "$routeChangeSuccess", () ->
-            if locationService.path() == "/"
-                scope.vm.active = true
-            else
-                scope.vm.active = false
-
         taiga.defineImmutableProperty(scope.vm, "projects", () -> currentUserService.projects.get("recents"))
         taiga.defineImmutableProperty(scope.vm, "isAuthenticated", () -> currentUserService.isAuthenticated())
         taiga.defineImmutableProperty(scope.vm, "isEnabledHeader", () -> navigationBarService.isEnabledHeader())
 
+        scope.vm.publicRegisterEnabled = config.get("publicRegisterEnabled")
+
         scope.vm.login = ->
             nextUrl = encodeURIComponent(locationService.url())
             locationService.url(navUrlsService.resolve("login"))
@@ -43,6 +37,12 @@ NavigationBarDirective = (currentUserService, navigationBarService,
             locationService.url(navUrlsService.resolve("register"))
             locationService.search({next: nextUrl})
 
+        scope.$on "$routeChangeSuccess", () ->
+            if locationService.path() == "/"
+                scope.vm.active = true
+            else
+                scope.vm.active = false
+
     directive = {
         templateUrl: "navigation-bar/navigation-bar.html"
         scope: {}
@@ -55,7 +55,8 @@ NavigationBarDirective.$inject = [
     "tgCurrentUserService",
     "tgNavigationBarService",
     "$tgLocation",
-    "$tgNavUrls"
+    "$tgNavUrls",
+    "$tgConfig"
 ]
 
 angular.module("taigaNavigationBar").directive("tgNavigationBar", NavigationBarDirective)
diff --git a/app/modules/navigation-bar/navigation-bar.jade b/app/modules/navigation-bar/navigation-bar.jade
index 2c6a4a81..e81794cc 100644
--- a/app/modules/navigation-bar/navigation-bar.jade
+++ b/app/modules/navigation-bar/navigation-bar.jade
@@ -3,27 +3,31 @@ nav.navbar(ng-if="vm.isEnabledHeader")
         a.logo(
             href="#",
             tg-nav="home",
-            title="{{'PROJECT.NAVIGATION.HOMEPAGE' | translate}}")
-
+            title="{{'PROJECT.NAVIGATION.HOMEPAGE' | translate}}"
+        )
             include ../../svg/logo.svg
 
         a(
             href="https://taiga.io/support/",
             target="_blank",
             title="{{'PROJECT.NAVIGATION.HELP_TITLE' | translate}}",
-            translate="PROJECT.NAVIGATION.HELP")
+            translate="PROJECT.NAVIGATION.HELP"
+        )
 
     div.nav-right(ng-if="!vm.isAuthenticated")
         a.login(
             ng-click="vm.login()"
             href="#",
             title="{{ 'LOGIN_COMMON.ACTION_SIGN_IN' | translate }}"
-        ) {{ 'LOGIN_COMMON.ACTION_SIGN_IN' | translate }}
+            translate="LOGIN_COMMON.ACTION_SIGN_IN"
+        )
         a.register(
             ng-click="vm.register()"
+            ng-if="vm.publicRegisterEnabled"
             href="#",
             title="{{ 'REGISTER_FORM.ACTION_SIGN_UP' | translate }}"
-        ) {{ 'REGISTER_FORM.ACTION_SIGN_UP' | translate }}
+            translate="REGISTER_FORM.ACTION_SIGN_UP"
+        )
 
     div.nav-right(ng-if="vm.isAuthenticated")
         a(tg-nav="home",

From 8fd244feeb68c5efe1e807ca4b8aa63d30695883 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 10 Feb 2016 07:50:42 +0100
Subject: [PATCH 045/155] Fixing number formatting in backlog

---
 app/partials/backlog/sprint-header.jade       | 4 ++--
 app/partials/includes/components/summary.jade | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/partials/backlog/sprint-header.jade b/app/partials/backlog/sprint-header.jade
index 2024e3ea..fb24bf95 100644
--- a/app/partials/backlog/sprint-header.jade
+++ b/app/partials/backlog/sprint-header.jade
@@ -12,8 +12,8 @@
     .sprint-date {{::estimatedDateRange}}
     ul
         li
-            span.number {{::closedPoints | number:2 | number}}
+            span.number {{::closedPoints | number}}
             span.description(translate="BACKLOG.CLOSED_POINTS")
         li
-            span.number {{::totalPoints | number:2 | number}}
+            span.number {{::totalPoints | number}}
             span.description(translate="BACKLOG.TOTAL_POINTS")
diff --git a/app/partials/includes/components/summary.jade b/app/partials/includes/components/summary.jade
index b6698321..282f43e5 100644
--- a/app/partials/includes/components/summary.jade
+++ b/app/partials/includes/components/summary.jade
@@ -4,14 +4,14 @@ div.summary
     div.data
         span.number(ng-bind="stats.completedPercentage + '%'")
 
-    div.summary-stats(ng-if="stats.total_points | number:2 | number")
-        span.number(ng-bind="stats.total_points") --
+    div.summary-stats(ng-if="stats.total_points")
+        span.number(ng-bind="stats.total_points | number") --
         span.description(translate="BACKLOG.SUMMARY.PROJECT_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.defined_points | number:2 | number") --
+        span.number(ng-bind="stats.defined_points | number") --
         span.description(translate="BACKLOG.SUMMARY.DEFINED_POINTS")
     div.summary-stats
-        span.number(ng-bind="stats.closed_points | number:2 | number") --
+        span.number(ng-bind="stats.closed_points | number") --
         span.description(translate="BACKLOG.SUMMARY.CLOSED_POINTS")
     div.summary-stats
         span.number(ng-bind="stats.speed | number:0") --

From c89bd1b234cf36f56cff4b36c232afa7f0781e9d Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 10 Feb 2016 07:55:01 +0100
Subject: [PATCH 046/155] remove console.logs

---
 app/coffee/modules/admin/lightboxes.coffee     | 1 -
 app/coffee/modules/auth.coffee                 | 1 -
 app/coffee/modules/base/http.coffee            | 2 --
 app/coffee/modules/taskboard/lightboxes.coffee | 1 -
 4 files changed, 5 deletions(-)

diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index 2ee6542d..5a4ff7cd 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -65,7 +65,6 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, $loading, lightboxService,
     link = ($scope, $el, $attrs) ->
         createButton = (type) ->
             html = "<svg class='icon " + type + "'><use xlink:href='#" + type + "'></svg>";
-            console.log html
             return html
 
         createFieldSet = (required = true)->
diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 9a040fff..3694838b 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -214,7 +214,6 @@ PublicRegisterMessageDirective = ($config, $navUrls, $routeParams, templates) ->
         url = $navUrls.resolve("register")
         if $routeParams['next'] and $routeParams['next'] != $navUrls.resolve("register")
             nextUrl = encodeURIComponent($routeParams['next'])
-            console.log "-----", nextUrl
             url += "?next=#{nextUrl}"
 
         return template({url:url})
diff --git a/app/coffee/modules/base/http.coffee b/app/coffee/modules/base/http.coffee
index a2af080d..0c425720 100644
--- a/app/coffee/modules/base/http.coffee
+++ b/app/coffee/modules/base/http.coffee
@@ -49,8 +49,6 @@ class HttpService extends taiga.Service
     request: (options) ->
         options.headers = _.assign({}, options.headers or {}, @.headers())
 
-        console.log options
-
         return @http(options)
 
     get: (url, params, options) ->
diff --git a/app/coffee/modules/taskboard/lightboxes.coffee b/app/coffee/modules/taskboard/lightboxes.coffee
index 9cc979d2..756d84e8 100644
--- a/app/coffee/modules/taskboard/lightboxes.coffee
+++ b/app/coffee/modules/taskboard/lightboxes.coffee
@@ -50,7 +50,6 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootscope, $loading, lightboxSer
             return $q.all(promises)
 
         deleteAttachments = (obj) ->
-            console.log attachmentsToDelete.toJS()
             promises = _.map attachmentsToDelete.toJS(), (attachment) ->
                 return attachmentsService.delete("task", attachment.id)
 

From 4935dd232090b8f4b699146d094df43b12430ad1 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 10 Feb 2016 08:28:16 +0100
Subject: [PATCH 047/155] fix tgNavigationBar directive tests

---
 .../navigation-bar.directive.spec.coffee              | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/modules/navigation-bar/navigation-bar.directive.spec.coffee b/app/modules/navigation-bar/navigation-bar.directive.spec.coffee
index 36041e2f..1e746290 100644
--- a/app/modules/navigation-bar/navigation-bar.directive.spec.coffee
+++ b/app/modules/navigation-bar/navigation-bar.directive.spec.coffee
@@ -49,6 +49,13 @@ describe "navigationBarDirective", () ->
 
         provide.value "$tgLocation", mocks.locationService
 
+    _mocksConfig = () ->
+        mocks.config =  Immutable.fromJS({
+            publicRegisterEnabled: true
+        })
+
+        provide.value "$tgConfig", mocks.config
+
     _mockTgNavUrls = () ->
         mocks.navUrls = {
             resolve: sinon.stub()
@@ -76,6 +83,8 @@ describe "navigationBarDirective", () ->
             _mockTranslateFilter()
             _mockTgDropdownProjectListDirective()
             _mockTgDropdownUserDirective()
+            _mocksConfig()
+
             return null
 
     beforeEach ->
@@ -120,6 +129,7 @@ describe "navigationBarDirective", () ->
         expect(mocks.locationService.search.callCount).to.be.equal(1)
         expect(mocks.locationService.url.calledWith("/login")).to.be.true
         expect(mocks.locationService.search.calledWith({next: encodeURIComponent(nextUrl)})).to.be.true
+        expect(vm.publicRegisterEnabled).to.be.true
 
     it "navigation bar register", () ->
         mocks.navUrls.resolve.withArgs("register").returns("/register")
@@ -135,3 +145,4 @@ describe "navigationBarDirective", () ->
         expect(mocks.locationService.search.callCount).to.be.equal(1)
         expect(mocks.locationService.url.calledWith("/register")).to.be.true
         expect(mocks.locationService.search.calledWith({next: encodeURIComponent(nextUrl)})).to.be.true
+        expect(vm.publicRegisterEnabled).to.be.true

From 7bab15b5ca6e34cb15539ba75219f21c73dcfc85 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 10 Feb 2016 08:58:17 +0100
Subject: [PATCH 048/155] force angular mocks 1.4.7

---
 bower.json   | 1 -
 package.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 0ecb935a..400a03c8 100644
--- a/bower.json
+++ b/bower.json
@@ -54,7 +54,6 @@
     "angular-animate": "1.4.7",
     "angular-aria": "1.4.7",
     "angular-sanitize": "1.4.7",
-    "angular-mocks": "1.4.7",
     "checksley": "~0.6.0",
     "jquery": "~2.1.1",
     "select2": "~3.4.8",
diff --git a/package.json b/package.json
index 708e20fb..5e4eb334 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "e2e": "node ./node_modules/babel/bin/babel-node.js --stage=1 ./run-e2e.js"
   },
   "devDependencies": {
-    "angular-mocks": "^1.4.7",
+    "angular-mocks": "1.4.7",
     "babel": "^5.6.5",
     "bluebird": "^3.0.2",
     "chai": "^3.3.0",

From dfdb78657fd08bf9a5a5a2fa8a32fca6ec857ca1 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 10 Feb 2016 09:15:47 +0100
Subject: [PATCH 049/155] askChoice warning is bold by styles

---
 app/locales/taiga/locale-en.json        | 2 +-
 app/styles/modules/common/lightbox.scss | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index f3d15c67..b1de8fc8 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} members with this role",
             "TITLE_DELETE_ROLE": "Delete Role",
             "REPLACEMENT_ROLE": "All the users with this role will be moved to",
-            "WARNING_DELETE_ROLE": "<strong>Be careful, all role estimations will be removed</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "You can't delete all values",
             "EXTERNAL_USER": "External user"
         },
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 01347548..02d808fe 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -319,6 +319,9 @@
             }
         }
     }
+    .warning {
+        @extend %bold;
+    }
 }
 
 .lightbox-delete-account {

From a5a80bb9a87bc4cb167dbc4596dd2433405d92c3 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 10 Feb 2016 10:21:34 +0100
Subject: [PATCH 050/155] compile modules support

---
 gulpfile.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gulpfile.js b/gulpfile.js
index 8c50705a..8890c0ba 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -112,6 +112,8 @@ paths.coffee = [
 ];
 
 paths.coffee_order = [
+    paths.app + "modules/compile-modules/**/*.module.coffee",
+    paths.app + "modules/compile-modules/**/*.coffee",
     paths.app + "coffee/app.coffee",
     paths.app + "coffee/*.coffee",
     paths.app + "coffee/modules/controllerMixins.coffee",

From c9da356c98dced9b8e96e313ba5d8f9fccf97601 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 11 Feb 2016 10:48:05 +0100
Subject: [PATCH 051/155] add user-menu options with plugins

---
 .../dropdown-user/dropdown-user.directive.coffee         | 7 +++++--
 .../navigation-bar/dropdown-user/dropdown-user.jade      | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee b/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee
index ac09365c..6602996e 100644
--- a/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee
+++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee
@@ -18,7 +18,7 @@
 ###
 
 DropdownUserDirective = (authService, configService, locationService,
-        navUrlsService, feedbackService) ->
+        navUrlsService, feedbackService, $rootScope) ->
 
     link = (scope, el, attrs, ctrl) ->
         scope.vm = {}
@@ -33,6 +33,8 @@ DropdownUserDirective = (authService, configService, locationService,
         scope.vm.sendFeedback = ->
             feedbackService.sendFeedback()
 
+        scope.vm.userSettingsPlugins = _.filter($rootScope.userSettingsPlugins, {userMenu: true})
+
     directive = {
         templateUrl: "navigation-bar/dropdown-user/dropdown-user.html"
         scope: {}
@@ -46,7 +48,8 @@ DropdownUserDirective.$inject = [
     "$tgConfig",
     "$tgLocation",
     "$tgNavUrls",
-    "tgFeedbackService"
+    "tgFeedbackService",
+    "$rootScope"
 ]
 
 angular.module("taigaNavigationBar").directive("tgDropdownUser", DropdownUserDirective)
diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
index 7d3d275e..0061c6e4 100644
--- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
+++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
@@ -22,6 +22,15 @@ div.navbar-dropdown.dropdown-user
                 tg-nav="user-settings-user-profile",
                 title="{{'PROJECT.NAVIGATION.EDIT_PROFILE_TITLE' | translate}}",
                 translate="PROJECT.NAVIGATION.EDIT_PROFILE")
+
+        li(ng-repeat="plugin in vm.userSettingsPlugins")
+            a(
+                href=""
+                tg-nav="user-settings-contrib:plugin=plugin.slug"
+                ng-class="{active: plugin.slug == currentPlugin.slug}"
+            )
+                span.title {{ plugin.name }}
+
         li
             a(
                 href="#",

From 8da62fa48ead2f65cf3b91df608227c167ad49c9 Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Fri, 12 Feb 2016 13:59:47 +0530
Subject: [PATCH 052/155] Fix typos in readme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`enhancemnt` → `enhancement`
`diferent` → `different`
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dc390dcf..14d6d7c0 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Please read carefully [our license](https://github.com/taigaio/taiga-front/blob/
 
 #### Bug reports, enhancements and support ####
 
-If you **need help to setup Taiga**, want to **talk about some cool enhancemnt** or you have **some questions**, please write us to our [mailing list](http://groups.google.com/d/forum/taigaio).
+If you **need help to setup Taiga**, want to **talk about some cool enhancement** or you have **some questions**, please write us to our [mailing list](http://groups.google.com/d/forum/taigaio).
 
 If you **find a bug** in Taiga you can always report it:
 
@@ -127,7 +127,7 @@ Complete process for all OS at: http://sass-lang.com/install
 
 **Node + Bower + Gulp**
 
-We recommend using [nvm](https://github.com/creationix/nvm) to manage diferent node versions
+We recommend using [nvm](https://github.com/creationix/nvm) to manage different node versions
 ```
 npm install -g gulp
 npm install -g bower

From c0e2aea27590c46d98336776ca6c9a1a0f20a5d8 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 9 Feb 2016 13:19:41 +0100
Subject: [PATCH 053/155] project-log-small & project-logo-big directives, fix
 #3855

---
 .../project-logo-big-src.directive.coffee     | 48 ++++++++++++
 .../project-logo-small-src.directive.coffee   | 48 ++++++++++++
 .../project-logo-src.directive.coffee         | 77 -------------------
 .../featured-projects/featured-projects.jade  |  2 +-
 .../components/highlighted/highlighted.jade   |  2 +-
 .../discover-search/discover-search.jade      |  2 +-
 .../home/projects/home-project-list.jade      |  2 +-
 .../profile/profile-favs/items/project.jade   |  2 +-
 .../profile-projects/profile-projects.jade    |  2 +-
 .../projects/listing/projects-listing.jade    |  2 +-
 app/modules/projects/project/project.jade     |  2 +-
 .../services/project-logo.service.coffee      | 47 +++++++++++
 .../services/project-logo.service.spec.coffee | 42 ++++++++++
 app/partials/admin/admin-project-profile.jade |  2 +-
 14 files changed, 194 insertions(+), 86 deletions(-)
 create mode 100644 app/modules/components/project-logo-big-src/project-logo-big-src.directive.coffee
 create mode 100644 app/modules/components/project-logo-small-src/project-logo-small-src.directive.coffee
 delete mode 100644 app/modules/components/project-logo-src/project-logo-src.directive.coffee
 create mode 100644 app/modules/services/project-logo.service.coffee
 create mode 100644 app/modules/services/project-logo.service.spec.coffee

diff --git a/app/modules/components/project-logo-big-src/project-logo-big-src.directive.coffee b/app/modules/components/project-logo-big-src/project-logo-big-src.directive.coffee
new file mode 100644
index 00000000..2c271629
--- /dev/null
+++ b/app/modules/components/project-logo-big-src/project-logo-big-src.directive.coffee
@@ -0,0 +1,48 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: project-logo-big-src.directive.coffee
+###
+
+ProjectLogoBigSrcDirective = (projectLogoService) ->
+    link = (scope, el, attrs) ->
+        scope.$watch 'project', (project) ->
+            project = Immutable.fromJS(project) # Necesary for old code
+
+            return if not project
+
+            projectLogo = project.get('logo_big_url')
+
+            if projectLogo
+                el.attr('src', projectLogo)
+                el.css('background', "")
+            else
+                logo = projectLogoService.getDefaultProjectLogo(project.get('slug'), project.get('id'))
+                el.attr('src', logo.src)
+                el.css('background', logo.color)
+
+    return {
+        link: link
+        scope: {
+             project: "=tgProjectLogoBigSrc"
+        }
+    }
+
+ProjectLogoBigSrcDirective.$inject = [
+    "tgProjectLogoService"
+]
+
+angular.module("taigaComponents").directive("tgProjectLogoBigSrc", ProjectLogoBigSrcDirective)
diff --git a/app/modules/components/project-logo-small-src/project-logo-small-src.directive.coffee b/app/modules/components/project-logo-small-src/project-logo-small-src.directive.coffee
new file mode 100644
index 00000000..51900e2e
--- /dev/null
+++ b/app/modules/components/project-logo-small-src/project-logo-small-src.directive.coffee
@@ -0,0 +1,48 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: project-logo-small-src.directive.coffee
+###
+
+ProjectLogoSmallSrcDirective = (projectLogoService) ->
+    link = (scope, el, attrs) ->
+        scope.$watch 'project', (project) ->
+            project = Immutable.fromJS(project) # Necesary for old code
+
+            return if not project
+
+            projectLogo = project.get('logo_small_url')
+
+            if projectLogo
+                el.attr('src', projectLogo)
+                el.css('background', "")
+            else
+                logo = projectLogoService.getDefaultProjectLogo(project.get('slug'), project.get('id'))
+                el.attr('src', logo.src)
+                el.css('background', logo.color)
+
+    return {
+        link: link
+        scope: {
+             project: "=tgProjectLogoSmallSrc"
+        }
+    }
+
+ProjectLogoSmallSrcDirective.$inject = [
+    "tgProjectLogoService"
+]
+
+angular.module("taigaComponents").directive("tgProjectLogoSmallSrc", ProjectLogoSmallSrcDirective)
diff --git a/app/modules/components/project-logo-src/project-logo-src.directive.coffee b/app/modules/components/project-logo-src/project-logo-src.directive.coffee
deleted file mode 100644
index 861930e0..00000000
--- a/app/modules/components/project-logo-src/project-logo-src.directive.coffee
+++ /dev/null
@@ -1,77 +0,0 @@
-###
-# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# File: project-logo.directive.coffee
-###
-
-
-IMAGES = [
-    "/#{window._version}/images/project-logos/project-logo-01.png"
-    "/#{window._version}/images/project-logos/project-logo-02.png"
-    "/#{window._version}/images/project-logos/project-logo-03.png"
-    "/#{window._version}/images/project-logos/project-logo-04.png"
-    "/#{window._version}/images/project-logos/project-logo-05.png"
-]
-
-COLORS = [
-    "rgba( 153,  214, 220, 1 )"
-    "rgba( 213,  156,  156, 1 )"
-    "rgba( 214, 161, 212,  1 )"
-    "rgba( 164, 162, 219, 1 )"
-    "rgba( 152, 224, 168,  1 )"
-]
-
-LOGOS = _.cartesianProduct(IMAGES, COLORS)
-
-
-ProjectLogoSrcDirective = ($parse) ->
-    _getDefaultProjectLogo = (project) ->
-        key = "#{project.get("slug")}-#{project.get("id")}"
-        idx = murmurhash3_32_gc(key, 42) %% LOGOS.length
-        logo = LOGOS[idx]
-
-        return { src: logo[0], color: logo[1] }
-
-    link = (scope, el, attrs) ->
-        scope.$watch "project", (project) ->
-            project = Immutable.fromJS(project) # Necesary for old code
-
-            return if not project
-
-            projectLogo = project.get('logo_big_url')
-
-            if projectLogo
-                el.attr("src", projectLogo)
-                el.css('background', "")
-            else
-                logo = _getDefaultProjectLogo(project)
-                el.attr("src", logo.src)
-                el.css('background', logo.color)
-
-        scope.$on "$destroy", -> el.off()
-
-    return {
-        link: link
-        scope: {
-             project: "=tgProjectLogoSrc"
-        }
-    }
-
-ProjectLogoSrcDirective.$inject = [
-    "$parse"
-]
-
-angular.module("taigaComponents").directive("tgProjectLogoSrc", ProjectLogoSrcDirective)
diff --git a/app/modules/discover/components/featured-projects/featured-projects.jade b/app/modules/discover/components/featured-projects/featured-projects.jade
index 783c71e3..6811847e 100644
--- a/app/modules/discover/components/featured-projects/featured-projects.jade
+++ b/app/modules/discover/components/featured-projects/featured-projects.jade
@@ -17,7 +17,7 @@
                         title="{{::project.get('name')}}"
                     )
                         img(
-                            tg-project-logo-src="::project"
+                            tg-project-logo-small-src="::project"
                             alt="{{::project.get('name')}}"
                         )
                     h2.project-card-name
diff --git a/app/modules/discover/components/highlighted/highlighted.jade b/app/modules/discover/components/highlighted/highlighted.jade
index f001c6a6..3f29e101 100644
--- a/app/modules/discover/components/highlighted/highlighted.jade
+++ b/app/modules/discover/components/highlighted/highlighted.jade
@@ -13,7 +13,7 @@
             title="{{::project.get('name')}}"
         )
             img(
-                tg-project-logo-src="::project"
+                tg-project-logo-small-src="::project"
                 alt="{{::project.get('name')}}"
             )
         .project-data-container
diff --git a/app/modules/discover/discover-search/discover-search.jade b/app/modules/discover/discover-search/discover-search.jade
index 1fecc64f..3422ad60 100644
--- a/app/modules/discover/discover-search/discover-search.jade
+++ b/app/modules/discover/discover-search/discover-search.jade
@@ -33,7 +33,7 @@ div(tg-discover-search)
                             title="{{ ::project.get('name') }}"
                         )
                             img(
-                                tg-project-logo-src="::project"
+                                tg-project-logo-small-src="::project"
                                 alt="{{::project.get('name')}}"
                             )
                         .list-itemtype-project-data
diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index 3b367f1e..a5d4c52a 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -15,7 +15,7 @@ section.home-project-list(ng-if="vm.projects.size")
                     title="{{::project.get('name')}}"
                 )
                     img(
-                        tg-project-logo-src="::project"
+                        tg-project-logo-small-src="::project"
                         alt="{{::project.get('name')}}"
                     )
                 h2.project-card-name
diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade
index 4b1b7e56..c298b272 100644
--- a/app/modules/profile/profile-favs/items/project.jade
+++ b/app/modules/profile/profile-favs/items/project.jade
@@ -8,7 +8,7 @@
                 title="{{ ::vm.item.get('name') }}"
             )
                 img(
-                    tg-project-logo-src="vm.item"
+                    tg-project-logo-small-src="vm.item"
                     title="{{ ::vm.item.get('name') }}"
                 )
 
diff --git a/app/modules/profile/profile-projects/profile-projects.jade b/app/modules/profile/profile-projects/profile-projects.jade
index 3f76179d..19e943c8 100644
--- a/app/modules/profile/profile-projects/profile-projects.jade
+++ b/app/modules/profile/profile-projects/profile-projects.jade
@@ -21,7 +21,7 @@ section.profile-projects
                     title="{{ ::project.get('name') }}"
                 )
                     img(
-                        tg-project-logo-src="::project"
+                        tg-project-logo-small-src="::project"
                         alt="{{::project.get('name')}}"
                     )
                 .project-list-single-title
diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade
index 59676e12..69a6dfe0 100644
--- a/app/modules/projects/listing/projects-listing.jade
+++ b/app/modules/projects/listing/projects-listing.jade
@@ -33,7 +33,7 @@
                                 title="{{ ::project.get('name') }}"
                             )
                                 img(
-                                    tg-project-logo-src="::project"
+                                    tg-project-logo-small-src="::project"
                                     alt="{{::project.get('name')}}"
                                 )
                             .list-itemtype-project-data
diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade
index 285e0dbf..f24b9239 100644
--- a/app/modules/projects/project/project.jade
+++ b/app/modules/projects/project/project.jade
@@ -8,7 +8,7 @@ div.wrapper
                 title="{{::project.get('name')}}"
             )
                 img(
-                    tg-project-logo-src="vm.project"
+                    tg-project-logo-big-src="vm.project"
                     alt="{{::vm.project.get('name')}}"
                 )
             .single-project-title-wrapper
diff --git a/app/modules/services/project-logo.service.coffee b/app/modules/services/project-logo.service.coffee
new file mode 100644
index 00000000..130d9ded
--- /dev/null
+++ b/app/modules/services/project-logo.service.coffee
@@ -0,0 +1,47 @@
+###
+# Copyright (C) 2014-2015 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: project-logo.service.coffee
+###
+
+class ProjectLogoService
+    constructor: () ->
+        IMAGES = [
+            "/#{window._version}/images/project-logos/project-logo-01.png"
+            "/#{window._version}/images/project-logos/project-logo-02.png"
+            "/#{window._version}/images/project-logos/project-logo-03.png"
+            "/#{window._version}/images/project-logos/project-logo-04.png"
+            "/#{window._version}/images/project-logos/project-logo-05.png"
+        ]
+
+        COLORS = [
+            "rgba( 153,  214, 220, 1 )"
+            "rgba( 213,  156,  156, 1 )"
+            "rgba( 214, 161, 212,  1 )"
+            "rgba( 164, 162, 219, 1 )"
+            "rgba( 152, 224, 168,  1 )"
+        ]
+
+        @.logos = _.cartesianProduct(IMAGES, COLORS)
+
+    getDefaultProjectLogo: (slug, id) ->
+        key = "#{slug}-#{id}"
+        idx = murmurhash3_32_gc(key, 42) %% @.logos.length
+        logo = @.logos[idx]
+
+        return { src: logo[0], color: logo[1] }
+
+angular.module("taigaCommon").service("tgProjectLogoService", ProjectLogoService)
diff --git a/app/modules/services/project-logo.service.spec.coffee b/app/modules/services/project-logo.service.spec.coffee
new file mode 100644
index 00000000..1c6cae74
--- /dev/null
+++ b/app/modules/services/project-logo.service.spec.coffee
@@ -0,0 +1,42 @@
+###
+# Copyright (C) 2014-2015 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: project-logo.service.spec.coffee
+###
+
+describe "tgProjectLogoService", ->
+    $provide = null
+    projectLogoService = null
+
+    _inject = ->
+        inject (_tgProjectLogoService_) ->
+            projectLogoService = _tgProjectLogoService_
+
+    _setup = ->
+        _inject()
+
+    beforeEach ->
+        window._version = '123'
+        module "taigaCommon"
+
+        _setup()
+
+    it "get default project logo", () ->
+
+        logo = projectLogoService.getDefaultProjectLogo('slug/slug', 2)
+
+        expect(logo.src).to.be.equal('/123/images/project-logos/project-logo-04.png');
+        expect(logo.color).to.be.equal('rgba( 152, 224, 168,  1 )');
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 1aedd6cb..a527c4bb 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -22,7 +22,7 @@ div.wrapper(
             .project-details-image(tg-project-logo)
                 fieldset.image-container
                     img.image(
-                        tg-project-logo-src="project._attrs"
+                        tg-project-logo-big-src="project._attrs"
                         alt="logo"
                     )
                     .loading-overlay

From 0741798a6a7ebb7ba6091b9c8431c82d1f426704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 15 Feb 2016 12:26:59 +0100
Subject: [PATCH 054/155] Change membership.is_owner to membership.is_admin

---
 app/coffee/modules/admin/memberships.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index ed683bdd..dc4c694a 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -266,7 +266,7 @@ MembershipsRowAdminCheckboxDirective = ($log, $repo, $confirm, $template, $compi
         member = $scope.$eval($attrs.tgMembershipsRowAdminCheckbox)
         html = render(member)
 
-        if member.is_owner
+        if member.is_admin
             $el.find(":checkbox").prop("checked", true)
 
         $el.on "click", ":checkbox", (event) =>
@@ -275,11 +275,11 @@ MembershipsRowAdminCheckboxDirective = ($log, $repo, $confirm, $template, $compi
 
             onError = (data) ->
                 member.revert()
-                $el.find(":checkbox").prop("checked", member.is_owner)
-                $confirm.notify("error", data.is_owner[0])
+                $el.find(":checkbox").prop("checked", member.is_admin)
+                $confirm.notify("error", data.is_admin[0])
 
             target = angular.element(event.currentTarget)
-            member.is_owner = target.prop("checked")
+            member.is_admin = target.prop("checked")
             $repo.save(member).then(onSuccess, onError)
 
         $scope.$on "$destroy", ->

From 52009415c00d9d314699e8fba4731c54780b9d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Sat, 20 Feb 2016 11:40:37 +0100
Subject: [PATCH 055/155] [i18n] Update locales

---
 app/locales/taiga/locale-ca.json      |  14 +-
 app/locales/taiga/locale-de.json      | 292 +++++++++++++-------------
 app/locales/taiga/locale-es.json      |  22 +-
 app/locales/taiga/locale-fi.json      |  14 +-
 app/locales/taiga/locale-fr.json      |  22 +-
 app/locales/taiga/locale-it.json      |  26 +--
 app/locales/taiga/locale-nl.json      |  32 +--
 app/locales/taiga/locale-pl.json      |  14 +-
 app/locales/taiga/locale-pt-br.json   | 136 ++++++------
 app/locales/taiga/locale-ru.json      | 122 +++++------
 app/locales/taiga/locale-sv.json      |  14 +-
 app/locales/taiga/locale-tr.json      |  14 +-
 app/locales/taiga/locale-zh-hant.json |  14 +-
 13 files changed, 368 insertions(+), 368 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index f8dfd9cc..c7a5c57f 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Un poc saturat per una tasca? Fes-ho saber als teus companys clicant a Iocaina quan edites la tasca. Es possible ser inmune a aquesta (fictícia) poció mortal consumint xicotetes dòsis poc a poc, així com es possible millorar amb xicotets nous desafiaments!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Be careful! You're writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Aquest valor pareix invàlid.",
             "TYPE_EMAIL": "Deu ser un correu vàlid.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "You must select at least %s choices.",
             "MAX_CHECK": "Heu de seleccionar la opció %s o inferior.",
             "RANGE_CHECK": "Heu de seleccionar entre les opcions %s i %s.",
-            "EQUAL_TO": "Aquest valor hauria de ser el mateix."
+            "EQUAL_TO": "Aquest valor hauria de ser el mateix.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Obsolet?",
         "ADD": "Afegeix un nou adjunt. {{maxFileSizeMsg}}",
         "DROP": "Deixa els adjunts ací",
-        "MAX_FILE_SIZE": "[Max. grandària:  {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ mostra els adjunts obsolets",
         "HIDE_DEPRECATED": "- Amagar els adjunts obsolets",
         "COUNT_DEPRECATED": "({{ counter }} obsolet)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "A qui estàs buscant?",
             "RECRUITING_PLACEHOLDER": "Defineix els perfils que estàs buscant",
             "PUBLIC_PROJECT": "Projecte públic",
-            "PUBLIC_PROJECT_DESC": "Els usuaris podràn trobar i vore el teu projecte",
             "PRIVATE_PROJECT": "Projecte privat",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
             "DELETE": "Esborra aquest projecte",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Afegix camps personalitzats en incidències",
             "FIELD_TYPE_TEXT": "Text",
             "FIELD_TYPE_MULTI": "Múltiples línies",
-            "FIELD_TYPE_DATE": "Data"
+            "FIELD_TYPE_DATE": "Data",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valors de projecte - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membres amb aquest rol",
             "TITLE_DELETE_ROLE": "Esborrar rol",
             "REPLACEMENT_ROLE": "Tots els usuaris amb aquest rol es canviaran a",
-            "WARNING_DELETE_ROLE": "<strong>Atenció, totes les estimacions del rol seràn esborrades</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "No pots esborrar tots els valors",
             "EXTERNAL_USER": "Usuari extern"
         },
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index d29610f4..3f825ef0 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -24,38 +24,38 @@
         "UNBLOCK": "Blockierung aufheben",
         "UNBLOCK_TITLE": "Unblock this item",
         "BLOCKED_NOTE": "Why is this blocked?",
-        "BLOCKED_REASON": "Bitte erklären Sie den Grund ",
+        "BLOCKED_REASON": "Bitte erklären Sie den Grund",
         "CREATED_BY": "Erstellt durch {{fullDisplayName}}",
         "FROM": "von",
         "TO": "zu",
         "CLOSE": "schließen",
         "GO_HOME": "Führe mich heim",
         "PLUGINS": "Plugins",
-        "BETA": "Wir sind auf beta! ",
+        "BETA": "Wir sind auf beta!",
         "ONE_ITEM_LINE": "Ein Eintrag pro Zeile...",
         "NEW_BULK": "Neue Massenerstellung",
         "RELATED_TASKS": "Verbundene Aufgaben",
         "LOGOUT": "Ausloggen",
         "EXTERNAL_USER": "ein externer Benutzer",
         "GENERIC_ERROR": "Eins unserer Helferlein sagt {{error}}.",
-        "IOCAINE_TEXT": "Fühlen Sie sich von einer Aufgabe etwas erdrückt? Stellen Sie sicher, dass andere davon erfahren, indem Sie auf Locaine klicken, wenn Sie eine Aufgabe ändern. Es ist möglich, gegen dieses (fiktive) tödliche Gift immun zu werden, indem man kleine Mengen über einen Zeitraum hinweg einnimmt. Genauso, wie es möglich ist, besser in dem zu werden, was man tut, indem man gelegentlich zusätzliche Herausforderungen annimmt! ",
+        "IOCAINE_TEXT": "Fühlen Sie sich von einer Aufgabe etwas erdrückt? Stellen Sie sicher, dass andere davon erfahren, indem Sie auf Locaine klicken, wenn Sie eine Aufgabe ändern. Es ist möglich, gegen dieses (fiktive) tödliche Gift immun zu werden, indem man kleine Mengen über einen Zeitraum hinweg einnimmt. Genauso, wie es möglich ist, besser in dem zu werden, was man tut, indem man gelegentlich zusätzliche Herausforderungen annimmt!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Achtung! SIe schreiben in Großbuchstaben und bei dieser Eingabe ist Groß- und Kleinschreibung zu beachten",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
-            "DEFAULT_MESSAGE": "Dieser Wert scheint ungültig zu sein. ",
+            "DEFAULT_MESSAGE": "Dieser Wert scheint ungültig zu sein.",
             "TYPE_EMAIL": "Dieser Wert sollte eine gültige E-Mail Adresse enthalten.",
-            "TYPE_URL": "Dieser Wert sollte eine gültige URL enthalten. ",
-            "TYPE_URLSTRICT": "Dieser Wert sollte eine gültige URL enthalten. ",
-            "TYPE_NUMBER": "Dieser Wert sollte eine gültige Nummer enthalten. ",
+            "TYPE_URL": "Dieser Wert sollte eine gültige URL enthalten.",
+            "TYPE_URLSTRICT": "Dieser Wert sollte eine gültige URL enthalten.",
+            "TYPE_NUMBER": "Dieser Wert sollte eine gültige Nummer enthalten.",
             "TYPE_DIGITS": "Dieser Wert sollte Ziffern enthalten.",
             "TYPE_DATEISO": "Dieser Wert sollte ein gültiges Datum sein (JJJJ-MM-TT)",
-            "TYPE_ALPHANUM": "Dieser Wert sollte alphanumersich sein. ",
+            "TYPE_ALPHANUM": "Dieser Wert sollte alphanumersich sein.",
             "TYPE_PHONE": "Dieser Wert sollte eine gültige Telefonnummer enthalten.",
-            "NOTNULL": "Dieser Wert darf nicht leer sein. ",
-            "NOT_BLANK": "Dieser Wert darf nicht leer bleiben. ",
+            "NOTNULL": "Dieser Wert darf nicht leer sein.",
+            "NOT_BLANK": "Dieser Wert darf nicht leer bleiben.",
             "REQUIRED": "Diese Angabe ist erforderlich",
-            "REGEXP": "Dieser Wert scheint ungültig zu sein. ",
+            "REGEXP": "Dieser Wert scheint ungültig zu sein.",
             "MIN": "Dieser Wert sollte größer oder gleich %s sein.",
             "MAX": "Dieser Wert sollte niedriger oder gleich %s sein.",
             "RANGE": "Der Wert sollte zwischen %s und %s liegen.",
@@ -65,14 +65,16 @@
             "MIN_CHECK": "Sie müssen mindestens %s auswählen.",
             "MAX_CHECK": "Wählen Sie %s oder weniger.",
             "RANGE_CHECK": "Wählen Sie zwischen  %s und %s",
-            "EQUAL_TO": "Dieser Wert sollte der gleiche sein."
+            "EQUAL_TO": "Dieser Wert sollte der gleiche sein.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
             "IS_RTL": "falsch",
             "FIRST_DAY_OF_WEEK": "1",
             "PREV_MONTH": "Vorheriger Monat",
-            "NEXT_MONTH": "Nächster Monat ",
+            "NEXT_MONTH": "Nächster Monat",
             "MONTHS": {
                 "JAN": "Januar",
                 "FEB": "Februar",
@@ -85,7 +87,7 @@
                 "SEP": "September",
                 "OCT": "Oktober",
                 "NOV": "November",
-                "DEC": "Diciember"
+                "DEC": "Dezember"
             },
             "WEEK_DAYS": {
                 "SUN": "Sonntag",
@@ -97,13 +99,13 @@
                 "SAT": "Samstag"
             },
             "WEEK_DAYS_SHORT": {
-                "SUN": "Son",
-                "MON": "Mon",
-                "TUE": "Die",
-                "WED": "Mit",
-                "THU": "Don",
-                "FRI": "Fre",
-                "SAT": "Sam"
+                "SUN": "So",
+                "MON": "Mo",
+                "TUE": "Di",
+                "WED": "Mi",
+                "THU": "Do",
+                "FRI": "Fr",
+                "SAT": "Sa"
             }
         },
         "SEE_USER_PROFILE": "Profil von {{username }} ansehen",
@@ -117,7 +119,7 @@
         },
         "DESCRIPTION": {
             "EMPTY": "Bitte geben Sie eine Beschreibung ein...",
-            "NO_DESCRIPTION": "Noch keine Beschreibung "
+            "NO_DESCRIPTION": "Noch keine Beschreibung"
         },
         "FIELDS": {
             "SUBJECT": "Thema",
@@ -144,13 +146,13 @@
         },
         "ASSIGNED_TO": {
             "NOT_ASSIGNED": "Nicht zugeordnet",
-            "ASSIGN": "Assign",
+            "ASSIGN": "Zuweisen",
             "DELETE_ASSIGNMENT": "Zuordnung löschen",
             "REMOVE_ASSIGNED": "Zugewiesene entfernen",
-            "TOO_MANY": "...zu viele Benutzer. Filtern Sie! ",
+            "TOO_MANY": "...zu viele Benutzer. Filtern Sie!",
             "CONFIRM_UNASSIGNED": "Möchten dies wirklich ohne eine Zuordnung verlassen?",
             "TITLE_ACTION_EDIT_ASSIGNMENT": "Zuordnungen bearbeiten",
-            "SELF": "Assign to me"
+            "SELF": "An mich zuweisen"
         },
         "STATUS": {
             "CLOSED": "Geschlossen",
@@ -184,7 +186,7 @@
             "SAVE": "Benutzerdefiniertes Feld speichern",
             "EDIT": "Benutzerdefiniertes Feld bearbeiten",
             "DELETE": "Benutzerattribut löschen",
-            "CONFIRM_DELETE": "Remeber that all values in this custom field will be deleted.\n Are you sure you want to continue?"
+            "CONFIRM_DELETE": "Alle Werte in benutzerdefinierten Feldern werden gelöscht.\n Sind Sie sicher, dass Sie fortfahren wollen?"
         },
         "FILTERS": {
             "TITLE": "Filter",
@@ -242,7 +244,7 @@
                 "NAME": "Aufgaben",
                 "VIEW_TASKS": "Aufgaben ansehen",
                 "ADD_TASKS": "Aufgaben hinzufügen",
-                "MODIFY_TASKS": "Aufgaben ändern ",
+                "MODIFY_TASKS": "Aufgaben ändern",
                 "DELETE_TASKS": "Aufgaben löschen"
             },
             "ISSUES": {
@@ -265,12 +267,12 @@
         },
         "META": {
             "PAGE_TITLE": "Taiga",
-            "PAGE_DESCRIPTION": "Taiga ist ein Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht. "
+            "PAGE_DESCRIPTION": "Taiga ist ein Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht."
         }
     },
     "LOGIN": {
         "PAGE_TITLE": "Login - Taiga",
-        "PAGE_DESCRIPTION": "Melden Sie sich bei Taiga an, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht. "
+        "PAGE_DESCRIPTION": "Melden Sie sich bei Taiga an, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht."
     },
     "AUTH": {
         "INVITED_YOU": "hat Sie zum Projekt eingeladen",
@@ -289,11 +291,11 @@
     },
     "LOGIN_FORM": {
         "ERROR_AUTH_INCORRECT": "Laut unseren Helferlein ist Dein Benutzername/Deine E-Mail-Adresse oder Dein Passwort nicht korrekt. (Bitte achte auf die Groß- und Kleinschreibung.)",
-        "SUCCESS": "Herzlich willkommen bei Taiga, unsere Helferlein freuen sich. "
+        "SUCCESS": "Herzlich willkommen bei Taiga, unsere Helferlein freuen sich."
     },
     "REGISTER": {
         "PAGE_TITLE": "Registrieren - Taiga",
-        "PAGE_DESCRIPTION": "Erstellee Dein Benutzerkonto in Taiga, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht. "
+        "PAGE_DESCRIPTION": "Erstelle Dein Benutzerkonto in Taiga, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht."
     },
     "REGISTER_FORM": {
         "TITLE": "Ein neues Taiga Benutzerkonto registrieren (kostenlos)",
@@ -311,12 +313,12 @@
     },
     "FORGOT_PASSWORD_FORM": {
         "TITLE": "Huch, hast Du Dein Passwort vergessen?",
-        "SUBTITLE": "Gib Deinen Benutzernamen oder Deine E-Mail-Adresse ein, um einen neuen zu erhalten. ",
+        "SUBTITLE": "Gib Deinen Benutzernamen oder Deine E-Mail-Adresse ein, um einen neuen zu erhalten.",
         "PLACEHOLDER_FIELD": "Benutzername oder E-Mail-Adresse",
         "ACTION_RESET_PASSWORD": "Passwort zurücksetzen",
-        "LINK_CANCEL": "Nein, bring mich zurück. Ich denke, ich erinnere mich daran. ",
-        "SUCCESS": "<strong>Sehen Sie in Ihren Posteingang!</strong><br />Wir haben Ihnen eine E-Mail mit einer Anleitung gesendet, um ein neues Passwort festzulegen.",
-        "ERROR": "Laut unseren Helferlein sind Sie bislang noch nicht registriert. "
+        "LINK_CANCEL": "Nein, bring mich zurück. Ich denke, ich erinnere mich daran.",
+        "SUCCESS": "<strong>Sehen Sie in Ihren Posteingang!</strong><br />Unsere Helferelein haben Ihnen eine E-Mail mit einer Anleitung gesendet, um ein neues Passwort festzulegen.",
+        "ERROR": "Laut unseren Helferlein sind Sie bislang noch nicht registriert."
     },
     "CHANGE_PASSWORD": {
         "PAGE_TITLE": "Ändere Dein Passwort - Taiga",
@@ -331,36 +333,36 @@
         "ERROR_PASSWORD_MATCH": "Die Passwörter stimmen nicht überein"
     },
     "CHANGE_PASSWORD_RECOVERY_FORM": {
-        "TITLE": "Erstellen Sie einen neuen Taiga Pass",
-        "SUBTITLE": "Und hey, es empfiehlt sich, mehr eisenreiche Nahrung zu sich zu nehmen - die ist gut für's Gehirn :P ",
+        "TITLE": "Erstellen Sie einen neues Passwort",
+        "SUBTITLE": "Und hey, es empfiehlt sich, mehr eisenreiche Nahrung zu sich zu nehmen - die ist gut für's Gehirn :P",
         "PLACEHOLDER_NEW_PASSWORD": "Neues Passwort",
-        "PLACEHOLDER_RE_TYPE_NEW_PASSWORD": "Wiederholen Sie die Eingabe des neuen Passworts ",
+        "PLACEHOLDER_RE_TYPE_NEW_PASSWORD": "Wiederholen Sie die Eingabe des neuen Passworts",
         "ACTION_RESET_PASSWORD": "Passwort zurücksetzen",
         "ERROR": "Unsere Helferelein haben Probleme deine Anfrage zum Zurücksetzen des Passworts zu finden. Probiere es einfach nochmal.",
         "SUCCESS": "Unsere Oompa Loompas haben das neue Passwort gespeichert.<br /> <strong>Hier</strong> gehts zum login."
     },
     "INVITATION": {
         "PAGE_TITLE": "Einladung Annahme - Taiga",
-        "PAGE_DESCRIPTION": "Nehmen Sie die Einladung an und treten Sie einem Projekt in Taiga bei, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht. "
+        "PAGE_DESCRIPTION": "Nehmen Sie die Einladung an und treten Sie einem Projekt in Taiga bei, einer Projekt-Management Plattform für Neugründer und agile Entwickler und Designer, die ein unkompliziertes und ansprechendes Tool möchten, das die Arbeit wirklich angenehm macht."
     },
     "INVITATION_LOGIN_FORM": {
         "NOT_FOUND": "Unsere Helferlein können deine Einladung nicht finden.",
         "SUCCESS": "Sie sind diesem Projekt erfolgreich beigetreten. Herzlich willkommen bei {{project_name}}",
-        "ERROR": "Laut unseren Helferlein sind Sie noch nicht registriert, oder Sie haben ein ungültiges Passwort eingegeben. "
+        "ERROR": "Laut unseren Helferlein sind Sie noch nicht registriert, oder Sie haben ein ungültiges Passwort eingegeben."
     },
     "HOME": {
         "PAGE_TITLE": "Home - Taiga",
-        "PAGE_DESCRIPTION": "Die Taiga Homepage mit Ihren wichtigsten Projekten und all Ihren zugeordneten und beobachteten User-Stories, Aufgaben und Tickets. ",
+        "PAGE_DESCRIPTION": "Die Taiga Homepage mit Ihren wichtigsten Projekten und all Ihren zugeordneten und beobachteten User-Stories, Aufgaben und Tickets.",
         "EMPTY_WORKING_ON": "<strong>Hier sieht’s ziemlich leer aus, oder?</strong> Beginne deine Arbeit mit Taiga und wir zeigen dir hier die Stories, Tasks und Issues an denen du arbeitest.",
-        "EMPTY_WATCHING": "<strong>Follow</strong> User Stories, Tasks, Issues in your projects and be notified about its changes :)",
+        "EMPTY_WATCHING": "<strong>Folge</strong> User Stories, Tasks, Issues in deinem Projekt und erhalte Benachrichtigungen, wenn sich etwas ändert. :)",
         "EMPTY_PROJECT_LIST": "Sie haben noch keine Projekte",
         "WORKING_ON_SECTION": "Zuletzt bearbeitet",
         "WATCHING_SECTION": "Beobachtet",
-        "DASHBOARD": "Projects Dashboard"
+        "DASHBOARD": "ProjeKte Dashboard"
     },
     "PROJECTS": {
         "PAGE_TITLE": "Meine Projekte - Taiga",
-        "PAGE_DESCRIPTION": "Eine Liste mit all Deinen Projekten. Du kannst sie ordnen oder ein Neues anlegen. ",
+        "PAGE_DESCRIPTION": "Eine Liste mit all Deinen Projekten. Du kannst sie ordnen oder ein Neues anlegen.",
         "MY_PROJECTS": "Meine Projekte"
     },
     "ATTACHMENT": {
@@ -372,8 +374,7 @@
         "DEPRECATED": "(verworfen)",
         "DEPRECATED_FILE": "Verworfen?",
         "ADD": "Neuen Anhang hinzufügen. {{maxFileSizeMsg}}",
-        "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Max. Größe: {{maxFileSize}}]",
+        "DROP": "Ziehe Anhänge hierher!",
         "SHOW_DEPRECATED": "+ verworfene Anhänge zeigen",
         "HIDE_DEPRECATED": "- verworfene Anhänge verbergen",
         "COUNT_DEPRECATED": "({{ counter }} verworfen)",
@@ -410,32 +411,32 @@
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportieren",
-            "SUBTITLE": "Exportieren Sie Ihr Projekt, um ein Backup durchzuführen, oder ein neues, darauf basierendes, zu erstellen. ",
+            "SUBTITLE": "Exportieren Sie Ihr Projekt, um ein Backup durchzuführen, oder ein neues, darauf basierendes, zu erstellen.",
             "EXPORT_BUTTON": "Exportieren",
             "EXPORT_BUTTON_TITLE": "Exportieren Sie Ihr Projekt",
             "LOADING_TITLE": "Wir erzeugen die Exportdatei",
-            "DUMP_READY": "Ihre Export-Datei ist fertig! ",
+            "DUMP_READY": "Ihre Export-Datei ist fertig!",
             "LOADING_MESSAGE": "Bitte lassen Sie diese Seite geöffnet!",
             "ASYNC_MESSAGE": "Wir werden nach Fertigstellung eine E-Mail senden.",
             "SYNC_MESSAGE": "Wenn der Download nicht automatisch startet, klicken Sie <a href='{{url}}' download title='Download the dump file'>hier</a>.",
             "ERROR": "Unsere Helferlein haben Probleme, Ihre Export-Datei zu erzeugen. Bitte versuchen Sie es erneut.",
-            "ERROR_BUSY": "Entschuldigung, unsere Helferlein sind zur Zeit sehr beschäftigt. Bitte versuchen Sie es in ein paar Minuten erneut. ",
-            "ERROR_MESSAGE": "Unsere Helferlein haben Probleme, Ihre Export-Datei zu erstellen: {{message}} "
+            "ERROR_BUSY": "Entschuldigung, unsere Helferlein sind zur Zeit sehr beschäftigt. Bitte versuchen Sie es in ein paar Minuten erneut.",
+            "ERROR_MESSAGE": "Unsere Helferlein haben Probleme, Ihre Export-Datei zu erstellen: {{message}}"
         },
         "MODULES": {
             "TITLE": "Module",
             "ENABLE": "Aktivieren",
             "DISABLE": "Deaktivieren",
             "BACKLOG": "Auftragsliste",
-            "BACKLOG_DESCRIPTION": "Verwalten Sie Ihre User-Stories, um einen organisierten Überblick der anstehenden und priorisierten Aufgaben zu erhalten.  ",
+            "BACKLOG_DESCRIPTION": "Verwalten Sie Ihre User-Stories, um einen organisierten Überblick der anstehenden und priorisierten Aufgaben zu erhalten.",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisieren Sie Ihr Projekt auf übersichtliche Art.",
             "ISSUES": "Tickets",
-            "ISSUES_DESCRIPTION": "Verfolgen Sie Fehler, Fragen und Verbesserungen, die mit Ihrem Projekt verbunden sind. Vermissen Sie nichts! ",
+            "ISSUES_DESCRIPTION": "Verfolgen Sie Fehler, Fragen und Verbesserungen, die mit Ihrem Projekt verbunden sind. Vermissen Sie nichts!",
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Fügen Sie Inhalte hinzu, ändern oder löschen Sie sie in Zusammenarbeit mit anderen. Dies ist der richtige Ort für Ihre Projektdokumentation.",
             "MEETUP": "Zusammentreffen",
-            "MEETUP_DESCRIPTION": "Wählen Sie Ihr Videokonferenzsystem. Auch Entwickler brauchen Kontakt von Angesicht zu Angesicht. ",
+            "MEETUP_DESCRIPTION": "Wählen Sie Ihr Videokonferenzsystem. Auch Entwickler brauchen Kontakt von Angesicht zu Angesicht.",
             "SELECT_VIDEOCONFERENCE": "Wählen Sie ein Videokonferenzsystem",
             "SALT_CHAT_ROOM": "Wenn Sie möchten, können Sie einen Salt Code zum Namen des Chatrooms hinzufügen",
             "JITSI_CHAT_ROOM": "Jitsi",
@@ -457,28 +458,26 @@
             "RECRUITING_MESSAGE": "Who are you looking for?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Öffentliches Projekt",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Privates Projekt",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
-            "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
+            "PRIVATE_OR_PUBLIC": "Was ist der Unterschied zwischen öffentlichen und privaten Projekten?",
             "DELETE": "Dieses Projekt löschen",
-            "LOGO_HELP": "The image will be scaled to 80x80px.",
-            "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "LOGO_HELP": "Das Bild wird auf 80x80px skaliert.",
+            "CHANGE_LOGO": "Logo ändern",
+            "ACTION_USE_DEFAULT_LOGO": "Nutze Standardbild"
         },
         "REPORTS": {
             "TITLE": "Berichte",
-            "SUBTITLE": "Exportieren Sie Ihre Projektdaten in CSV Format und erstellen Sie Ihre eigenen Berichte. ",
+            "SUBTITLE": "Exportieren Sie Ihre Projektdaten in CSV Format und erstellen Sie Ihre eigenen Berichte.",
             "DESCRIPTION": "Laden Sie eine CSV-Datei herunter oder kopieren Sie die generierte URL und öffnen Sie sie in Ihrem Lieblingstexteditor oder Tabellenkalkulationsprogramm um Ihre eigenen Projektdaten Berichte zu erstellen. So können Sie Ihre Daten einfach visualisieren und analysieren.",
             "HELP": "Wie kann ich dies in meiner eigenen Tabellenkalkulation nutzen?",
             "REGENERATE_TITLE": "Die URL ändern",
             "REGENERATE_SUBTITLE": "Sie sind im Begriff, die CSV data access URL zu ändern. Die vorherige URL wird deaktiviert. Sind Sie sicher?"
         },
         "CSV": {
-            "SECTION_TITLE_US": "User-Stories Berichte ",
+            "SECTION_TITLE_US": "User-Stories Berichte",
             "SECTION_TITLE_TASK": "Aufgabenberichte",
-            "SECTION_TITLE_ISSUE": "Ticket Berichte ",
-            "DOWNLOAD": "CSV herunterladen ",
+            "SECTION_TITLE_ISSUE": "Ticket Berichte",
+            "DOWNLOAD": "CSV herunterladen",
             "URL_FIELD_PLACEHOLDER": "Bitte erstellen Sie die CSV URL neu",
             "TITLE_REGENERATE_URL": "Erstellen Sie die CSV URL neu",
             "ACTION_GENERATE_URL": "URL erzeugen",
@@ -486,16 +485,17 @@
         },
         "CUSTOM_FIELDS": {
             "TITLE": "Benutzerfelder",
-            "SUBTITLE": "Spezifizieren Sie die Benutzerfelder für Ihre User-Stories, Aufgaben und Tickets. ",
+            "SUBTITLE": "Spezifizieren Sie die Benutzerfelder für Ihre User-Stories, Aufgaben und Tickets.",
             "US_DESCRIPTION": "Benutzerdefinierte Felder der User-Story",
             "US_ADD": "Benutzerdefiniertes Feld bei User-Stories hinzufügen",
             "TASK_DESCRIPTION": "Aufgaben benutzerdefinierte Felder",
             "TASK_ADD": "Fügen Sie ein benutzerdefiniertes Feld bei Aufgaben hinzu",
             "ISSUE_DESCRIPTION": "Tickets benutzerdefinierte Felder",
-            "ISSUE_ADD": "Fügen Sie den Tickets ein benutzerdefiniertes Feld hinzu ",
+            "ISSUE_ADD": "Fügen Sie den Tickets ein benutzerdefiniertes Feld hinzu",
             "FIELD_TYPE_TEXT": "Text",
             "FIELD_TYPE_MULTI": "Mehrzeilig",
-            "FIELD_TYPE_DATE": "Datum"
+            "FIELD_TYPE_DATE": "Datum",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Projekt Werte - {{projectName}}",
@@ -522,7 +522,7 @@
         },
         "PROJECT_VALUES_STATUS": {
             "TITLE": "Status",
-            "SUBTITLE": "Spezifizieren Sie die Status, die Ihre User-Stories, Aufgaben und Tickets durchlaufen werden. ",
+            "SUBTITLE": "Spezifizieren Sie die Status, die Ihre User-Stories, Aufgaben und Tickets durchlaufen werden.",
             "US_TITLE": "User-Story Status",
             "TASK_TITLE": "Aufgaben-Status",
             "ISSUE_TITLE": "Ticket-Status"
@@ -535,21 +535,21 @@
         },
         "ROLES": {
             "PAGE_TITLE": "Rollen - {{projectName}}",
-            "WARNING_NO_ROLE": "Beachten Sie, keine Rolle in Ihrem Projekt wird in der Lage sein, die Punktevergabe für User-Stories einzuschätzen. ",
-            "HELP_ROLE_ENABLED": "Wenn Sie dies freischalten, werden Mitglieder, denen diese Rolle zugewiesen ist, in der Lage sein, die Punktevergabe für User-Stories vorzunehmen. ",
+            "WARNING_NO_ROLE": "Beachten Sie, keine Rolle in Ihrem Projekt wird in der Lage sein, die Punktevergabe für User-Stories einzuschätzen.",
+            "HELP_ROLE_ENABLED": "Wenn Sie dies freischalten, werden Mitglieder, denen diese Rolle zugewiesen ist, in der Lage sein, die Punktevergabe für User-Stories vorzunehmen.",
             "DISABLE_COMPUTABLE_ALERT_TITLE": "Deaktiviere Estimatepoints für diese Rolle",
             "DISABLE_COMPUTABLE_ALERT_SUBTITLE": "Wenn du die Estimatepoints für die Rolle {{roleName}} deaktivierst, werden alle bisherigen gelöscht",
             "DISABLE_COMPUTABLE_ALERT_MESSAGE": "<strong>Bist du sicher, dass in dieser Rolle Estimatepoints deaktivieren möchtest?</strong>",
             "COUNT_MEMBERS": "{{ role.members_count }} Mitglieder mit dieser Rolle",
             "TITLE_DELETE_ROLE": "Rolle löschen",
-            "REPLACEMENT_ROLE": "Alle Benutzer mit dieser Rolle werden verschoben nach ",
-            "WARNING_DELETE_ROLE": "<strong>Vorsicht, alle Rollen Bewertungen werden entfernt</strong>",
+            "REPLACEMENT_ROLE": "Alle Benutzer mit dieser Rolle werden verschoben nach",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Sie können nicht alle Werte löschen",
             "EXTERNAL_USER": "Externer Benutzer"
         },
         "THIRD_PARTIES": {
             "SECRET_KEY": "Geheimschlüssel",
-            "PAYLOAD_URL": "Payload URL ",
+            "PAYLOAD_URL": "Payload URL",
             "VALID_IPS": "Gültige Quell-IPs (getrennt von ,)"
         },
         "BITBUCKET": {
@@ -574,7 +574,7 @@
             "TYPE_NAME": "Servicename...",
             "TYPE_PAYLOAD_URL": "Geben Sie die Service Payload URL ein",
             "TYPE_SERVICE_SECRET": "Sicherheitsschlüssel...",
-            "SAVE": "Webhook sichern ",
+            "SAVE": "Webhook sichern",
             "CANCEL": "Webhook beenden",
             "SHOW_HISTORY": "(Chronik anzeigen)",
             "TEST": "Webhook Test",
@@ -615,18 +615,18 @@
             "DELETE_MEMBER": "Mitglied löschen",
             "RESEND": "Neu&nbsp;senden",
             "SUCCESS_SEND_INVITATION": "Wir haben die Einladung erneut versandt an '{{email}}'.",
-            "ERROR_SEND_INVITATION": "Wir haben die Einladung nicht versandt. ",
+            "ERROR_SEND_INVITATION": "Wir haben die Einladung nicht versandt.",
             "SUCCESS_DELETE": "Gelöscht {{message}}.",
             "ERROR_DELETE": "Das Löschen ist fehlgeschlagen {{message}}.",
             "DEFAULT_DELETE_MESSAGE": "die Einladung an {{email}}"
         },
         "DEFAULT_VALUES": {
             "LABEL_POINTS": "Vorgegebener Wert für Punkteauswahl",
-            "LABEL_US": "Vorgegebener Wert für User-Story-Status Auswahl ",
+            "LABEL_US": "Vorgegebener Wert für User-Story-Status Auswahl",
             "LABEL_TASK_STATUS": "Vorgegebene Auswahl für den Aufgaben-Status",
             "LABEL_PRIORITY": "Vorgegebener Wert für Prioritätsauswahl",
             "LABEL_SEVERITY": "Vorgegebener Wert für Gewichtungsauswahl",
-            "LABEL_ISSUE_TYPE": "Vorgegebener Wert für Ticketartauswahl ",
+            "LABEL_ISSUE_TYPE": "Vorgegebener Wert für Ticketartauswahl",
             "LABEL_ISSUE_STATUS": "Vorgegebene Auswahl für den Ticket-Status"
         },
         "STATUS": {
@@ -642,7 +642,7 @@
             "PLACEHOLDER_WRITE_NAME": "Benennen Sie den neuen Status"
         },
         "MENU": {
-            "TITLE": "Administrator ",
+            "TITLE": "Administrator",
             "PROJECT": "Projekt",
             "ATTRIBUTES": "Attribute",
             "MEMBERS": "Mitglieder",
@@ -683,11 +683,11 @@
             "PROJECTS_EMPTY": "{{username}} besitzt noch keine Projekte",
             "CONTACTS": "Kontakte",
             "CONTACTS_EMPTY": "{{username}} hat noch keine Kontakte",
-            "CURRENT_USER_CONTACTS_EMPTY": "Sie haben noch keine Kontakte ",
-            "CURRENT_USER_CONTACTS_EMPTY_EXPLAIN": "Die Leute, mit denen Sie auf Taiga zusammenarbeiten, werden automatisch zu Ihren Kontakten ",
-            "REPORT": "Missbrauch melden ",
+            "CURRENT_USER_CONTACTS_EMPTY": "Sie haben noch keine Kontakte",
+            "CURRENT_USER_CONTACTS_EMPTY_EXPLAIN": "Die Leute, mit denen Sie auf Taiga zusammenarbeiten, werden automatisch zu Ihren Kontakten",
+            "REPORT": "Missbrauch melden",
             "TABS": {
-                "ACTIVITY_TAB": "Zeitlinie ",
+                "ACTIVITY_TAB": "Zeitlinie",
                 "ACTIVITY_TAB_TITLE": "Alle Aktivitäten dieses Benutzers anzeigen",
                 "PROJECTS_TAB": "Projekte",
                 "PROJECTS_TAB_TITLE": "Liste alle Projekte auf, bei denen der Benutzer Mitglied ist",
@@ -704,7 +704,7 @@
         "PROFILE_SIDEBAR": {
             "TITLE": "Dein Profil",
             "DESCRIPTION": "Da andere Mitglieder sehen, dass sie ebenfalls an einem Projekt arbeiten wäre es schön, wenn Sie ein paar Informationen zu Ihrer Person angeben.",
-            "ADD_INFO": "Bio bearbeiten"
+            "ADD_INFO": "Biographie bearbeiten"
         },
         "PROFILE_FAVS": {
             "FILTER_INPUT_PLACEHOLDER": "Geben sie etwas ein...",
@@ -727,19 +727,19 @@
         "SECTION_PROJECTS": "Projekte",
         "HELP": "Sortieren Sie Ihre Projekte nach Wichtigkeit.<br/> Die ersten 10 Projekte erscheinen prominent in der Projektliste der Navigationsleiste.",
         "PRIVATE": "Privates Projekt",
-        "LOOKING_FOR_PEOPLE": "This project is looking for people",
-        "FANS_COUNTER_TITLE": "{total, plural, one{ein Fan} other{# Fans}}",
-        "WATCHERS_COUNTER_TITLE": "{total, plural, one{ein Beobachter} other{# Beobachter}}",
-        "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "LOOKING_FOR_PEOPLE": "Dieses Projekt sucht nach Mitarbeitern",
+        "FANS_COUNTER_TITLE": "{total, plural, one{ein Fan} andere{# Fans}}",
+        "WATCHERS_COUNTER_TITLE": "{total, plural, one{ein Beobachter} andere{# Beobachter}}",
+        "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} andere{# members}}",
         "STATS": {
             "PROJECT": "Projekt<br/> Punkte",
             "DEFINED": "definierte<br/> Punkte",
             "ASSIGNED": "zugewiesene<br/> Punkte",
-            "CLOSED": "geschlossen<br/> Punkte"
+            "CLOSED": "geschlossene<br/> Punkte"
         },
         "SECTION": {
             "SEARCH": "Suche",
-            "TIMELINE": "Zeitlinie ",
+            "TIMELINE": "Zeitlinie",
             "BACKLOG": "Auftragsliste",
             "KANBAN": "Kanban",
             "ISSUES": "Tickets",
@@ -753,7 +753,7 @@
             "PLACEHOLDER_SEARCH": "Suchen...",
             "ACTION_CREATE_PROJECT": "Projekt anlegen",
             "ACTION_IMPORT_PROJECT": "Projekt importieren",
-            "MANAGE_PROJECTS": "Manage projects",
+            "MANAGE_PROJECTS": "Projekte verwalten",
             "TITLE_CREATE_PROJECT": "Projekt anlegen",
             "TITLE_IMPORT_PROJECT": "Projekt importieren",
             "TITLE_PRVIOUS_PROJECT": "Frühere Projekte anzeigen",
@@ -771,7 +771,7 @@
             "SETTINGS": "Einstellungen",
             "VIEW_PROFILE_TITLE": "Profil ansehen",
             "VIEW_PROFILE": "Profil ansehen",
-            "EDIT_PROFILE_TITLE": "Bearbeiten Sie Ihr Profil ",
+            "EDIT_PROFILE_TITLE": "Bearbeiten Sie Ihr Profil",
             "EDIT_PROFILE": "Profil bearbeiten",
             "CHANGE_PASSWORD_TITLE": "Passwort ändern",
             "CHANGE_PASSWORD": "Passwort ändern",
@@ -787,8 +787,8 @@
             "ASYNC_IN_PROGRESS_TITLE": "Unsere Helferlein importieren Ihr Projekt",
             "ASYNC_IN_PROGRESS_MESSAGE": "Dieser Vorgang könnte ein paar Minuten benötigen <br/> Nach Fertigstellung benachrichtigen wir Sie per E-Mail.",
             "UPLOAD_IN_PROGRESS_MESSAGE": "Hochgeladen {{uploadedSize}} von {{totalSize}}",
-            "ERROR": "Unsere Helferlein haben Probleme beim Importieren Ihrer Daten. Bitte versuchen Sie es erneut. ",
-            "ERROR_TOO_MANY_REQUEST": "Entschuldigung, unsere Helferlein sind derzeit sehr beschäftigt. Bitte versuchen Sie es in ein paar Minuten erneut. ",
+            "ERROR": "Unsere Helferlein haben Probleme beim Importieren Ihrer Daten. Bitte versuchen Sie es erneut.",
+            "ERROR_TOO_MANY_REQUEST": "Entschuldigung, unsere Helferlein sind derzeit sehr beschäftigt. Bitte versuchen Sie es in ein paar Minuten erneut.",
             "ERROR_MESSAGE": "Unsere Helferlein haben Probleme beim Importieren Ihrer Datei: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) ist zu schwierig für unsere Helferlein, versuchen Sie es bitte mit einer kleineren Datei als ({{maxFileSize}})",
             "SYNC_SUCCESS": "Ihr Projekt wurde erfolgreich importiert"
@@ -888,7 +888,7 @@
         "TOTAL_POINTS": "Gesamtpunkte",
         "ADD": "+ Neue User-Story anlegen",
         "ADD_BULK": "Mehrere neue User-Stories hinzufügen",
-        "PROMOTED": "Diese User-Story entstand aus Ticket: ",
+        "PROMOTED": "Diese User-Story entstand aus Ticket:",
         "TITLE_LINK_GO_TO_ISSUE": "Zum Ticket wechseln",
         "EXTERNAL_REFERENCE": "Dies User-Story wurde angelegt von",
         "GO_TO_EXTERNAL_REFERENCE": "Zur Quelle wechseln",
@@ -903,7 +903,7 @@
         "TOTAL_US_POINTS": "User-Story-Punkte insgesamt",
         "FIELDS": {
             "TEAM_REQUIREMENT": "Team Anforderung",
-            "CLIENT_REQUIREMENT": "Kundenanforderung ",
+            "CLIENT_REQUIREMENT": "Kundenanforderung",
             "FINISH_DATE": "Endtermin"
         }
     },
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Geben Sie hier einen neuen Kommentar ein",
         "SHOW_DELETED": "Gelöschten Kommentar anzeigen",
         "HIDE_DELETED": "Gelöschten Kommentar ausblenden",
-        "DELETE": "Delete comment",
+        "DELETE": "Kommentar löschen",
         "RESTORE": "Kommentar wiederherstellen"
     },
     "ACTIVITY": {
@@ -928,7 +928,7 @@
         "NEW_ATTACHMENT": "Neuer Anhang",
         "DELETED_ATTACHMENT": "Gelöschter Anhang",
         "UPDATED_ATTACHMENT": "aktualisierter Anhang {{filename}}",
-        "DELETED_CUSTOM_ATTRIBUTE": "gelöschtes Kundenattribut ",
+        "DELETED_CUSTOM_ATTRIBUTE": "gelöschtes Kundenattribut",
         "SIZE_CHANGE": "Machte {size, plural, one{eine Änderung} other{# Änderungen}}",
         "VALUES": {
             "YES": "ja",
@@ -950,14 +950,14 @@
             "ASSIGNED_TO": "zugewiesen an",
             "WATCHERS": "Beobachter",
             "MILESTONE": "Sprint",
-            "USER_STORY": "User-Story ",
+            "USER_STORY": "User-Story",
             "PROJECT": "Projekt",
             "IS_BLOCKED": "wird blockiert",
             "BLOCKED_NOTE": "Blockierungsgrund",
             "POINTS": "Punkte",
-            "CLIENT_REQUIREMENT": "Kunden Anforderung ",
-            "TEAM_REQUIREMENT": "Team Anforderung ",
-            "IS_IOCAINE": "ist Iocaine ",
+            "CLIENT_REQUIREMENT": "Kunden Anforderung",
+            "TEAM_REQUIREMENT": "Team Anforderung",
+            "IS_IOCAINE": "ist Iocaine",
             "TAGS": "Schlagwörter",
             "ATTACHMENTS": "Anhänge",
             "IS_DEPRECATED": "ist veraltet",
@@ -975,7 +975,7 @@
         "SECTION_NAME": "Auftragsliste",
         "CUSTOMIZE_GRAPH": "Personalisiere deinen Backloggraph",
         "CUSTOMIZE_GRAPH_TEXT": "Um schöne Graphen, die Dir bei der Entwicklung Deines Projekts helfen, zu sehen, musst du Estimatepoints und Sprints einstellen",
-        "CUSTOMIZE_GRAPH_ADMIN": "Administrator ",
+        "CUSTOMIZE_GRAPH_ADMIN": "Administrator",
         "CUSTOMIZE_GRAPH_TITLE": "Stelle Points und Sprints über das Adminpanel ein",
         "MOVE_US_TO_CURRENT_SPRINT": "Zum aktuellen Sprint wechseln",
         "MOVE_US_TO_LATEST_SPRINT": "Move to latest Sprint",
@@ -985,14 +985,14 @@
         "CREATE_NEW_US": "Eine neue User-Story anlegen",
         "CREATE_NEW_US_EMPTY_HELP": "Sie sollten eine User-Story anlegen",
         "EXCESS_OF_POINTS": "Punkte Überschuss",
-        "PENDING_POINTS": "Unerledigte Punkte ",
+        "PENDING_POINTS": "Unerledigte Punkte",
         "CLOSED_POINTS": "geschlossen",
-        "COMPACT_SPRINT": "Kompakt Sprint ",
+        "COMPACT_SPRINT": "Kompakt Sprint",
         "GO_TO_TASKBOARD": "Gehen Sie zum Taskboard von {{::name}}",
         "EDIT_SPRINT": "Sprint bearbeiten",
         "TOTAL_POINTS": "insgesamt",
         "STATUS_NAME": "Status Bezeichnung",
-        "SORTABLE_FILTER_ERROR": "Es ist kein Drag & Drop über dem Backlog möglich wenn Filter geöffnet sind.",
+        "SORTABLE_FILTER_ERROR": "Es ist kein Drag & Drop über dem Backlog möglich, wenn Filter geöffnet sind.",
         "DOOMLINE": "Projekt Umfang [Doomline]",
         "CHART": {
             "XAXIS_LABEL": "Sprints",
@@ -1027,7 +1027,7 @@
             "POINTS_PER_SPRINT": "Punkte /<br />Sprint"
         },
         "FILTERS": {
-            "TOGGLE": "Filter sichtbar schalten ",
+            "TOGGLE": "Filter sichtbar schalten",
             "TITLE": "Filter",
             "REMOVE": "Filter entfernen",
             "HIDE": "Filter verbergen",
@@ -1037,13 +1037,13 @@
         },
         "SPRINTS": {
             "TITLE": "SPRINTS",
-            "DATE": "DD MMM YYYY",
+            "DATE": "TT MMM JJJJ",
             "LINK_TASKBOARD": "Sprint Taskboard",
             "TITLE_LINK_TASKBOARD": "Gehe zu Taskboard von \"{{name}}\"",
             "NUMBER_SPRINTS": "<br/>Sprints",
             "EMPTY": "Derzeit sind keine Sprints vorhanden",
-            "WARNING_EMPTY_SPRINT_ANONYMOUS": "This sprint has no User Stories",
-            "WARNING_EMPTY_SPRINT": "Ziehe Stories aus deiner Auftragsliste her um einen neuen Sprint zu starten",
+            "WARNING_EMPTY_SPRINT_ANONYMOUS": "Dieser Sprint enthält keiner User Stories",
+            "WARNING_EMPTY_SPRINT": "Ziehe Stories aus deiner Auftragsliste her, um einen neuen Sprint zu starten",
             "TITLE_ACTION_NEW_SPRINT": "Neuen Sprint hinzufügen",
             "TEXT_ACTION_NEW_SPRINT": "Du möchtest einen neuen Sprint in Deinem Projekt erstellen",
             "ACTION_SHOW_CLOSED_SPRINTS": "Geschlossene Sprints anzeigen",
@@ -1053,7 +1053,7 @@
     "ERROR": {
         "TEXT1": "Es gibt ein Problem und unsere Helferlein arbeiten schon daran!",
         "NOT_FOUND": "Nicht gefunden",
-        "NOT_FOUND_TEXT": "Fehler 404. Die angeforderte Seite existiert nicht mehr. Möglicherweise finden Sie das Gesuchte, wenn Sie zur TAIGA Homepage zurückkehren. ",
+        "NOT_FOUND_TEXT": "Fehler 404. Die angeforderte Seite existiert nicht mehr. Möglicherweise finden Sie das Gesuchte, wenn Sie zur TAIGA Homepage zurückkehren.",
         "PERMISSION_DENIED": "Berechtigung verweigert",
         "PERMISSION_DENIED_TEXT": "Sie haben nicht die Berechtigung um auf diese Seite zuzugreifen",
         "VERSION_ERROR": "Jemand anderes hat dies schon geändert und unsere Helferlein können Ihre Änderungen deshalb nicht übernehmen. Bitte laden Sie die Seite neu und machen Sie die Änderungen erneut (die aktuelle Eingabe geht dabei verloren)."
@@ -1093,9 +1093,9 @@
         "TITLE_LINK_TASKBOARD": "Zu Taskboard wechseln",
         "PLACEHOLDER_SUBJECT": "Betreff...",
         "TITLE_SELECT_STATUS": "Status Bezeichnung",
-        "OWNER_US": "Diese Aufgabe gehört zu ",
+        "OWNER_US": "Diese Aufgabe gehört zu",
         "TITLE_LINK_GO_OWNER": "Zur User-Story wechseln",
-        "ORIGIN_US": "Diese Aufgabe wurde erstellt durch ",
+        "ORIGIN_US": "Diese Aufgabe wurde erstellt durch",
         "TITLE_LINK_GO_ORIGIN": "Zu User-Story wechseln",
         "BLOCKED": "Diese Aufgabe wird blockiert",
         "PREVIOUS": "vorherige Aufgabe",
@@ -1113,7 +1113,7 @@
     "NOTIFICATION": {
         "OK": "Alles in Ordnung",
         "WARNING": "Huch, es gibt ein Problem...",
-        "WARNING_TEXT": "Unsere Helferlein bedauern, Ihre Änderungen wurden nicht gespeichert! ",
+        "WARNING_TEXT": "Unsere Helferlein bedauern, Ihre Änderungen wurden nicht gespeichert!",
         "SAVED": "Die Helferlein haben Ihre Änderungen gespeichert!",
         "CLOSE": "Benachrichtigung schließen",
         "MAIL": "Benachrichtigungen per Mail",
@@ -1123,12 +1123,12 @@
         "TITLE": "Ihr Benutzerkonto löschen",
         "SUBTITLE": "Wir bedauern, dass Sie die Taiga verlassen. Wir hoffen, Sie hatten einen angenehmen Aufenthalt. :)",
         "PLACEHOLDER_INPUT_TOKEN": "Benutzerkonto Token ungültig machen",
-        "ACTION_LEAVING": "Ja, ich gehe! ",
-        "SUCCESS": "Unsere Helferlein haben Ihr Benutzerkonto entfernt. "
+        "ACTION_LEAVING": "Ja, ich gehe!",
+        "SUCCESS": "Unsere Helferlein haben Ihr Benutzerkonto entfernt."
     },
     "CHANGE_EMAIL_FORM": {
         "TITLE": "Ändern Sie Ihre E-Mail",
-        "SUBTITLE": "Noch ein Klick und Ihre E-Mail wird aktualisiert! ",
+        "SUBTITLE": "Noch ein Klick und Ihre E-Mail wird aktualisiert!",
         "PLACEHOLDER_INPUT_TOKEN": "E-Mail-Token ändern",
         "ACTION_CHANGE_EMAIL": "E-Mail ändern",
         "SUCCESS": "Unsere Helferlein haben Ihre E-Mail-Adresse aktualisiert"
@@ -1138,14 +1138,14 @@
         "PAGE_DESCRIPTION": "Das Ticket-Listen Panel des Projekts {{projectName}}: {{projectDescription}}",
         "LIST_SECTION_NAME": "Tickets",
         "SECTION_NAME": "Ticket Details",
-        "ACTION_NEW_ISSUE": "+ NEUES TICKET ",
+        "ACTION_NEW_ISSUE": "+ NEUES TICKET",
         "ACTION_PROMOTE_TO_US": "Zur User-Story aufwerten",
         "PLACEHOLDER_FILTER_NAME": "Benennen Sie den Filter und drücken Sie die Eingabetaste",
         "PROMOTED": "Dieses Ticket wurde aufgewertet zu User-Story:",
-        "EXTERNAL_REFERENCE": "Dieses Ticket wurde erstellt durch ",
+        "EXTERNAL_REFERENCE": "Dieses Ticket wurde erstellt durch",
         "GO_TO_EXTERNAL_REFERENCE": "Zur Quelle wechseln",
         "BLOCKED": "Dieses Ticket wird blockiert",
-        "TITLE_PREVIOUS_ISSUE": "vorheriges Ticket ",
+        "TITLE_PREVIOUS_ISSUE": "vorheriges Ticket",
         "TITLE_NEXT_ISSUE": "nächstes Ticket",
         "ACTION_DELETE": "Ticket löschen",
         "LIGHTBOX_TITLE_BLOKING_ISSUE": "Blockierendes Ticket",
@@ -1192,7 +1192,7 @@
                 "ASSIGNED_TO": "Zugeordnet"
             },
             "TITLE_ACTION_CHANGE_STATUS": "Status wechseln",
-            "TITLE_ACTION_ASSIGNED_TO": "Zugeordnet zu ",
+            "TITLE_ACTION_ASSIGNED_TO": "Zugeordnet zu",
             "BLOCKED": "Blockiert",
             "EMPTY": {
                 "TITLE": "Es gibt keine Probleme zu berichten :-)",
@@ -1216,9 +1216,9 @@
         "TITLE_ACTION_ADD_BULK": "Neue Menge hinzufügen",
         "ACTION_SHOW_ARCHIVED": "Archivierte anzeigen",
         "ACTION_HIDE_ARCHIVED": "Archivierte verbergen",
-        "HIDDEN_USER_STORIES": "Die User-Stories in diesem Status werden automatisch verborgen ",
+        "HIDDEN_USER_STORIES": "Die User-Stories in diesem Status werden automatisch verborgen",
         "ARCHIVED": "Sie haben es archiviert",
-        "UNDO_ARCHIVED": "Wiederholen Sie Drag & Drop zum Rückgängigmachen ",
+        "UNDO_ARCHIVED": "Wiederholen Sie Drag & Drop zum Rückgängigmachen",
         "PLACEHOLDER_CARD_TITLE": "Dies sind deine User Stories",
         "PLACEHOLDER_CARD_TEXT": "Stories können Unteraufgaben für weitere Anforderungen haben"
     },
@@ -1231,7 +1231,7 @@
         "FILTER_WIKI": "Wiki Seiten",
         "PLACEHOLDER_SEARCH": "Suchen in...",
         "TITLE_ACTION_SEARCH": "suchen",
-        "EMPTY_TITLE": "Es sieht so aus, als könnte unter Ihren Suchkriterien nichts gefunden werden. ",
+        "EMPTY_TITLE": "Es sieht so aus, als könnte unter Ihren Suchkriterien nichts gefunden werden.",
         "EMPTY_DESCRIPTION": "Vielleicht versuchen Sie es mit einem der oberen Reiter, oder Sie suchen erneut"
     },
     "TEAM": {
@@ -1242,12 +1242,12 @@
         "PLACEHOLDER_INPUT_SEARCH": "Unter Anzeigenamen suchen...",
         "COLUMN_MR_WOLF": "Herr Wolf",
         "EXPLANATION_COLUMN_MR_WOLF": "Geschlossene Tickets",
-        "COLUMN_IOCAINE": "Locaine Trinker ",
-        "EXPLANATION_COLUMN_IOCAINE": "Locaine Dosen eingenommen ",
+        "COLUMN_IOCAINE": "Locaine Trinker",
+        "EXPLANATION_COLUMN_IOCAINE": "Locaine Dosen eingenommen",
         "COLUMN_CERVANTES": "Cervantes",
         "EXPLANATION_COLUMN_CERVANTES": "Wiki Seiten geändert",
         "COLUMN_BUG_HUNTER": "Bug-Jäger",
-        "EXPLANATION_COLUMN_BUG_HUNTER": "Gemeldete Tickets ",
+        "EXPLANATION_COLUMN_BUG_HUNTER": "Gemeldete Tickets",
         "COLUMN_NIGHT_SHIFT": "Nachtschicht",
         "EXPLANATION_COLUMN_NIGHT_SHIFT": "Aufgaben geschlossen",
         "COLUMN_TOTAL_POWER": "Gesamtleistung",
@@ -1263,13 +1263,13 @@
             "SECTION_TITLE": "Benutzereinstellungen",
             "USER_PROFILE": "Benutzerprofil",
             "CHANGE_PASSWORD": "Passwort ändern",
-            "EMAIL_NOTIFICATIONS": "E-Mail Benachrichtigungen "
+            "EMAIL_NOTIFICATIONS": "E-Mail Benachrichtigungen"
         },
         "NOTIFICATIONS": {
             "SECTION_NAME": "E-Mail-Benachrichtigungen",
             "COLUMN_PROJECT": "Projekt",
             "COLUMN_RECEIVE_ALL": "Alle erhalten",
-            "COLUMN_ONLY_INVOLVED": "Nur Einbezogene ",
+            "COLUMN_ONLY_INVOLVED": "Nur Einbezogene",
             "COLUMN_NO_NOTIFICATIONS": "Keine Benachrichtigungen",
             "OPTION_ALL": "Alle",
             "OPTION_INVOLVED": "Beteiligt",
@@ -1280,7 +1280,7 @@
             "CHANGE_PASSWORD": "Passwort ändern",
             "NOTIFICATIONS": "Benachrichtigungen",
             "FEEDBACK": "Feedback",
-            "TITLE_AVATAR": "Benutzereinstellungen "
+            "TITLE_AVATAR": "Benutzereinstellungen"
         }
     },
     "USER_PROFILE": {
@@ -1307,15 +1307,15 @@
         "SECTION_TITLE_CHOOSE_TEMPLATE": "Wählen Sie ein Template",
         "CHOOSE_TEMPLATE_TEXT": "Welches Template würde besser zu Ihrem Projekt passen?",
         "SECTION_TITLE_CREATE_PROJECT": "Projekt erstellen",
-        "CREATE_PROJECT_TEXT": "Frisch und sauber. Wie aufregend! ",
-        "PROGRESS_TEMPLATE_SELECTION": "Template Auswahl ",
+        "CREATE_PROJECT_TEXT": "Frisch und sauber. Wie aufregend!",
+        "PROGRESS_TEMPLATE_SELECTION": "Template Auswahl",
         "PROGRESS_NAME_DESCRIPTION": "Name und Beschreibung"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
         "PAGE_DESCRIPTION": "Letzte Bearbeitung am {{lastModifiedDate}} ({{totalEditions}} Gesamtzahl der Bearbeitungen) Inhalt: {{ wikiPageContent }}",
-        "DATETIME": "DD MMM YYYY HH:mm",
-        "PLACEHOLDER_PAGE": "Schreiben Sie Ihre Wiki Seite ",
+        "DATETIME": "TT MMM JJJJ hh:mm",
+        "PLACEHOLDER_PAGE": "Schreiben Sie Ihre Wiki Seite",
         "REMOVE": "Diese Wiki Seite entfernen",
         "DELETE_LIGHTBOX_TITLE": "Wiki Seite löschen",
         "NAVIGATION": {
@@ -1330,21 +1330,21 @@
     },
     "HINTS": {
         "SECTION_NAME": "Hinweis",
-        "LINK": "Mehr dazu auf unserer Support Seite ",
+        "LINK": "Mehr dazu auf unserer Support Seite",
         "LINK_TITLE": "Besuchen Sie unsere Support Seite",
         "HINT1_TITLE": "Wussten Sie, dass Sie Projekte importieren und exportieren?",
         "HINT1_TEXT": "Dies erlaubt Ihnen, alle Ihre Daten zu extrahieren und sie von einer Taiga zur nächsten zu transportieren",
         "HINT2_TITLE": "Wussten Sie, dass Sie benutzerdefinierte Felder erstellen können?",
         "HINT2_TEXT": "Teams können nun benutzerdefinierte Felder anlegen, um Werte einzugeben, die für Ihren Workflow wichtig sind.",
         "HINT3_TITLE": "Sortiere Deine Projekte, um Dir vor allem die anzuzeigen, die relevant für Dich sind.",
-        "HINT3_TEXT": "Die 10 Projekt sind in der Zugriffsleiste am oberen Bildschirmrand aufgelistet. ",
+        "HINT3_TEXT": "Die 10 Projekt sind in der Zugriffsleiste am oberen Bildschirmrand aufgelistet.",
         "HINT4_TITLE": "Did you forget what were you working on?",
         "HINT4_TEXT": "Machen Sie sich keine Sorgen, im Dashboard finden Sie Aufgaben, Tickets und User-Stories in der Reihenfolge in der Sie diese bearbeitet haben."
     },
     "TIMELINE": {
         "UPLOAD_ATTACHMENT": "{{username}} fügte {{obj_name}} einen neuen Anhang zu",
         "US_CREATED": "{{username}} erstellte die neue User-Story {{obj_name}} in {{project_name}}",
-        "ISSUE_CREATED": "{{username}} erstellte das neue Ticket {{obj_name}} in {{project_name}} ",
+        "ISSUE_CREATED": "{{username}} erstellte das neue Ticket {{obj_name}} in {{project_name}}",
         "TASK_CREATED": "{{username}} erstellte die neue Aufgabe {{obj_name}} in {{project_name}}",
         "TASK_CREATED_WITH_US": "{{username}} erstellte die neue Aufgabe {{obj_name}} in {{project_name}}, die zur User-Story {{us_name}} gehört",
         "WIKI_CREATED": "{{username}} erstellte die neue Wiki Seite {{obj_name}} in {{project_name}}",
@@ -1380,14 +1380,14 @@
         "PAGE_DESCRIPTION": "Eine externe Anwendung benötigt eine Genehmigung",
         "AUTHORIZATION_REQUEST": "{{application}} erlauben ihren Taiga Account zu benutzen?",
         "LOGIN_WITH_ANOTHER_USER": "Mit einem anderen Benutzer einloggen.",
-        "AUTHORIZE_APP": "App autorisieren",
+        "AUTHORIZE_APP": "Anwendung autorisieren",
         "CANCEL": "Abbrechen"
     },
     "JOYRIDE": {
         "NAV": {
             "NEXT": "Weiter",
-            "BACK": "Back",
-            "SKIP": "Skip",
+            "BACK": "Zurück",
+            "SKIP": "Überspringen",
             "DONE": "Erledigt"
         },
         "DASHBOARD": {
@@ -1397,7 +1397,7 @@
             },
             "STEP2": {
                 "TITLE": "Zuletzt bearbeitet",
-                "TEXT": "Here wirst du deine User Stories, Tasks und Issues sehen, an denen du arbeitest."
+                "TEXT": "Hier wirst du deine User Stories, Tasks und Issues sehen, an denen du arbeitest."
             },
             "STEP3": {
                 "TITLE": "Beobachtet",
@@ -1455,7 +1455,7 @@
         "MOST_LIKED": "Most liked",
         "MOST_LIKED_EMPTY": "There are no LIKED projects yet",
         "VIEW_MORE": "View more",
-        "RECRUITING": "This project is looking for people",
+        "RECRUITING": "Dieses Projekt sucht nach Mitarbeitern",
         "FEATURED": "Featured Projects",
         "EMPTY": "There are no projects to show with this search criteria.<br> Try again!",
         "FILTERS": {
@@ -1463,18 +1463,18 @@
             "KANBAN": "Kanban",
             "SCRUM": "Scrum",
             "PEOPLE": "Looking for people",
-            "WEEK": "Last week",
-            "MONTH": "Last month",
-            "YEAR": "Last year",
+            "WEEK": "Letzte Woche",
+            "MONTH": "Letzter Monat",
+            "YEAR": "Letztes Jahr",
             "ALL_TIME": "All time",
-            "CLEAR": "Clear filters"
+            "CLEAR": "Filter zurücksetzen"
         },
         "SEARCH": {
             "PAGE_TITLE": "Search - Discover projects - Taiga",
             "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Geben sie etwas ein...",
             "ACTION_TITLE": "Suche",
-            "RESULTS": "Search results"
+            "RESULTS": "Suchergebnisse"
         }
     }
 }
\ No newline at end of file
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index b5c07e2f..68a68e9e 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "¿Te sientes fuera de tu zona de confort en una tarea? Asegúrate de que los demás están al tanto de ello, marca el check de la Iocaína al editar una tarea. Igual eu era posible llegar a ser inmune a este veneno mortal a base de consumir pequeñas dosis a lo largo del tiempo, es posible conseguir mejor en lo que estás haciendo si afrontas de vez en cuando esta clase de retos!",
         "CLIENT_REQUIREMENT": "Requerimiento de cliente es un nuevo requisito que no se esperaba y es necesario que forme parte del proyecto.",
         "TEAM_REQUIREMENT": "Requerimiento del equipo es un nuevo requisito que debe existir en el proyecto pero que no conllevará ningún coste para el cliente.",
-        "CAPSLOCK_WARNING": "¡Ten cuidado! Usted está escribiendo con mayúsculas y esta entrada es sensible a mayúsculas.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece inválido.",
             "TYPE_EMAIL": "El valor debe ser un email.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Debes seleccionar al menos %s.",
             "MAX_CHECK": "Debes seleccionar %s o menos.",
             "RANGE_CHECK": "Debes seleccionar de %s a %s.",
-            "EQUAL_TO": "Este valor debe ser el mismo."
+            "EQUAL_TO": "Este valor debe ser el mismo.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "¿Desactualizado?",
         "ADD": "Agrega nuevos adjunto. {{maxFileSizeMsg}}",
         "DROP": "¡Arrastre los archivos adjuntos aquí!",
-        "MAX_FILE_SIZE": "[Tamaño Max. : {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ muestra adjuntos desactualizados",
         "HIDE_DEPRECATED": "- ocultar adjuntos obsoletos",
         "COUNT_DEPRECATED": "({{ counter }} obsoletos)\n",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "¿Qué estás buscando?",
             "RECRUITING_PLACEHOLDER": "Define el perfil de lo que estás buscando",
             "PUBLIC_PROJECT": "Proyecto público",
-            "PUBLIC_PROJECT_DESC": "Los usuarios serán capaces de encontrar y ver tu proyecto",
             "PRIVATE_PROJECT": "Proyecto privado",
-            "PRIVATE_PROJECT_DESC": "Este proyecto estará oculto al público por defecto.",
             "PRIVATE_OR_PUBLIC": "¿Cuál es la diferencia entre proyecto público y privado?",
             "DELETE": "Eliminar este proyecto",
             "LOGO_HELP": "La imagen se escalará a 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Añadir un atributo personalizado en las peticiones",
             "FIELD_TYPE_TEXT": "Texto",
             "FIELD_TYPE_MULTI": "Multilínea",
-            "FIELD_TYPE_DATE": "Fecha"
+            "FIELD_TYPE_DATE": "Fecha",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valores del Proyectos - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} miembros con este rol",
             "TITLE_DELETE_ROLE": "Borrar Rol",
             "REPLACEMENT_ROLE": "Todos los usuarios con este rol serán movidos a",
-            "WARNING_DELETE_ROLE": "<strong>Cuidado, todas las estimaciones asociadas a este rol se perderán</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "No puedes eliminar todos los valores",
             "EXTERNAL_USER": "Usuario externo"
         },
@@ -1446,8 +1446,8 @@
         }
     },
     "DISCOVER": {
-        "PAGE_TITLE": "Discover projects - Taiga",
-        "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
+        "PAGE_TITLE": "Descubre proyectos - Taiga",
+        "PAGE_DESCRIPTION": "Directorio de búsqueda de Proyectos Públicos en Taiga. Explora los backlogs, timelines, peticiones y equipos. Echa un vistazo a los proyectos que más  gustan o más activos. Filtrar por Kanban o Scrum.",
         "DISCOVER_TITLE": "Descubre proyectos",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un proyecto público por descubrir} other{# proyectos público por descubrir}}\n",
         "MOST_ACTIVE": "Más activos",
@@ -1470,8 +1470,8 @@
             "CLEAR": "Borrar filtros"
         },
         "SEARCH": {
-            "PAGE_TITLE": "Search - Discover projects - Taiga",
-            "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
+            "PAGE_TITLE": "Buscar - Descubre proyectos - Taiga",
+            "PAGE_DESCRIPTION": "Directorio de búsqueda de Proyectos Públicos en Taiga. Explora los backlogs, timelines, peticiones y equipos. Echa un vistazo a los proyectos que más  gustan o más activos. Filtrar por Kanban o Scrum.",
             "INPUT_PLACEHOLDER": "Escribe algo...",
             "ACTION_TITLE": "Buscar",
             "RESULTS": "Resultados de búsqueda"
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index 0ab3626e..14c70bea 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Jos tehtävä ahdistaa, merkitse se myrkylliseksi. Ajan mittaa pieninä annoksina saattaa kastokykysi myrkkyä vastaan parantua.",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Be careful! You're writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Tämä arvo vaikuttaa virheelliseltä.",
             "TYPE_EMAIL": "Tämän pitäisi olla toimiva sähköpostiosoite.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Sinun täytyy valita vähintään %s valintaa.",
             "MAX_CHECK": "Valitse korkeintaan %s vaihtoehtoa.",
             "RANGE_CHECK": "Valitse %s - %s vaihteohtoa.",
-            "EQUAL_TO": "Arvojen pitäisi olla samat."
+            "EQUAL_TO": "Arvojen pitäisi olla samat.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD.MM.YY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Vanhentunut?",
         "ADD": "Add new attachment. {{maxFileSizeMsg}}",
         "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Maks. koko: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ näytä vanhentuneet liitteet",
         "HIDE_DEPRECATED": "- piilota vanhentuneet liitteet",
         "COUNT_DEPRECATED": "({{ counter }} vanhentunutta)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Who are you looking for?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Julkinen projekti",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Yksityinen projekti",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
             "DELETE": "Poista tämä projekti",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Lisää oma kenttä pyynnöille",
             "FIELD_TYPE_TEXT": "Text",
             "FIELD_TYPE_MULTI": "Multi-line",
-            "FIELD_TYPE_DATE": "Date"
+            "FIELD_TYPE_DATE": "Date",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Project values - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} jäsentä joilla tämä rooli",
             "TITLE_DELETE_ROLE": "Poista rooli",
             "REPLACEMENT_ROLE": "Kaikki käyttäjä joilla on tämä rooli siirretään",
-            "WARNING_DELETE_ROLE": "<strong>Ole varovainen, rooli-arvioinnit poistetaan</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Voit poistaa kaikki arvot",
             "EXTERNAL_USER": "Ulkoinen käyttäjä"
         },
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index 249be795..ef7e4def 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -38,10 +38,10 @@
         "LOGOUT": "Déconnexion",
         "EXTERNAL_USER": "un utilisateur externe",
         "GENERIC_ERROR": "L'un de nos Oompa Loompas dit {{error}}.",
-        "IOCAINE_TEXT": "Vous vous sentez un peu submergé par une tâche ? Soyez certains d'en informer les autres en cliquant su Iocaine lors de la modification de la tâche. Il est possible de s'immuniser contre ce poison (fictif) en consommant de petites quantités en heures supplémentaires, tout comme il est possible de s'améliorer en acceptant parfois de nouveaux défis !",
+        "IOCAINE_TEXT": "Vous vous sentez un peu submergé(e) par une tâche ? Soyez certains d'en informer les autres en cliquant sur Iocaine lors de la modification de la tâche. Il est possible de s'immuniser contre ce poison (fictif) en consommant de petites quantités en heures supplémentaires, tout comme il est possible de s'améliorer en acceptant parfois de nouveaux défis !",
         "CLIENT_REQUIREMENT": "Un besoin client est un nouveau besoin qui n'était pas prévu et qu'il est nécessaire d'intégrer au projet",
         "TEAM_REQUIREMENT": "Un besoin projet est un besoin qui est nécessaire au projet mais qui ne doit avoir aucun impact pour le client",
-        "CAPSLOCK_WARNING": "Attention ! Vous tapez en lettres majuscules et ce champ est sensible à la casse.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Cette valeur semble être invalide.",
             "TYPE_EMAIL": "Cette valeur devrait être une adresse courriel valide.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Vous devez sélectionner au moins %s options.",
             "MAX_CHECK": "Vous devez sélectionner %s options ou moins.",
             "RANGE_CHECK": "Vous devez sélectionner parmi les choix %s et %s.",
-            "EQUAL_TO": "Cette valeur doit être identique."
+            "EQUAL_TO": "Cette valeur doit être identique.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -150,7 +152,7 @@
             "TOO_MANY": "...trop d'utilisateurs ; filtrez davantage",
             "CONFIRM_UNASSIGNED": "Etes-vous sûr de vouloir continuer sans affectation ?",
             "TITLE_ACTION_EDIT_ASSIGNMENT": "Modifier l'affectation",
-            "SELF": "Me l'assigné"
+            "SELF": "Me l'affecter"
         },
         "STATUS": {
             "CLOSED": "Fermé",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Obsolète ?",
         "ADD": "Ajoutez une nouvelle pièce jointe. {{maxFileSizeMsg}}",
         "DROP": "Déposer les pièces jointes ici !",
-        "MAX_FILE_SIZE": "[Taille max. : {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ montrer les pièces jointes obsolètes",
         "HIDE_DEPRECATED": "- cacher les pièces jointes obsolètes",
         "COUNT_DEPRECATED": "({{ counter }} obsolètes)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Qui cherchez-vous ?",
             "RECRUITING_PLACEHOLDER": "Définissez le profil que vous recherchez",
             "PUBLIC_PROJECT": "Projet public",
-            "PUBLIC_PROJECT_DESC": "Les membres vont pouvoir chercher et voir votre projet.",
             "PRIVATE_PROJECT": "Projet privé",
-            "PRIVATE_PROJECT_DESC": "Par défaut, ce project va être caché au public",
             "PRIVATE_OR_PUBLIC": "Quelle est la différence entre les projets publics et privés ?",
             "DELETE": "Supprimer ce projet",
             "LOGO_HELP": "L'image va être agrandie à 80x80px",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Ajouter un champ personnalisé dans les tickets",
             "FIELD_TYPE_TEXT": "Texte",
             "FIELD_TYPE_MULTI": "Multiligne",
-            "FIELD_TYPE_DATE": "Date"
+            "FIELD_TYPE_DATE": "Date",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valeurs du projet - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membres avec ce rôle",
             "TITLE_DELETE_ROLE": "Supprimer des rôles",
             "REPLACEMENT_ROLE": "Tous les utilisateurs avec ce rôle seront déplacés dans",
-            "WARNING_DELETE_ROLE": "<strong>Attention, toutes les estimations de rôle seront supprimées</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Vous ne pouvez pas supprimer toutes les valeurs",
             "EXTERNAL_USER": "Utilisateur externe "
         },
@@ -703,7 +703,7 @@
         },
         "PROFILE_SIDEBAR": {
             "TITLE": "Votre profil",
-            "DESCRIPTION": "Tout le monde peut voir ce que vous fêtes et ce sur quoi vous travaillez. Ajoutez votre bio pour donner une version améliorée de vos informations.",
+            "DESCRIPTION": "Tout le monde peut voir ce que vous faites et ce sur quoi vous travaillez. Ajoutez votre bio pour donner une version améliorée de vos informations.",
             "ADD_INFO": "Editer la biographie"
         },
         "PROFILE_FAVS": {
@@ -1108,7 +1108,7 @@
             "IS_IOCAINE": "est sous iocaine"
         },
         "ACTION_IOCAINE": "locaine",
-        "TITLE_ACTION_IOCAINE": "Vous vous sentez un peu dépassé par une tâche ? Assurez-vous que les autres le savent en cliquant sur locaine en éditant une tâche. Il est possible de s'immuniser contre ce poison (fictif) en en consommant de faibles doses pendant un moment tout comme il est possible de devenir meilleur à ce que vous faîtes en relevant quelques défis à l'occasion !"
+        "TITLE_ACTION_IOCAINE": "Vous vous sentez un peu dépassé(e) par une tâche ? Assurez-vous que les autres le savent en cliquant sur locaine en éditant une tâche. Il est possible de s'immuniser contre ce poison (fictif) en en consommant de faibles doses pendant un moment tout comme il est possible de devenir meilleur à ce que vous faîtes en relevant quelques défis à l'occasion !"
     },
     "NOTIFICATION": {
         "OK": "Tout est ok",
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index 17f45748..7f530ec7 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Sì",
         "NO": "No",
-        "OR": "or",
+        "OR": "o",
         "LOADING": "Caricamento...",
         "LOADING_PROJECT": "Stiamo caricando il progetto...",
         "DATE": "DD MMM YYYY",
@@ -22,8 +22,8 @@
         "BLOCK_TITLE": "Block this item for example if it has a dependency that can not be satisfied",
         "BLOCKED": "Bloccato",
         "UNBLOCK": "Sblocca",
-        "UNBLOCK_TITLE": "Unblock this item",
-        "BLOCKED_NOTE": "Why is this blocked?",
+        "UNBLOCK_TITLE": "Sblocca questo elemento",
+        "BLOCKED_NOTE": "Perché questo compito è bloccato?",
         "BLOCKED_REASON": "Spiega il motivo",
         "CREATED_BY": "Creato da {{fullDisplayName}}",
         "FROM": "da",
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Sei stremato? Assicurati che gli altri lo sappiano cliccando su 'aspirina' quando stai lavorando su un compito che ti affatica. Ma non demordere, ricordati: si può migliorare solo se di tanto in tanto si accettano sfide extra!",
         "CLIENT_REQUIREMENT": "Requisito del Cliente è un nuovo requisito che non era stato previsto ed ora è stato richiesto come requisito del progetto",
         "TEAM_REQUIREMENT": "Requisito del Team è un requisito che deve esistere nel progetto ma non deve avere costi per il cliente",
-        "CAPSLOCK_WARNING": "Attento! stai scrivendo in maiuscolo e questo input è sensibile alle maiuscole..",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Questo valore non è valido.",
             "TYPE_EMAIL": "Questo valore dovrebbe corrispondere ad una mail valida",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Devi selezionare almeno %s scelte.",
             "MAX_CHECK": "Devi selezionare la scelta %s o meno.",
             "RANGE_CHECK": "Devi selezionare tra %s e %s scelta.",
-            "EQUAL_TO": "Il valore dovrebbe essere uguale"
+            "EQUAL_TO": "Il valore dovrebbe essere uguale",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Deprecato?",
         "ADD": "Aggiungi un nuovo allegato. {{maxFileSizeMsg}}",
         "DROP": "Rilascia qui l'allegato!",
-        "MAX_FILE_SIZE": "[Dimensione max. {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ visualizza allegati deprecati",
         "HIDE_DEPRECATED": "- nascondi allegati deprecati",
         "COUNT_DEPRECATED": "({{ counter }} deprecati)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Chi stai cercando?",
             "RECRUITING_PLACEHOLDER": "Definisci il profilo che stai cercando",
             "PUBLIC_PROJECT": "Progetto pubblico",
-            "PUBLIC_PROJECT_DESC": "Gli utenti possono cercare e vedere il tuo progetto",
             "PRIVATE_PROJECT": "Progetto privato",
-            "PRIVATE_PROJECT_DESC": "Di default, il progetto sarà nascosto al pubblico",
             "PRIVATE_OR_PUBLIC": "Quale è la differenza tra progetto privato e pubblico?",
             "DELETE": "Elimina questo progetto",
             "LOGO_HELP": "L'immagine sarà scalata a 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Aggiungi un campo personalizzato alla criticitá",
             "FIELD_TYPE_TEXT": "Testo",
             "FIELD_TYPE_MULTI": "Multilinea",
-            "FIELD_TYPE_DATE": "Data"
+            "FIELD_TYPE_DATE": "Data",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valori di progetto - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membri con questo ruolo",
             "TITLE_DELETE_ROLE": "Elimina ruolo",
             "REPLACEMENT_ROLE": "Tutti gli utenti con questo ruolo saranno spostati a ",
-            "WARNING_DELETE_ROLE": "<strong>Attento, tutte le stime dei ruoli saranno eliminate</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Non puoi cancellare tutti i valori",
             "EXTERNAL_USER": "Utente esterno"
         },
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Scrivi un nuovo commento qui",
         "SHOW_DELETED": "Visualizza commento cancellato",
         "HIDE_DELETED": "Nascondi commento cancellato",
-        "DELETE": "Delete comment",
+        "DELETE": "Cancella commento",
         "RESTORE": "Ripristina commento"
     },
     "ACTIVITY": {
@@ -1446,7 +1446,7 @@
         }
     },
     "DISCOVER": {
-        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_TITLE": "Scopri i progetti - Taiga",
         "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Scopri progetti",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un progetto pubblico da scoprire} other{# progetti pubblici da scoprire}}",
@@ -1470,7 +1470,7 @@
             "CLEAR": "Cancella filtri"
         },
         "SEARCH": {
-            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_TITLE": "Cerca - Scopri i progetti - Taiga",
             "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Inserisci testo...",
             "ACTION_TITLE": "Cerca",
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index c1807b09..f209e87b 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Ja",
         "NO": "Nee",
-        "OR": "or",
+        "OR": "of",
         "LOADING": "Aan het laden...",
         "LOADING_PROJECT": "Project laden...",
         "DATE": "DD MMM YYYY",
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Voel je je wat overweldigd door een taak? Zorg ervoor dat anderen dit weten door op Iocaine te klikken bij het wijzigen van een taak. Je kan stapsgewijs immuun worden tegen dit (fictioneel) dodelijk gif door kleine dosissen op te nemen. Net zoals je beter kan worden in wat je doet door af en toe een extra uitdaging aan te gaan!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Let op! Je schrijft met alleen hoofdletters en dit veld is hoofdlettergevoelig.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Deze waarde lijkt ongeldig te zijn",
             "TYPE_EMAIL": "Deze waarde moet een geldig emailadres bevatten",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Je moet minstens %s opties selecteren.",
             "MAX_CHECK": "Je moet %s keuzes of minder selecteren.",
             "RANGE_CHECK": "Je moet tussen %s en %s keuzes selecteren.",
-            "EQUAL_TO": "Deze waarde zou hetzelfde moeten zijn."
+            "EQUAL_TO": "Deze waarde zou hetzelfde moeten zijn.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -282,9 +284,9 @@
         "HEADER": "Ik heb al een Taiga login",
         "PLACEHOLDER_AUTH_NAME": "Gebruikersnaam of email (case sensitive)",
         "LINK_FORGOT_PASSWORD": "Vergeten?",
-        "TITLE_LINK_FORGOT_PASSWORD": "Did you forget your password?",
+        "TITLE_LINK_FORGOT_PASSWORD": "Ben je je wachtwoord vergeten?",
         "ACTION_ENTER": "Enter",
-        "ACTION_SIGN_IN": "Login",
+        "ACTION_SIGN_IN": "Log in",
         "PLACEHOLDER_AUTH_PASSWORD": "Wachtwoord (hoofdlettergevoelig)"
     },
     "LOGIN_FORM": {
@@ -336,7 +338,7 @@
         "PLACEHOLDER_NEW_PASSWORD": "Nieuw wachtwoord",
         "PLACEHOLDER_RE_TYPE_NEW_PASSWORD": "Herhaal wachtwoord",
         "ACTION_RESET_PASSWORD": "Wachtwoord resetten",
-        "ERROR": "Our Oompa Loompas can't find your request to recover your password. Try to ask for it again.",
+        "ERROR": "Onze Oempa-Loempa's kunnen het verzoek om je wachtwoord te herstellen niet terugvinden. Probeer het nog een keer.",
         "SUCCESS": "Onze Oempa-Loempas hebben je nieuwe wachtwoord opgeslagen.<br /> Probeer ermee <strong>in te loggen</strong>."
     },
     "INVITATION": {
@@ -351,8 +353,8 @@
     "HOME": {
         "PAGE_TITLE": "Home -Taiga",
         "PAGE_DESCRIPTION": "De Taiga start pagina met jouw projecten en de aan jou toegewezen en gevolgde user stories, taken en issues",
-        "EMPTY_WORKING_ON": "<strong>It feels empty, doesn't it?</strong> Start working with Taiga and you'll see here the stories, tasks and issues you are workin on.",
-        "EMPTY_WATCHING": "<strong>Follow</strong> User Stories, Tasks, Issues in your projects and be notified about its changes :)",
+        "EMPTY_WORKING_ON": "<strong>Beetje kaal, vind je niet?</strong> Als je aan de slag gaat met Taiga, zie je hier de stories, taken en issues waar je aan werkt",
+        "EMPTY_WATCHING": "<strong>Volg</strong> User Stories, Taken, Issues binnen jouw projecten en ontvang een bericht bij veranderingen :)",
         "EMPTY_PROJECT_LIST": "Je hebt nog geen projecten",
         "WORKING_ON_SECTION": "Werkt aan",
         "WATCHING_SECTION": "Volgers",
@@ -366,14 +368,13 @@
     "ATTACHMENT": {
         "SECTION_NAME": "bijlagen",
         "TITLE": "{{ fileName }} toegevoegd op {{ date }}",
-        "LIST_VIEW_MODE": "List view mode",
-        "GALLERY_VIEW_MODE": "Gallery view mode",
+        "LIST_VIEW_MODE": "Lijst weergave",
+        "GALLERY_VIEW_MODE": "Afbeeldingweergave",
         "DESCRIPTION": "Geef een korte beschrijving",
         "DEPRECATED": "(verouderd)",
         "DEPRECATED_FILE": "Verouderd?",
         "ADD": "Nieuwe bijlage toevoegen. {{maxFileSizeMsg}}",
         "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Max. grootte:  {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ toon verouderde bijlagen",
         "HIDE_DEPRECATED": "- verberg verouderde bijlagen",
         "COUNT_DEPRECATED": "({{ counter }} verouderd)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Who are you looking for?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Open project",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Gesloten project",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
             "DELETE": "Verwijder dit project",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Voeg een aangepast veld toe in issues",
             "FIELD_TYPE_TEXT": "Tekst",
             "FIELD_TYPE_MULTI": "Over meerdere regels",
-            "FIELD_TYPE_DATE": "Date"
+            "FIELD_TYPE_DATE": "Date",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Project waardes - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} leden met deze rol",
             "TITLE_DELETE_ROLE": "Verwijder Rol",
             "REPLACEMENT_ROLE": "Al de gebruikers met deze rol zullen verplaats worden naar",
-            "WARNING_DELETE_ROLE": "<strong>Wees voorzichtig, alle schattingen door deze rol zullen worden verwijderd</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Je kan niet alle waarden verwijderen",
             "EXTERNAL_USER": "Externe gebruiker"
         },
@@ -1171,7 +1171,7 @@
                 "SEVERITY": "Ernst",
                 "PRIORITIES": "Prioriteiten",
                 "TAGS": "Tags",
-                "ASSIGNED_TO": "Toegezen aan",
+                "ASSIGNED_TO": "Toegewezen aan",
                 "CREATED_BY": "Aangemaakt door",
                 "CUSTOM_FILTERS": "Eigen filters"
             },
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index d12e6d95..0fc91a6e 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Czujesz się trochę przytłoczony zadaniem? Daj znać innym klikając na ikonę Iokainy podczas edycji zadania. Jest szansa, że staniesz się odporny na tą (fikcyjną ;) ) śmiertelną truciznę biorąc małe dawki. Z pewnością jednak da Ci ona dodatkowego kopa, który pomoże w pokonaniu nowego wyzwania i staniu się lepszym w tym co robisz!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "UWAGA! Klawisz CAPSLOCK jest aktywny.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Nieprawidłowa wartość",
             "TYPE_EMAIL": "Podaj prawidłowy adres email.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Musisz zaznaczyć przynajmniej %s pozycji.",
             "MAX_CHECK": "Musisz zaznaczyć %s pozycji lub mniej.",
             "RANGE_CHECK": "Musisz zaznaczyć pomiędzy %s a %s pozycji.",
-            "EQUAL_TO": "Ta wartość powinna być taka sama."
+            "EQUAL_TO": "Ta wartość powinna być taka sama.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Przestarzałe?",
         "ADD": "Dodaj nowy załącznik. {{maxFileSizeMsg}}",
         "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Maks. rozmiar: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ pokaż przestarzałe załączniki",
         "HIDE_DEPRECATED": "- ukryj przestarzałe załączniki",
         "COUNT_DEPRECATED": "({{ counter }} przestarzałych",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Who are you looking for?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Projekt publiczny",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Projekt prywatny",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
             "DELETE": "Usuń ten projekt",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Dodaj własne pole dla zgłoszeń",
             "FIELD_TYPE_TEXT": "Tekst",
             "FIELD_TYPE_MULTI": "Pole wielowierszowe",
-            "FIELD_TYPE_DATE": "Date"
+            "FIELD_TYPE_DATE": "Date",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Wartości projektu - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} użytkowników pełniących tę rolę w projekcie",
             "TITLE_DELETE_ROLE": "Usuń rolę",
             "REPLACEMENT_ROLE": "Wszyscy użytkownicy pełniący tę rolę zostaną przeniesieni do",
-            "WARNING_DELETE_ROLE": "<strong>Ostrożnie, wszystkie estymaty dodane przez ludzi pełniących tę rolę zostaną usunięte</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Nie możesz usunąć wszystkich wartości",
             "EXTERNAL_USER": "Zewnętrzny użytkownik"
         },
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index d4754245..3497819c 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Sim",
         "NO": "Não",
-        "OR": "or",
+        "OR": "ou",
         "LOADING": "Carregando...",
         "LOADING_PROJECT": "Carregando o projeto...",
         "DATE": "DD MMM YYYY",
@@ -19,11 +19,11 @@
         "TAG_LINE": "Sua ferramenta de código aberto, gratuita e ágil.",
         "TAG_LINE_2": "AME SEU PROJETO",
         "BLOCK": "Bloquear",
-        "BLOCK_TITLE": "Block this item for example if it has a dependency that can not be satisfied",
+        "BLOCK_TITLE": "Bloqueia este item, por exemplo, se ele possui uma dependência não resolvida",
         "BLOCKED": "Bloqueado",
         "UNBLOCK": "Desbloquear",
-        "UNBLOCK_TITLE": "Unblock this item",
-        "BLOCKED_NOTE": "Why is this blocked?",
+        "UNBLOCK_TITLE": "Desbloquear este item",
+        "BLOCKED_NOTE": "Por que esta bloqueado?",
         "BLOCKED_REASON": "Por favor, explique a razão",
         "CREATED_BY": "Criado por {{fullDisplayName}}",
         "FROM": "de",
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Se sentindo sobrecarregado por uma tarefa? Assegure-se de que os outros saibam disso clicando em Iocaine quando estiver editando a tarefa. É possível se tornar imune a essse veneno mortal (fictício) consumindo pequenas quantidades ao longo do tempo, assim como é possível ficar melhor no que faz, ocasionalmente, por assumir desafios extras!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Seja cuidadoso! Você está escrevendo em letras maiúsculas e esse campo é case sensitive, ou seja trata com distinção letras maiúsculas das minúsculas",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece ser inválido.",
             "TYPE_EMAIL": "Este valor deve ser um e-mail válido.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Você deve selecionar pelo menos %s escolhas.",
             "MAX_CHECK": "Você deve selecionar %s escolhas ou menos.",
             "RANGE_CHECK": "Você deve selecionar entre %s e %s escolhas.",
-            "EQUAL_TO": "Esse valor deveria ser o mesmo."
+            "EQUAL_TO": "Esse valor deveria ser o mesmo.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -205,11 +207,11 @@
             "BOLD_BUTTON_SAMPLE_TEXT": "Seu texto aqui...",
             "ITALIC_BUTTON": "Itálico",
             "ITALIC_SAMPLE_TEXT": "Seu texto aqui...",
-            "STRIKE_BUTTON": "Strike",
+            "STRIKE_BUTTON": "Riscar",
             "STRIKE_SAMPLE_TEXT": "Seu texto aqui...",
-            "BULLETED_LIST_BUTTON": "Lista de Marcadores",
+            "BULLETED_LIST_BUTTON": "Lista de marcadores",
             "BULLETED_LIST_SAMPLE_TEXT": "Seu texto aqui...",
-            "NUMERIC_LIST_BUTTON": "Lista Numérica",
+            "NUMERIC_LIST_BUTTON": "Lista numérica",
             "NUMERIC_LIST_SAMPLE_TEXT": "Seu texto aqui...",
             "PICTURE_BUTTON": "Imagem",
             "PICTURE_SAMPLE_TEXT": "Seu texto alternativo para a imagem aqui...",
@@ -217,7 +219,7 @@
             "LINK_SAMPLE_TEXT": "Seu texto para o link vai aqui...",
             "QUOTE_BLOCK_BUTTON": "Bloco de citação",
             "QUOTE_BLOCK_SAMPLE_TEXT": "Seu texto aqui...",
-            "CODE_BLOCK_BUTTON": "Bloco de Código",
+            "CODE_BLOCK_BUTTON": "Bloco de código",
             "CODE_BLOCK_SAMPLE_TEXT": "Seu texto aqui...",
             "PREVIEW_BUTTON": "Pré Visualizar",
             "EDIT_BUTTON": "Editar",
@@ -229,13 +231,13 @@
                 "VIEW_SPRINTS": "Ver sprints",
                 "ADD_SPRINTS": "Adicionar sprints",
                 "MODIFY_SPRINTS": "Modificar sprints",
-                "DELETE_SPRINTS": "Apagar Sprints"
+                "DELETE_SPRINTS": "Apagar sprints"
             },
             "USER_STORIES": {
                 "NAME": "User Stories",
                 "VIEW_USER_STORIES": "Ver user stories",
                 "ADD_USER_STORIES": "Adicionar user stories",
-                "MODIFY_USER_STORIES": "Modificar user stories",
+                "MODIFY_USER_STORIES": "Modificar estórias de usuário",
                 "DELETE_USER_STORIES": "Apagar user stories"
             },
             "TASKS": {
@@ -350,9 +352,9 @@
     },
     "HOME": {
         "PAGE_TITLE": "Início - Taiga",
-        "PAGE_DESCRIPTION": "A página inicial do Taiga contém seus projetos principais e todos as user stories atribuídas ou observadas por você, tarefas e casos",
-        "EMPTY_WORKING_ON": "<strong>Isso parece vazio não acha?</strong> Comece a trabalhar com Taiga para começar a ver estórias, tarefas e casos em que está trabalhando.",
-        "EMPTY_WATCHING": "<strong>Siga</strong> Estórias, Tarefas e Casos nos seus projetos  e seja notificado das mudanças :)",
+        "PAGE_DESCRIPTION": "A página inicial do Taiga com seus principais projetos e todas as estórias atribuídas ou observadas por você, tarefas e problemas",
+        "EMPTY_WORKING_ON": "<strong>Isso parece vazio não acha?</strong> Comece a trabalhar com Taiga para começar a ver estórias, tarefas e problemas em que está trabalhando.",
+        "EMPTY_WATCHING": "<strong>Siga</strong> Estórias, Tarefas e Problemas nos seus projetos e seja notificado das mudanças :)",
         "EMPTY_PROJECT_LIST": "Você ainda não tem projetos",
         "WORKING_ON_SECTION": "Trabalhando em",
         "WATCHING_SECTION": "Observando",
@@ -366,14 +368,13 @@
     "ATTACHMENT": {
         "SECTION_NAME": "anexos",
         "TITLE": "{{ fileName }} enviado em {{ date }}",
-        "LIST_VIEW_MODE": "List view mode",
-        "GALLERY_VIEW_MODE": "Gallery view mode",
+        "LIST_VIEW_MODE": "Modo de visualização lista",
+        "GALLERY_VIEW_MODE": "Modo de Visualização Galeria",
         "DESCRIPTION": "Escreva uma curta descrição",
         "DEPRECATED": "(obsoleto)",
         "DEPRECATED_FILE": "Obsoleto?",
         "ADD": "Adicionar novo anexo. {{maxFileSizeMsg}}",
         "DROP": "Jogue os anexos aqui!",
-        "MAX_FILE_SIZE": "[Tamanho Máximo: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ mostrar anexos deprecados",
         "HIDE_DEPRECATED": "- esconder anexos obsoletos",
         "COUNT_DEPRECATED": "({{ counter }} deprecados)",
@@ -430,7 +431,7 @@
             "BACKLOG_DESCRIPTION": "Gerencie suas user stories para manter uma visualização organizada de trabalhos futuros e priorizados.",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organize seu projeto de um jeito \"lean\" com esse mural",
-            "ISSUES": "Casos",
+            "ISSUES": "Problemas",
             "ISSUES_DESCRIPTION": "Acompanhe os bugs, questões e melhorias relacionadas ao seu projeto. Não perca nada!",
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Adicione, modifique ou apague conteúdo em colaboração com outras pessoas. Este é o local certo pra documentação do seu projeto.",
@@ -453,13 +454,11 @@
             "NUMBER_US_POINTS": "Número de pontos US (0 para uma quantidade indeterminada)",
             "TAGS": "Tags",
             "DESCRIPTION": "Descrição",
-            "RECRUITING": "Is this project looking for people?",
+            "RECRUITING": "Este projeto esta a procura de colaboradores?",
             "RECRUITING_MESSAGE": "O que você está procurando?",
-            "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
+            "RECRUITING_PLACEHOLDER": "Defina o perfil que você procura?",
             "PUBLIC_PROJECT": "Projeto Publico",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Projeto Privado",
-            "PRIVATE_PROJECT_DESC": "Por padrão, esse projeto é escondido do público",
             "PRIVATE_OR_PUBLIC": "Qual a diferença entre projeto público e privado?",
             "DELETE": "Apagar este projeto",
             "LOGO_HELP": "A imagem deve ser na escala de 80x80px.",
@@ -477,7 +476,7 @@
         "CSV": {
             "SECTION_TITLE_US": "Relatórios de user stories",
             "SECTION_TITLE_TASK": "relatórios de tarefas",
-            "SECTION_TITLE_ISSUE": "relatórios de casos",
+            "SECTION_TITLE_ISSUE": "relatórios de problemas",
             "DOWNLOAD": "Baixar CSV",
             "URL_FIELD_PLACEHOLDER": "Por favor, gere novamente a url do CSV",
             "TITLE_REGENERATE_URL": "Regerar URL CSV",
@@ -486,16 +485,17 @@
         },
         "CUSTOM_FIELDS": {
             "TITLE": "Campos Personalizados",
-            "SUBTITLE": "Especificar campos personalizados para user stories, tarefas e casos",
+            "SUBTITLE": "Especificar campos personalizados para estórias, tarefas e problemas",
             "US_DESCRIPTION": "Campos personalizados das user stories",
             "US_ADD": "Adicionar campo personalizado nas user stories",
             "TASK_DESCRIPTION": "Campos personalizados das Tarefas\n",
             "TASK_ADD": "Adicionar campos personalizados na tarefa",
-            "ISSUE_DESCRIPTION": "Campos personalizados dos casos",
-            "ISSUE_ADD": "Adicionar um campo personalizado no caso",
+            "ISSUE_DESCRIPTION": "Campos personalizados dos problemas",
+            "ISSUE_ADD": "Adicionar um campo personalizado no problema",
             "FIELD_TYPE_TEXT": "Texto",
             "FIELD_TYPE_MULTI": "Multi-linha",
-            "FIELD_TYPE_DATE": "Data"
+            "FIELD_TYPE_DATE": "Data",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valores do projeto - {{projectName}}",
@@ -510,26 +510,26 @@
         },
         "PROJECT_VALUES_PRIORITIES": {
             "TITLE": "Prioridades",
-            "SUBTITLE": "Especifique as prioridades que seus casos terão",
-            "ISSUE_TITLE": "Prioridades do caso",
+            "SUBTITLE": "Especifique as prioridades que seus problemas terão",
+            "ISSUE_TITLE": "Prioridades do problema",
             "ACTION_ADD": "Adicionar nova prioridade"
         },
         "PROJECT_VALUES_SEVERITIES": {
             "TITLE": "Seriedades",
-            "SUBTITLE": "Especifique a severidade que seus casos terão",
-            "ISSUE_TITLE": "Seriedades do caso",
+            "SUBTITLE": "Especifique as severidades que seus problemas terão",
+            "ISSUE_TITLE": "Seriedades do problema",
             "ACTION_ADD": "Adicionar nova severidade"
         },
         "PROJECT_VALUES_STATUS": {
             "TITLE": "Situação",
-            "SUBTITLE": "Especifique os status pelos quais suas user stories, tarefas e casos passarão",
+            "SUBTITLE": "Especifique os status pelos quais suas estórias, tarefas e problemas passarão",
             "US_TITLE": "Estados das Users Strories",
             "TASK_TITLE": "Estados da tarefa",
             "ISSUE_TITLE": "Estados do caso"
         },
         "PROJECT_VALUES_TYPES": {
             "TITLE": "Tipos",
-            "SUBTITLE": "Especifique os tipos que seu caso pode ser",
+            "SUBTITLE": "Especifique os tipos que seu problema pode ser",
             "ISSUE_TITLE": "Tipos de casos",
             "ACTION_ADD": "Adicionar novo {{objName}}"
         },
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membros com a mesma função",
             "TITLE_DELETE_ROLE": "Apagar Função",
             "REPLACEMENT_ROLE": "Todos os usuários com essa função serão movidos para",
-            "WARNING_DELETE_ROLE": "<strong>Seja cuidadoso, todas as estimativas para as funções serão removidas.</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Você não pode apagar todos os valores",
             "EXTERNAL_USER": "Usuário externo"
         },
@@ -703,7 +703,7 @@
         },
         "PROFILE_SIDEBAR": {
             "TITLE": "Seu perfil",
-            "DESCRIPTION": "People can see everything you do and what you are working on. Add a nice bio to give an enhanced version of your information.",
+            "DESCRIPTION": "As pessoas podem ver tudo que você faz e no que você está trabalhando. Adicione uma bela biografia para disponibilizar uma versão melhorada das sua informações.",
             "ADD_INFO": "Editar biografia"
         },
         "PROFILE_FAVS": {
@@ -716,7 +716,7 @@
             "FILTER_TYPE_USER_STORIES_TITLES": "Mostrar apenas user stories",
             "FILTER_TYPE_TASKS": "Tarefas",
             "FILTER_TYPE_TASK_TITLES": "Mostrar apenas tarefas",
-            "FILTER_TYPE_ISSUES": "Casos",
+            "FILTER_TYPE_ISSUES": "Problemas",
             "FILTER_TYPE_ISSUES_TITLE": "mostrar apenas problemas",
             "EMPTY_TITLE": "Parece que não há nada para exibir aqui."
         }
@@ -727,7 +727,7 @@
         "SECTION_PROJECTS": "Projetos",
         "HELP": "Reordene seus projetos para colocar no topo os mais usados.<br/> Os 10 primeiros projetos aparecerão na lista de projetos da barra de navegação superior.",
         "PRIVATE": "Projeto Privado",
-        "LOOKING_FOR_PEOPLE": "This project is looking for people",
+        "LOOKING_FOR_PEOPLE": "Este projeto esta a procura de colaboradores",
         "FANS_COUNTER_TITLE": "{total, plural, um{um fã} outro{# fãs}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, um{um observador} outro{#watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, um{one member} outro{# members}}",
@@ -742,7 +742,7 @@
             "TIMELINE": "Linha do Tempo",
             "BACKLOG": "Backlog",
             "KANBAN": "Kanban",
-            "ISSUES": "Casos",
+            "ISSUES": "Problemas",
             "WIKI": "Wiki",
             "TEAM": "Time",
             "MEETUP": "Reunião",
@@ -825,7 +825,7 @@
         "DELETE_PROJECT": {
             "TITLE": "Apagar projeto",
             "QUESTION": "Você tem certeza que quer apagar este projeto?",
-            "SUBTITLE": "Todas as informações do projeto (estórias de uso, tarefas, casos, sprints e páginas de wiki) serão perdidos! :-(",
+            "SUBTITLE": "Todas as informações do projeto (estórias, tarefas, problemas, sprints e páginas de wiki) serão perdidos! :-(",
             "CONFIRM": "Sim, eu tenho certeza"
         },
         "ASSIGNED_TO": {
@@ -837,7 +837,7 @@
             "HELP_TEXT": "Se os usuários já estiverem registrados no Taiga, eles serão adicionados automaticamente. Caso contrário, eles receberão um convite."
         },
         "CREATE_ISSUE": {
-            "TITLE": "Adicionar caso"
+            "TITLE": "Adicionar problema"
         },
         "FEEDBACK": {
             "TITLE": "Diga-nos algo...",
@@ -850,10 +850,10 @@
         },
         "ADD_EDIT_SPRINT": {
             "TITLE": "Novo Sprint",
-            "PLACEHOLDER_SPRINT_NAME": "nome do Sprint",
+            "PLACEHOLDER_SPRINT_NAME": "nome do sprint",
             "PLACEHOLDER_SPRINT_START": "Inicio Estimado",
             "PLACEHOLDER_SPRINT_END": "Estimativa de Termino",
-            "ACTION_DELETE_SPRINT": "Você quer apagar este Sprint?",
+            "ACTION_DELETE_SPRINT": "Você quer apagar este sprint?",
             "TITLE_ACTION_DELETE_SPRINT": "apagar sprint",
             "LAST_SPRINT_NAME": "último sprint é <strong>{{lastSprint}} ;-) </strong>"
         },
@@ -872,7 +872,7 @@
             "EDIT_US": "Editar user story"
         },
         "DELETE_SPRINT": {
-            "TITLE": "Apagar Sprint"
+            "TITLE": "Apagar sprint"
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Adicione uma mensagem de texto ao convite. Diga algo animador para os novos membros ;-)",
@@ -888,8 +888,8 @@
         "TOTAL_POINTS": "total de pontos",
         "ADD": "+ Adicionar uma nova User Story",
         "ADD_BULK": "Adicionar User Stories em lote",
-        "PROMOTED": "Esta estória de uso foi promovida do caso:",
-        "TITLE_LINK_GO_TO_ISSUE": "Ir para caso",
+        "PROMOTED": "Esta estória de uso foi promovida do problema:",
+        "TITLE_LINK_GO_TO_ISSUE": "Ir para problema",
         "EXTERNAL_REFERENCE": "Esta EU foi criada de",
         "GO_TO_EXTERNAL_REFERENCE": "Ir para a origem",
         "BLOCKED": "Esta user story está bloqueada",
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Escreva um novo comentário aqui",
         "SHOW_DELETED": "Mostrar comentários apagados",
         "HIDE_DELETED": "Esconder comentário apagado",
-        "DELETE": "Delete comment",
+        "DELETE": "Apagar comentário",
         "RESTORE": "Restaurar comentário"
     },
     "ACTIVITY": {
@@ -977,8 +977,8 @@
         "CUSTOMIZE_GRAPH_TEXT": "To have a nice graph that helps you follow the evolution of the project you have to set up the points and sprints through the",
         "CUSTOMIZE_GRAPH_ADMIN": "Administrador",
         "CUSTOMIZE_GRAPH_TITLE": "Configure os pontos e sprints pelo Administrador",
-        "MOVE_US_TO_CURRENT_SPRINT": "Mover para Sprint Corrente",
-        "MOVE_US_TO_LATEST_SPRINT": "ir para o último Sprint",
+        "MOVE_US_TO_CURRENT_SPRINT": "Mover para sprint corrente",
+        "MOVE_US_TO_LATEST_SPRINT": "ir para o último sprint",
         "SHOW_FILTERS": "Mostrar filtros",
         "SHOW_TAGS": "Exibir tags",
         "EMPTY": "O backlog está vazio!",
@@ -989,7 +989,7 @@
         "CLOSED_POINTS": "fechado",
         "COMPACT_SPRINT": "Sprint Resumido",
         "GO_TO_TASKBOARD": "Ir ao quadro de tarefas de {{::name}}",
-        "EDIT_SPRINT": "Editar Sprint",
+        "EDIT_SPRINT": "Editar sprint",
         "TOTAL_POINTS": "total",
         "STATUS_NAME": "Nome de Situação",
         "SORTABLE_FILTER_ERROR": "Você não pode jogar sobre o  backlog quando filtros estão abertos",
@@ -998,9 +998,9 @@
             "XAXIS_LABEL": "Sprintes",
             "YAXIS_LABEL": "Pontos",
             "OPTIMAL": "Ideal de pontos pendentes para o sprint \"{{sprintName}}\" deve ser {{value}}",
-            "REAL": "Real pending points for sprint \"{{sprintName}}\" is {{value}}",
-            "INCREMENT_TEAM": "Pontos incrementados pelos requerimentos do time para o sprint  \"{{sprintName}}\" é {{value}}",
-            "INCREMENT_CLIENT": "Pontos incrementados pelos requerimentos do cliente para o sprint \"{{sprintName}}\" é {{value}}"
+            "REAL": "Pontos realmente pendentes para o sprint \"{{sprintName}}\" é {{value}}",
+            "INCREMENT_TEAM": "Pontos incrementados pelos requisitos do time para o sprint  \"{{sprintName}}\" é {{value}}",
+            "INCREMENT_CLIENT": "Pontos incrementados pelos requisitos do cliente para o sprint \"{{sprintName}}\" é {{value}}"
         },
         "TAGS": {
             "TOGGLE": "Alternar visibilidade das tags",
@@ -1014,7 +1014,7 @@
         "SPRINT_SUMMARY": {
             "TOTAL_POINTS": "pontos<br />totais",
             "COMPLETED_POINTS": "pontos <br />completados",
-            "OPEN_TASKS": "tasks<br />abertas",
+            "OPEN_TASKS": "tarefas<br />abertas",
             "CLOSED_TASKS": "tarefas<br />fechadas",
             "IOCAINE_DOSES": "iocaine<br />doses",
             "SHOW_STATISTICS_TITLE": "Mostrar estatísticas",
@@ -1038,13 +1038,13 @@
         "SPRINTS": {
             "TITLE": "SPRINTS",
             "DATE": "DD MMM YYYY",
-            "LINK_TASKBOARD": "Sprint quadro de tarefas",
+            "LINK_TASKBOARD": "Quadro de tarefas do sprint",
             "TITLE_LINK_TASKBOARD": "ir para quadro de tarefas de \"{{name}}\"",
             "NUMBER_SPRINTS": "<br/>sprints",
             "EMPTY": "Ainda não temos sprints.",
-            "WARNING_EMPTY_SPRINT_ANONYMOUS": "Esse sprint não tem Estórias",
-            "WARNING_EMPTY_SPRINT": "Solte aqui Estórias do seu backlog para iniciar uma nova sprint",
-            "TITLE_ACTION_NEW_SPRINT": "Add nova sprint",
+            "WARNING_EMPTY_SPRINT_ANONYMOUS": "Esse sprint não tem estórias de usuário",
+            "WARNING_EMPTY_SPRINT": "Solte aqui estórias do seu backlog para iniciar uma nova sprint",
+            "TITLE_ACTION_NEW_SPRINT": "Adicionar nova sprint",
             "TEXT_ACTION_NEW_SPRINT": "Você poderá querer criar uma nova sprint em seu projeto",
             "ACTION_SHOW_CLOSED_SPRINTS": "Mostre os sprints fechados",
             "ACTION_HIDE_CLOSED_SPRINTS": "Esconder sprints fechados"
@@ -1134,9 +1134,9 @@
         "SUCCESS": "Nossos Oompa Loompas atualizaram seu email"
     },
     "ISSUES": {
-        "PAGE_TITLE": "Casos - {{projectName}}",
-        "PAGE_DESCRIPTION": "O painel de casos do projeto {{projectName}}: {{projectDescription}}",
-        "LIST_SECTION_NAME": "Casos",
+        "PAGE_TITLE": "Problemas - {{projectName}}",
+        "PAGE_DESCRIPTION": "O painel de problemas do projeto {{projectName}}: {{projectDescription}}",
+        "LIST_SECTION_NAME": "Problemas",
         "SECTION_NAME": "Detalhes do caso",
         "ACTION_NEW_ISSUE": "+ NOVO CASO",
         "ACTION_PROMOTE_TO_US": "Promover para User Story",
@@ -1201,7 +1201,7 @@
         }
     },
     "ISSUE": {
-        "PAGE_TITLE": "{{issueSubject}} - caso {{issueRef}} - {{projectName}}",
+        "PAGE_TITLE": "{{issueSubject}} - problema {{issueRef}} - {{projectName}}",
         "PAGE_DESCRIPTION": "Estado: {{issueStatus }}. Tipo: {{issueType}}, Prioridade: {{issuePriority}}. severidade: {{issueSeverity}}. Descrição: {{issueDescription}}"
     },
     "KANBAN": {
@@ -1365,12 +1365,12 @@
         "NEW_COMMENT_ISSUE": "{{username}} comentou no issue {{obj_name}}",
         "NEW_COMMENT_TASK": "{{username}} comentou na tarefa {{obj_name}}",
         "NEW_MEMBER": "{{project_name}} tem um membro novo",
-        "US_ADDED_MILESTONE": "{{username}} adicionou a US {{obj_name}} a {{sprint_name}}",
+        "US_ADDED_MILESTONE": "{{username}} adicionou a estória {{obj_name}} a {{sprint_name}}",
         "US_MOVED": "{{username}} moveu a US {{obj_name}}",
         "US_REMOVED_FROM_MILESTONE": "{{username}} adicionou a US {{obj_name}} ao backlog",
         "BLOCKED": "{{username}} bloqueou {{obj_name}}",
         "UNBLOCKED": "{{username}} desbloqueou {{obj_name}}",
-        "NEW_USER": "{{username}} ingressou no taiga"
+        "NEW_USER": "{{username}} ingressou no Taiga"
     },
     "LEGAL": {
         "TERMS_OF_SERVICE_AND_PRIVACY_POLICY_AD": "<span>When creating a new account, you agree to our <br /></span><a href=\"{{ termsOfServiceUrl }}\" title=\"See terms of service\" target=\"_blank\">terms of service</a><span> and </span><a href=\"{{ privacyPolicyUrl }}\" title=\"See privacy policy\" target=\"_blank\">privacy policy</a>."
@@ -1414,7 +1414,7 @@
             "STEP1": {
                 "TITLE": "Sumário do projeto",
                 "TEXT1": "Aqui você verá o estado do seu projeto",
-                "TEXT2": "You can change every kind of project settings through the admin."
+                "TEXT2": "Você pode alterar qualquer configuração do projeto no menu admin."
             },
             "STEP2": {
                 "TITLE": "Backlog do Produto",
@@ -1426,7 +1426,7 @@
             },
             "STEP4": {
                 "TITLE": "User Stories",
-                "TEXT": "Those are the requirements at high level. You can add them to the backlog and drag them to the sprint in which it should be delivered."
+                "TEXT": "Estes são os requisitos em alto nível. Você pode adicioná-los ao backlog e arrastá-los ao sprint em que deve ser entregue. "
             }
         },
         "KANBAN": {
@@ -1455,7 +1455,7 @@
         "MOST_LIKED": "Mais curtidas",
         "MOST_LIKED_EMPTY": "Não existe projetos curtidos ainda",
         "VIEW_MORE": "Visualizar mais",
-        "RECRUITING": "This project is looking for people",
+        "RECRUITING": "Este projeto esta procurando colaboradores",
         "FEATURED": "Featured Projects",
         "EMPTY": "There are no projects to show with this search criteria.<br> Try again!",
         "FILTERS": {
@@ -1470,7 +1470,7 @@
             "CLEAR": "Limpar filtros"
         },
         "SEARCH": {
-            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_TITLE": "Procurar - Descobrir projetos - Taiga",
             "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Digite algo...",
             "ACTION_TITLE": "Procurar",
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index ac2e7076..b3c74d25 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -2,7 +2,7 @@
     "COMMON": {
         "YES": "Да",
         "NO": "Нет",
-        "OR": "or",
+        "OR": "или",
         "LOADING": "Пожалуйста, подождите...",
         "LOADING_PROJECT": "Проект загружается...",
         "DATE": "DD MMM YYYY",
@@ -19,11 +19,11 @@
         "TAG_LINE": "Ваш свободный, agile инструмент управления проектами с открытым исходным кодом",
         "TAG_LINE_2": "Любит ваши проекты",
         "BLOCK": "Блокировать",
-        "BLOCK_TITLE": "Block this item for example if it has a dependency that can not be satisfied",
+        "BLOCK_TITLE": "Заблокировать это, например, если имеются зависимости, которые не могут быть удовлетворены",
         "BLOCKED": "Заблокирован",
         "UNBLOCK": "Разблокировать",
-        "UNBLOCK_TITLE": "Unblock this item",
-        "BLOCKED_NOTE": "Why is this blocked?",
+        "UNBLOCK_TITLE": "Разблокировать это",
+        "BLOCKED_NOTE": "Почему это заблокировано?",
         "BLOCKED_REASON": "Пожалуйста разъясните причину",
         "CREATED_BY": "Создано {{fullDisplayName}}",
         "FROM": "от",
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Чувствуете, что задание берет верх над вами? Дайте другим знать об этом, нажав на \"Иокаин\", когда редактируете задание. Возможно стать неуязвимым к этому (выдуманному) смертельном яду, потребляя небольшие количества время от времени, так же как возможно стать лучше в том, что вы делаете, временами беря на себя дополнительные препятствия!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Будьте внимательны! Введённый текст состоит из заглавных букв, а регистр имеет значение.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Кажется, это значение некорректно.",
             "TYPE_EMAIL": "Это значение должно быть корректным email-адресом.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Вы должны выбрать хотя бы %s вариантов.",
             "MAX_CHECK": "Вы должны выбрать %s вариантов или меньше.",
             "RANGE_CHECK": "Вы должны выбрать от %s до %s вариантов.",
-            "EQUAL_TO": "Это значение должно быть таким же."
+            "EQUAL_TO": "Это значение должно быть таким же.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -144,13 +146,13 @@
         },
         "ASSIGNED_TO": {
             "NOT_ASSIGNED": "Не назначен",
-            "ASSIGN": "Assign",
+            "ASSIGN": "Назначить",
             "DELETE_ASSIGNMENT": "Удалить назначение",
             "REMOVE_ASSIGNED": "Удалить назначение",
             "TOO_MANY": "...слишком много пользователей, продолжайте фильтровать",
             "CONFIRM_UNASSIGNED": "Вы уверены что не хотите назначить ответственного?",
             "TITLE_ACTION_EDIT_ASSIGNMENT": "Изменить назначение",
-            "SELF": "Assign to me"
+            "SELF": "Назначено мне"
         },
         "STATUS": {
             "CLOSED": "Закрыт",
@@ -175,7 +177,7 @@
             "UPVOTE": "Повысить",
             "UPVOTED": "Повышено",
             "DOWNVOTE": "Понизить",
-            "VOTERS": "Voters",
+            "VOTERS": "Проголосовавшие",
             "BUTTON_TITLE": "Повысить/понизить",
             "COUNTER_TITLE": "{total, plural, one{один голос} other{# голоса (-ов)}}"
         },
@@ -352,11 +354,11 @@
         "PAGE_TITLE": "Домашняя страница - Taiga",
         "PAGE_DESCRIPTION": "Главная страница Taiga с вашими основными проектами, назначенными и отслеживаемыми ПИ, задачами и запросами",
         "EMPTY_WORKING_ON": "<strong>Пустовато, не правда ли?</strong> Начните работать в Taiga - и тут появятся ПИ, задачи и запросы, над которыми вы работаете.",
-        "EMPTY_WATCHING": "<strong>Follow</strong> User Stories, Tasks, Issues in your projects and be notified about its changes :)",
+        "EMPTY_WATCHING": "<strong>Следите</strong> за пользовательскими историями, задачами, запросами в ваших проектах и будьте уведомлены об изменениях :)",
         "EMPTY_PROJECT_LIST": "У Вас пока нет проектов",
         "WORKING_ON_SECTION": "Работает над",
         "WATCHING_SECTION": "Отслеживаемые",
-        "DASHBOARD": "Projects Dashboard"
+        "DASHBOARD": "Рабочий стол с проектами"
     },
     "PROJECTS": {
         "PAGE_TITLE": "Мои проекты",
@@ -366,14 +368,13 @@
     "ATTACHMENT": {
         "SECTION_NAME": "Вложения",
         "TITLE": "{{ fileName }} загружен {{ date }}",
-        "LIST_VIEW_MODE": "List view mode",
-        "GALLERY_VIEW_MODE": "Gallery view mode",
+        "LIST_VIEW_MODE": "Режим \"список\"",
+        "GALLERY_VIEW_MODE": "Режим \"галерея\"",
         "DESCRIPTION": "Введите краткое описание",
         "DEPRECATED": "(устаревший)",
         "DEPRECATED_FILE": "Устаревший?",
         "ADD": "Добавить вложение. {{maxFileSizeMsg}}",
-        "DROP": "Drop attachments here!",
-        "MAX_FILE_SIZE": "[Макс. размер: {{maxFileSize}}]",
+        "DROP": "Перетяните вложение сюда",
         "SHOW_DEPRECATED": "Показать устаревшие приложения",
         "HIDE_DEPRECATED": "- спрятать устаревшие приложения",
         "COUNT_DEPRECATED": "({{ counter }} устарело)",
@@ -453,18 +454,16 @@
             "NUMBER_US_POINTS": "Количество очков ПИ (0 - неопределенное количество)",
             "TAGS": "Тэги",
             "DESCRIPTION": "Описание",
-            "RECRUITING": "Is this project looking for people?",
-            "RECRUITING_MESSAGE": "Who are you looking for?",
-            "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
+            "RECRUITING": "Этот проект ищет людей?",
+            "RECRUITING_MESSAGE": "Кого вы ищете?",
+            "RECRUITING_PLACEHOLDER": "Уточните, какие профили вы ищете",
             "PUBLIC_PROJECT": "Публичный проект",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Закрытый проект",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
-            "PRIVATE_OR_PUBLIC": "What's the difference between public and private projects?",
+            "PRIVATE_OR_PUBLIC": "В чём разница между публичными и приватными проектами?",
             "DELETE": "Удалить проект",
-            "LOGO_HELP": "The image will be scaled to 80x80px.",
+            "LOGO_HELP": "Изображение будет отмасштабировано до 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Использовать картинку по умолчанию"
         },
         "REPORTS": {
             "TITLE": "Отчеты",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Добавить специальное поле для запросов",
             "FIELD_TYPE_TEXT": "Текст",
             "FIELD_TYPE_MULTI": "Многостроковое",
-            "FIELD_TYPE_DATE": "Дата"
+            "FIELD_TYPE_DATE": "Дата",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Значения атрибутов проекта - {{projectName}}",
@@ -539,11 +539,11 @@
             "HELP_ROLE_ENABLED": "Когда включено, участники, назначенные на эту роль, смогут оценивать очки для пользовательских историй",
             "DISABLE_COMPUTABLE_ALERT_TITLE": "Отключить оценку очков для этой роли",
             "DISABLE_COMPUTABLE_ALERT_SUBTITLE": "If you disable estimation permissions for role {{roleName}} all previous estimations made by this role will be removed",
-            "DISABLE_COMPUTABLE_ALERT_MESSAGE": "<strong>Are you sure you want to disable this role estimations?</strong>",
+            "DISABLE_COMPUTABLE_ALERT_MESSAGE": "<strong>Вы уверены, что хотите отключить оценку очков для этой роли?</strong>",
             "COUNT_MEMBERS": "{{ role.members_count }} участников с этой ролью",
             "TITLE_DELETE_ROLE": "Удалить Роль",
             "REPLACEMENT_ROLE": "Все пользователи этой роли будут перемещены в",
-            "WARNING_DELETE_ROLE": "<strong>Осторожнее, все оценки, связанные с этой будут удалены</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Вы не можете удалить все значения",
             "EXTERNAL_USER": "Внешний пользователь"
         },
@@ -692,13 +692,13 @@
                 "PROJECTS_TAB": "Проекты",
                 "PROJECTS_TAB_TITLE": "Список всех проектов, в которых участвует пользователь",
                 "LIKES_TAB": "Лайки",
-                "LIKES_TAB_TITLE": "List all likes made by this user",
+                "LIKES_TAB_TITLE": "Список всех лайков, поставленных этим пользователем",
                 "VOTES_TAB": "Голоса",
-                "VOTES_TAB_TITLE": "List all votes made by this user",
+                "VOTES_TAB_TITLE": "Список всех голосов, сделанных этим пользователем",
                 "WATCHED_TAB": "Просмотренные",
                 "WATCHED_TAB_TITLE": "Список всего, за чем наблюдает пользователь",
                 "CONTACTS_TAB": "Контакты",
-                "CONTACTS_TAB_TITLE": "List all contacts made by this user"
+                "CONTACTS_TAB_TITLE": "Список всех контактов, созданных этим пользователем"
             }
         },
         "PROFILE_SIDEBAR": {
@@ -727,7 +727,7 @@
         "SECTION_PROJECTS": "Проекты",
         "HELP": "Реорганизуйте свои проекты так чтобы часто используемые были бы наверху.<br/> Первые 10 проектов будут находится вверху списка проектов.",
         "PRIVATE": "Закрытый проект",
-        "LOOKING_FOR_PEOPLE": "This project is looking for people",
+        "LOOKING_FOR_PEOPLE": "Этот проект ищет людей",
         "FANS_COUNTER_TITLE": "{total, plural, one{один фанат} other{# фаната (-ов)}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{один наблюдатель} other{# наблюдателя (-ей)}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
@@ -753,14 +753,14 @@
             "PLACEHOLDER_SEARCH": "Искать в...",
             "ACTION_CREATE_PROJECT": "Создать проект",
             "ACTION_IMPORT_PROJECT": "Импортировать проект",
-            "MANAGE_PROJECTS": "Manage projects",
+            "MANAGE_PROJECTS": "Управлять проектами",
             "TITLE_CREATE_PROJECT": "Создать проект",
             "TITLE_IMPORT_PROJECT": "Импортировать проект",
             "TITLE_PRVIOUS_PROJECT": "Показать предыдущие проекты",
             "TITLE_NEXT_PROJECT": "Показать следующие проекты",
             "HELP_TITLE": "Страница поддержки Taiga",
             "HELP": "Помощь",
-            "HOMEPAGE": "Homepage",
+            "HOMEPAGE": "Домашняя страница",
             "FEEDBACK_TITLE": "Оставить отзыв",
             "FEEDBACK": "Обратная связь",
             "NOTIFICATIONS_TITLE": "Настроить уведомления",
@@ -914,7 +914,7 @@
         "TYPE_NEW_COMMENT": "Добавить комментарий",
         "SHOW_DELETED": "Показать удаленный комментарий",
         "HIDE_DELETED": "Скрыть удаленный комментарий",
-        "DELETE": "Delete comment",
+        "DELETE": "Удалить комментарий",
         "RESTORE": "Показать удаленный комментарий"
     },
     "ACTIVITY": {
@@ -973,12 +973,12 @@
         "PAGE_TITLE": "Список задач - {{projectName}}",
         "PAGE_DESCRIPTION": "Список задач с пользовательскими историями и спринтами проекта {{projectName}}: {{projectDescription}}",
         "SECTION_NAME": "Список задач",
-        "CUSTOMIZE_GRAPH": "Customize your backlog graph",
+        "CUSTOMIZE_GRAPH": "Настроить граф вашего списка задач",
         "CUSTOMIZE_GRAPH_TEXT": "To have a nice graph that helps you follow the evolution of the project you have to set up the points and sprints through the",
         "CUSTOMIZE_GRAPH_ADMIN": "Админка",
         "CUSTOMIZE_GRAPH_TITLE": "Настройте очки и спринты в админке",
         "MOVE_US_TO_CURRENT_SPRINT": "Перейти к текущему спринту",
-        "MOVE_US_TO_LATEST_SPRINT": "Move to latest Sprint",
+        "MOVE_US_TO_LATEST_SPRINT": "Перейти к последнему спринту",
         "SHOW_FILTERS": "Показать фильтры",
         "SHOW_TAGS": "Показать теги",
         "EMPTY": "Список задач пуст!",
@@ -1042,7 +1042,7 @@
             "TITLE_LINK_TASKBOARD": "Перейти к Панели Задач \"{{name}}\"",
             "NUMBER_SPRINTS": "<br/>спринты",
             "EMPTY": "Спринтов пока что нет",
-            "WARNING_EMPTY_SPRINT_ANONYMOUS": "This sprint has no User Stories",
+            "WARNING_EMPTY_SPRINT_ANONYMOUS": "У этого спринта нет пользовательских историй",
             "WARNING_EMPTY_SPRINT": "Накидайте сюда ПИ из списка задач чтобы начать новый спринт",
             "TITLE_ACTION_NEW_SPRINT": "Добавить новый спринт",
             "TEXT_ACTION_NEW_SPRINT": "Вы можете создать новый спринт в проекте",
@@ -1066,7 +1066,7 @@
         "TITLE_ACTION_ADD_BULK": "Добавить новые задачи пакетно",
         "TITLE_ACTION_ASSIGN": "Назначить задачу",
         "TITLE_ACTION_EDIT": "Редактировать задачу",
-        "PLACEHOLDER_CARD_TITLE": "This could be a task",
+        "PLACEHOLDER_CARD_TITLE": "Это может быть задачей",
         "PLACEHOLDER_CARD_TEXT": "Разделяйте ПИ в задачи чтобы отслеживать их по отдельности",
         "TABLE": {
             "COLUMN": "Пользовательская история",
@@ -1268,8 +1268,8 @@
         "NOTIFICATIONS": {
             "SECTION_NAME": "Уведомления почтой",
             "COLUMN_PROJECT": "Проект",
-            "COLUMN_RECEIVE_ALL": "Получать Всё",
-            "COLUMN_ONLY_INVOLVED": "Только задействованные",
+            "COLUMN_RECEIVE_ALL": "Получать все",
+            "COLUMN_ONLY_INVOLVED": "Только вовлечённые",
             "COLUMN_NO_NOTIFICATIONS": "Уведомлений нет",
             "OPTION_ALL": "Все",
             "OPTION_INVOLVED": "Вовлечен",
@@ -1284,9 +1284,9 @@
         }
     },
     "USER_PROFILE": {
-        "IMAGE_HELP": "The image will be scaled to 80x80px.",
+        "IMAGE_HELP": "Изображение будет отмасштабировано до 80x80px.",
         "ACTION_CHANGE_IMAGE": "Изменить",
-        "ACTION_USE_GRAVATAR": "Use default image",
+        "ACTION_USE_GRAVATAR": "Использовать картинку по умолчанию",
         "ACTION_DELETE_ACCOUNT": "Удалить аккаунт",
         "CHANGE_EMAIL_SUCCESS": "<strong>Проверьте входящие письма!</strong><br />Мы послали письмо на ваш аккаунт<br />с инструкциями по установке вашего нового адреса.",
         "CHANGE_PHOTO": "Изменить фото",
@@ -1294,7 +1294,7 @@
             "USERNAME": "Имя пользователя",
             "EMAIL": "Email",
             "FULL_NAME": "Полное имя",
-            "PLACEHOLDER_FULL_NAME": "Установите ваше полное имя (например, Игорь Николаев)",
+            "PLACEHOLDER_FULL_NAME": "Полное имя (например, Игорь Николаев)",
             "BIO": "Биография (не более 210 символов)",
             "PLACEHOLDER_BIO": "Расскажите нам что-нибудь о себе",
             "LANGUAGE": "Язык",
@@ -1338,7 +1338,7 @@
         "HINT2_TEXT": "Теперь команды могут создавать специальные поля, чтобы гибко вводить данные, специфические для их рабочего процесса.",
         "HINT3_TITLE": "Перестройте список своих проектов так, чтобы выделить самые важные для себя.",
         "HINT3_TEXT": "Первые 10 проектов доступны из панели прямого доступа сверху.",
-        "HINT4_TITLE": "Did you forget what were you working on?",
+        "HINT4_TITLE": "Забыли, над чем вы работали?",
         "HINT4_TEXT": "Не переживайте, на вашем рабочем столе вы найдёте ваши активные задачи, запросы и пользовательские истории в том порядке, в котором вы над ними работали."
     },
     "TIMELINE": {
@@ -1387,7 +1387,7 @@
         "NAV": {
             "NEXT": "Следующий",
             "BACK": "Бэкенд разработчик",
-            "SKIP": "Skip",
+            "SKIP": "Пропустить",
             "DONE": "Завершена"
         },
         "DASHBOARD": {
@@ -1402,7 +1402,7 @@
             "STEP3": {
                 "TITLE": "Отслеживаемое",
                 "TEXT1": "And right here you will find the ones in your projects that you want to know about.",
-                "TEXT2": "You are already working with Taiga ;)"
+                "TEXT2": "Вы уже работаете с Taiga ;)"
             },
             "STEP4": {
                 "TITLE": "Давайте начнём",
@@ -1446,35 +1446,35 @@
         }
     },
     "DISCOVER": {
-        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_TITLE": "Найти проекты - Taiga",
         "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
-        "DISCOVER_TITLE": "Discover projects",
+        "DISCOVER_TITLE": "Найти проекты",
         "DISCOVER_SUBTITLE": "{projects, plural, one{One public project to discover} other{# public projects to discover}}",
-        "MOST_ACTIVE": "Most active",
+        "MOST_ACTIVE": "Наиболее активные",
         "MOST_ACTIVE_EMPTY": "There are no ACTIVE projects yet",
-        "MOST_LIKED": "Most liked",
+        "MOST_LIKED": "Больше всего лайков",
         "MOST_LIKED_EMPTY": "There are no LIKED projects yet",
-        "VIEW_MORE": "View more",
-        "RECRUITING": "This project is looking for people",
-        "FEATURED": "Featured Projects",
-        "EMPTY": "There are no projects to show with this search criteria.<br> Try again!",
+        "VIEW_MORE": "Показать больше",
+        "RECRUITING": "Этот проект ищет людей",
+        "FEATURED": "Популярные проекты",
+        "EMPTY": "Нету проектов, удовлетворяющих заданным критериям поиска.<br/> Попробуйте снова!",
         "FILTERS": {
             "ALL": "Все",
             "KANBAN": "Kanban",
             "SCRUM": "Scrum",
-            "PEOPLE": "Looking for people",
-            "WEEK": "Last week",
-            "MONTH": "Last month",
-            "YEAR": "Last year",
-            "ALL_TIME": "All time",
-            "CLEAR": "Clear filters"
+            "PEOPLE": "Ищем людей",
+            "WEEK": "За неделю",
+            "MONTH": "За месяц",
+            "YEAR": "За год",
+            "ALL_TIME": "За всё время",
+            "CLEAR": "Очистить фильтры"
         },
         "SEARCH": {
-            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_TITLE": "Поиск - Найти проекты - Taiga",
             "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Введите что-нибудь...",
             "ACTION_TITLE": "Поиск",
-            "RESULTS": "Search results"
+            "RESULTS": "Результаты поиска"
         }
     }
 }
\ No newline at end of file
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index d8f2115c..1174a848 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Känner du dig lite bortkommen med en uppgift? Försäkra dig om att andra känner till uppgiften när du klickar på Iocaine-knappen när du ändrar uppgiften. Det är möjligt att bli immun till det här (påhittade) dödliga giftet om du tar små mängder över tid - och du kan även så småningom om bli bättre på vad du gör när du då och då tar på dig större utmaningar!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "Var försiktig! Du skriver med STORA bokstäver och det här fältet är skriftlägekänsligt.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Det här värdet är felaktigt. ",
             "TYPE_EMAIL": "Värdet måste vara en giltig e-postadress",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "Du måste välja minst %s val.",
             "MAX_CHECK": "Du måste välja %s val eller mindre.",
             "RANGE_CHECK": "Du måste välja mellan %s och %s val.",
-            "EQUAL_TO": "Det här värdet skulle vara det samma. "
+            "EQUAL_TO": "Det här värdet skulle vara det samma. ",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "YYYY-MM-DD",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Borttagen?",
         "ADD": "Lägg till ny bilaga. {{maxFileSizeMsg}}",
         "DROP": "Drag och släpp filer som ska bifogas här!",
-        "MAX_FILE_SIZE": "[Max. size: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ visa ogillade bilagor",
         "HIDE_DEPRECATED": "- dölj ogillade bilagor",
         "COUNT_DEPRECATED": "({{ counter }} deprecated)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Vem letar du efter?",
             "RECRUITING_PLACEHOLDER": "Define the profiles you are looking for",
             "PUBLIC_PROJECT": "Publika projekt",
-            "PUBLIC_PROJECT_DESC": "Users will be able to find and view your project",
             "PRIVATE_PROJECT": "Privata projekt",
-            "PRIVATE_PROJECT_DESC": "By default, this project will be hidden to the public",
             "PRIVATE_OR_PUBLIC": "Vad är skillnaden mellan publika och privata projekt?",
             "DELETE": "Ta bort projekt",
             "LOGO_HELP": "Bilden kommer skalas till 80x80px.",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Anpassade fält för ärenden",
             "FIELD_TYPE_TEXT": "Text",
             "FIELD_TYPE_MULTI": "Flerradig",
-            "FIELD_TYPE_DATE": "Datum"
+            "FIELD_TYPE_DATE": "Datum",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Projektvärden - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} medlemmar med den här rollen",
             "TITLE_DELETE_ROLE": "Ta bort rollen",
             "REPLACEMENT_ROLE": "Alla användarna med den här rollen vill flyttas till",
-            "WARNING_DELETE_ROLE": "<strong>Var försiktig. Alla beräkninger för den här rollen vill tas bort</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Du kan inte ta bort alla värden",
             "EXTERNAL_USER": "Extern användare"
         },
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index b96d15a3..c5a03a7a 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "Bir görev size ağır geldi ve bunaldınız mı? Diğerlerinin bu durumdan haberi olması için bir görevi düzenlerken baldıran zehrinin üzerine tıklayın.  Nasıl ki zaman zaman ekstra meydan okumalarla bir işte gittikce iyi olmanız mümkünse, zaman içerisinde küçük dozlar alarak bu ölümcül zehre de bağışıklık kazanabilmek mümkün!",
         "CLIENT_REQUIREMENT": "Müşteri gereksinimi, daha önceden belli olmayan ama projeye dahil olması gereken bir gereksinimdir",
         "TEAM_REQUIREMENT": "Takım gereksinimi, müsteriyi ilgilendirmeyen, ama projede yer alması zorunlu olan bir gereksinimdir.",
-        "CAPSLOCK_WARNING": "Dikkat! Büyük harflerle yazıyorsunuz ve bu girdi büyüklük küçüklük duyarlı.",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Bu değer geçersiz gözüküyor",
             "TYPE_EMAIL": "Bu değer geçerli bir e-posta adresi olmalı.",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "En az %s seçenek belirtmek zorundasınız.",
             "MAX_CHECK": "%s seçenek ya da daha azını seçmek zorunlu.",
             "RANGE_CHECK": "%s ve %s seçenekleri arasında bir seçim yapmak zorunludu.",
-            "EQUAL_TO": "Bu değer aynı olmalı."
+            "EQUAL_TO": "Bu değer aynı olmalı.",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "Kaldırıldı mı?",
         "ADD": "Yeni ek ekleyin {{maxFileSizeMsg}}",
         "DROP": "Ekleri buraya bırakın!",
-        "MAX_FILE_SIZE": "[Max. boyut: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ kaldırılan ekleri göster",
         "HIDE_DEPRECATED": "- kaldırılan ekleri gizle",
         "COUNT_DEPRECATED": "({{ counter }} kaldırılmış)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "Ne aramıştınız?",
             "RECRUITING_PLACEHOLDER": "Aradığınız özellikleri yazın",
             "PUBLIC_PROJECT": "Açık Proje",
-            "PUBLIC_PROJECT_DESC": "Kullanıcılar projenizi bulabilir ve görebilir",
             "PRIVATE_PROJECT": "Gizli proje",
-            "PRIVATE_PROJECT_DESC": "Normalde bu proje gizli olacak",
             "PRIVATE_OR_PUBLIC": "Açık ve özel projeler arasındaki fark nedir?",
             "DELETE": "Bu projeyi sil",
             "LOGO_HELP": "Resim 80×80 piksel boyutuna ölçeklenecek. ",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "Sorunlara yeni bir özel alan ekle",
             "FIELD_TYPE_TEXT": "Metin",
             "FIELD_TYPE_MULTI": "Çoklu-satır",
-            "FIELD_TYPE_DATE": "Tarih"
+            "FIELD_TYPE_DATE": "Tarih",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Proje değerleri- {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "bu roldeki üyelerin sayısı {{ role.members_count }} ",
             "TITLE_DELETE_ROLE": "Rol Sil",
             "REPLACEMENT_ROLE": "Bu role sahip kullanıcıların taşınacağı",
-            "WARNING_DELETE_ROLE": "<strong>Dikkat lütfen, bütün rol kestirimleri silinecek</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Bütün değerleri silemezsiniz",
             "EXTERNAL_USER": "Dış kullanıcı"
         },
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index 3bfd36b7..76956fc1 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -41,7 +41,7 @@
         "IOCAINE_TEXT": "感到任務的不堪負荷？確認其它人在編輯任務時知道此狀況，可以點選Iocaine。它可能會成為免疫的致命狀況，只要長期小量消耗，但如果你只是偶而挑戰它可有助表現。",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
-        "CAPSLOCK_WARNING": "注意你輸入了大寫符號，大小寫字母有所不同",
+        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "該數值似乎為無效",
             "TYPE_EMAIL": "該電子郵件應為有效地址",
@@ -65,7 +65,9 @@
             "MIN_CHECK": "你必須至少選擇 %s 選項",
             "MAX_CHECK": "你必須至多選出 %s選項",
             "RANGE_CHECK": "你必須在%s 與 %s 之間作出選擇",
-            "EQUAL_TO": "該數值應為一致"
+            "EQUAL_TO": "該數值應為一致",
+            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
+            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -373,7 +375,6 @@
         "DEPRECATED_FILE": "棄用?",
         "ADD": "加入新附件 {{maxFileSizeMsg}}",
         "DROP": "在此移除附件 ",
-        "MAX_FILE_SIZE": "[Max. size: {{maxFileSize}}]",
         "SHOW_DEPRECATED": "+ 顯示棄用的附件",
         "HIDE_DEPRECATED": "+ 隱藏棄用的附件",
         "COUNT_DEPRECATED": "({{ counter }} 遭棄用)",
@@ -457,9 +458,7 @@
             "RECRUITING_MESSAGE": "你在找誰？",
             "RECRUITING_PLACEHOLDER": "定義你要找的資訊",
             "PUBLIC_PROJECT": "公開專案",
-            "PUBLIC_PROJECT_DESC": "用戶能夠找到並檢視你的專案",
             "PRIVATE_PROJECT": "不公開專案",
-            "PRIVATE_PROJECT_DESC": "本專案預設為私密不公開顯示",
             "PRIVATE_OR_PUBLIC": "公開專案和私密專案有何差異?",
             "DELETE": "刪除此專案",
             "LOGO_HELP": "此圖片將被裁成80x80px.<br>",
@@ -495,7 +494,8 @@
             "ISSUE_ADD": "在問題中加入客制欄位",
             "FIELD_TYPE_TEXT": "單行文字",
             "FIELD_TYPE_MULTI": "多行",
-            "FIELD_TYPE_DATE": "日期"
+            "FIELD_TYPE_DATE": "日期",
+            "FIELD_TYPE_URL": "Url"
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - 專案數值 - {{projectName}}",
@@ -543,7 +543,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} 這類角色的成員",
             "TITLE_DELETE_ROLE": "删除角色",
             "REPLACEMENT_ROLE": "和此角色有關的使用者都將遭移除　",
-            "WARNING_DELETE_ROLE": "<strong>小心, 所有角色的估算都將會移除</strong>",
+            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "你不能刪除所有數值",
             "EXTERNAL_USER": "外部使用者"
         },

From 758a13b739c7805ee89767f3b5944bf5c8f6970c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 08:36:09 +0100
Subject: [PATCH 056/155] Dropdown User Plugins styles

---
 .gitignore                                         |  1 +
 app/locales/taiga/locale-en.json                   |  1 +
 .../dropdown-user/dropdown-user.jade               |  3 ++-
 app/modules/navigation-bar/navigation-bar.scss     | 14 ++++++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9fe650a7..ec0af232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ tmp/
 app/config/main.coffee
 scss-lint.log
 e2e/screenshots/
+app/modules/compile-modules/
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index b1de8fc8..138fdb09 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -777,6 +777,7 @@
             "CHANGE_PASSWORD": "Change password",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Discover trending projects",
+            "NEW_ITEM": "New",
             "DISCOVER": "Discover",
             "ACTION_REORDER": "Drag & drop to reorder"
         },
diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
index 0061c6e4..535d20ed 100644
--- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
+++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
@@ -23,13 +23,14 @@ div.navbar-dropdown.dropdown-user
                 title="{{'PROJECT.NAVIGATION.EDIT_PROFILE_TITLE' | translate}}",
                 translate="PROJECT.NAVIGATION.EDIT_PROFILE")
 
-        li(ng-repeat="plugin in vm.userSettingsPlugins")
+        li.plugin(ng-repeat="plugin in vm.userSettingsPlugins")
             a(
                 href=""
                 tg-nav="user-settings-contrib:plugin=plugin.slug"
                 ng-class="{active: plugin.slug == currentPlugin.slug}"
             )
                 span.title {{ plugin.name }}
+                span.new(translate="PROJECT.NAVIGATION.NEW_ITEM")
 
         li
             a(
diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss
index 8106882f..4a6f78a0 100644
--- a/app/modules/navigation-bar/navigation-bar.scss
+++ b/app/modules/navigation-bar/navigation-bar.scss
@@ -133,6 +133,20 @@ $dropdown-width: 350px;
         margin-bottom: .5rem;
         padding: 0;
     }
+    .plugin {
+        &:hover {
+            .new {
+                color: $white;
+            }
+        }
+        .new {
+            @extend %small;
+            background: $red-light;
+            float: right;
+            margin-left: auto;
+            padding: .1rem .25rem;
+        }
+    }
     a {
         color: $gray-light;
         display: block;

From af00d7ef11f5f852bc35b118c629e0be95ca1904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 10:09:38 +0100
Subject: [PATCH 057/155] Fix overflow estimation in safari 9

---
 app/styles/modules/common/lightbox.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 02d808fe..e2cf502c 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -529,6 +529,7 @@
             margin-right: 0;
         }
         &:last-child {
+            flex-basis: 100%;
             margin: .1rem 0;
             min-width: 100%;
         }

From 6743d5475fb0e55364ba81c9b0e54c4ff4e6c3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 10 Feb 2016 15:28:45 +0100
Subject: [PATCH 058/155] Contrib plugin subscriptions

---
 app/locales/taiga/locale-en.json     | 21 +++++++++++++++++++++
 app/styles/dependencies/helpers.scss |  1 +
 gulpfile.js                          |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 138fdb09..4bacf2a3 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1480,5 +1480,26 @@
             "ACTION_TITLE": "Search",
             "RESULTS": "Search results"
         }
+    },
+    "SUBSCRIPTIONS": {
+        "PLAN": "Plan",
+        "PLAN_STARTING": "Active Plans starting April 30, 2016",
+        "YOUR_PLAN": "Your plan",
+        "YOUR_RECOMMENDED_PLAN": "Your recommended plan",
+        "WANT_PLAN": "I want it!",
+        "UPDATE_PLAN": "Update Plan",
+        "PRIVATE_PROJECTS_LIMIT": "Up to {{limit}} private projects + Unlimited public projects",
+        "MEMBERS_LIMIT": "Up to {{limit}} members per private project",
+        "FREQUENCY_MONTH": "month",
+        "FREQUENCY_YEAR": "year",
+        "HELP": {
+            "WHY": "Why do we recommend this plan?",
+            "NO_PROJECTS": "Currently you have no private projects, so the plan that fits for you is the {{vm.myRecommendedPlan.name}} plan.",
+            "UPGRADE": "You can upgade your plan if you need it.",
+            "ACTIVATION": "On 30th April we will activate the paid plans. If you have more than 1 provate project you could keep its privacity making the payment for the plan that better fits for you.",
+            "PUBLIC": "We love to share, so if you keep your projects public, it will be completely free.",
+            "MORE_INFO_TITLE": "Frequently Asked Questions",
+            "MORE_INFO": "More info (FAQ)"
+        }
     }
 }
diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss
index df38b422..e71a081c 100644
--- a/app/styles/dependencies/helpers.scss
+++ b/app/styles/dependencies/helpers.scss
@@ -6,6 +6,7 @@
 %larger {font-size: 1.6rem;}
 %xlarge {font-size: 2rem;}
 %xxlarge {font-size: 3rem;}
+%gigantic {font-size: 4rem;}
 
 // __Font Types__ //
 %title {font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif; }
diff --git a/gulpfile.js b/gulpfile.js
index 8890c0ba..03ee1164 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -480,7 +480,7 @@ gulp.task("copy-theme-fonts", function() {
 });
 
 gulp.task("copy-images", function() {
-    return gulp.src(paths.app + "/images/**/*")
+    return gulp.src([paths.app + "/images/**/*", paths.app + '/modules/compile-modules/**/images/*'])
         .pipe(gulpif(isDeploy, imagemin({progressive: true})))
         .pipe(gulp.dest(paths.distVersion + "/images/"));
 });

From ffe40a447b4c35fab6b8ad8fd16411c16d8c6433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 11 Feb 2016 16:45:28 +0100
Subject: [PATCH 059/155] Plugin localization

---
 app/locales/taiga/locale-en.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 4bacf2a3..e8ebd610 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1488,13 +1488,14 @@
         "YOUR_RECOMMENDED_PLAN": "Your recommended plan",
         "WANT_PLAN": "I want it!",
         "UPDATE_PLAN": "Update Plan",
-        "PRIVATE_PROJECTS_LIMIT": "Up to {{limit}} private projects + Unlimited public projects",
-        "MEMBERS_LIMIT": "Up to {{limit}} members per private project",
+        "PRIVATE_PROJECTS_LIMIT": "Up to {{number}} private projects + Unlimited public projects",
+        "MEMBERS_LIMIT": "Up to {{number}} members per private project",
         "FREQUENCY_MONTH": "month",
         "FREQUENCY_YEAR": "year",
         "HELP": {
             "WHY": "Why do we recommend this plan?",
-            "NO_PROJECTS": "Currently you have no private projects, so the plan that fits for you is the {{vm.myRecommendedPlan.name}} plan.",
+            "NO_PROJECTS": "Currently you have no private projects, so the plan that fits for you is the {{name}} plan.",
+            "NUM_PROJECTS": "Actualmente tienes {{private_num}} proyectos privados y {{public_num}} públicos, y el plan que creemos que mejor se ajusta a ti es el Spout Plan.  ",
             "UPGRADE": "You can upgade your plan if you need it.",
             "ACTIVATION": "On 30th April we will activate the paid plans. If you have more than 1 provate project you could keep its privacity making the payment for the plan that better fits for you.",
             "PUBLIC": "We love to share, so if you keep your projects public, it will be completely free.",

From 5e1de666af37f270eb4363437dc8e18f87a0ac1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 12 Feb 2016 14:07:57 +0100
Subject: [PATCH 060/155] Update translations

---
 app/locales/taiga/locale-en.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index e8ebd610..026d114a 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1488,16 +1488,21 @@
         "YOUR_RECOMMENDED_PLAN": "Your recommended plan",
         "WANT_PLAN": "I want it!",
         "UPDATE_PLAN": "Update Plan",
-        "PRIVATE_PROJECTS_LIMIT": "Up to {{number}} private projects + Unlimited public projects",
-        "MEMBERS_LIMIT": "Up to {{number}} members per private project",
+        "PRIVATE_PROJECTS_LIMIT": "Up to <strong>{{number}}</strong> private projects + Unlimited public projects",
+        "MEMBERS_LIMIT": "Up to <strong>{{number}}</strong> members per private project",
+        "CONTACT_SUBSCRIBE": "Subscribe to this plan by contacting us at <a href='mailto:support@taiga.io'>support@taiga.io</a>",
         "FREQUENCY_MONTH": "month",
         "FREQUENCY_YEAR": "year",
         "HELP": {
             "WHY": "Why do we recommend this plan?",
             "NO_PROJECTS": "Currently you have no private projects, so the plan that fits for you is the {{name}} plan.",
-            "NUM_PROJECTS": "Actualmente tienes {{private_num}} proyectos privados y {{public_num}} públicos, y el plan que creemos que mejor se ajusta a ti es el Spout Plan.  ",
-            "UPGRADE": "You can upgade your plan if you need it.",
+            "FEW_PROJECTS": "You just have {{private_num}} private project, so the plan that fits for you is the {{name}} plan.",
+            "NUM_PROJECTS": "You own {{private_num}} private projects and {{public_num}} public projects, so the plan that better fits for you is the {{plan}} Plan.",
+            "NUM_PROJECTS_CUSTOM": "You own {{private_num}} private projects and {{public_num}} public projects, so the plan that better fits for you is the Custom Plan.",
+            "SUBSCRIBE": "You can already ensure the privacity of your projects subscribing the recommended plan, or that better fits for your use. You have until April, 30th to select your plan. You don't need to pay anything until then!",
+            "UPGRADE": "You can upgrade your plan if you need it.",
             "ACTIVATION": "On 30th April we will activate the paid plans. If you have more than 1 provate project you could keep its privacity making the payment for the plan that better fits for you.",
+            "PAYMENT": "After April 30th, if you are not subscribed to a plan, your private projects will be temporarily blocked. Do not worry, we will not delete them, its just that we cannot decide for you what to do with your projects and we will wait for your decission",
             "PUBLIC": "We love to share, so if you keep your projects public, it will be completely free.",
             "MORE_INFO_TITLE": "Frequently Asked Questions",
             "MORE_INFO": "More info (FAQ)"

From 93b1ebb118abc31f7aae29f3763d47f33fd677f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 15 Feb 2016 07:34:51 +0100
Subject: [PATCH 061/155] Add translations

---
 app/locales/taiga/locale-en.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 026d114a..c52d9415 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1506,6 +1506,11 @@
             "PUBLIC": "We love to share, so if you keep your projects public, it will be completely free.",
             "MORE_INFO_TITLE": "Frequently Asked Questions",
             "MORE_INFO": "More info (FAQ)"
+        },
+        "PAYMENT_HISTORY": {
+            "TITLE": "Payment History",
+            "FREE": "Free until April, 30th",
+            "CHANGE_DATA": "Change payment data"
         }
     }
 }

From 7a959a3b927f0f39f9cdc86160c8a3c272add055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 15 Feb 2016 15:38:09 +0100
Subject: [PATCH 062/155] Add plan lightbox translations

---
 app/locales/taiga/locale-en.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index c52d9415..2f397340 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1511,6 +1511,14 @@
             "TITLE": "Payment History",
             "FREE": "Free until April, 30th",
             "CHANGE_DATA": "Change payment data"
+        },
+        "PLANS_SELECTOR": {
+            "TITLE": "What plan do you need?",
+            "FREE": "Enjoy free plans until <strong>30th April</strong>",
+            "CURRENT": "Current Plan",
+            "RECOMMENDED": "Recommended Plan",
+            "CUSTOM": "Custom",
+            "CONTACT": "Do you need more than 25 users per projects? We have custom plan for enterprises. Get in touch with us at <a href='mailto:support@taiga.io' title='Contact Us'>support@taiga.io</a>"
         }
     }
 }

From 3c3c445b853317b33419addb28a59d4f82f656d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 17 Feb 2016 07:52:35 +0100
Subject: [PATCH 063/155] Localization

---
 app/locales/taiga/locale-en.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 2f397340..1c3dfa54 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1519,6 +1519,30 @@
             "RECOMMENDED": "Recommended Plan",
             "CUSTOM": "Custom",
             "CONTACT": "Do you need more than 25 users per projects? We have custom plan for enterprises. Get in touch with us at <a href='mailto:support@taiga.io' title='Contact Us'>support@taiga.io</a>"
+        },
+        "DOWNGRADE": {
+            "TITLE": "Downgrade",
+            "IMAGE_ALT": "Downgrading a plan",
+            "REASON": "You own more private projext or users per project than the maximum allowed by this plan. Your selected plan only allows <strong>{{projects}} private projects and {{members}} members per private project</strong>, so if you want to change to the {{plan}} plan you should make the following changes",
+            "MORE_PROJECTS": "If you have more than {{projects}} private projects",
+            "MORE_PROJECTS_OPTION1": "Keep {{projects}} private projects as maximum and set the others as <strong>public</strong>",
+            "MORE_PROJECTS_OPTION2": "Keep {{projects}} private projects and <strong>delete</strong> the others",
+            "MORE_PROJECTS_OPTION3": "<strong>Transfer the property</strong> of the private projects to another person that has capacity to own more projects",
+            "MORE_PROJECTS_OPTION4": "Or a combination of the above options",
+            "MORE_MEMBERS": "If you have more than {{members}} members per private project",
+            "MORE_MEMBERS_OPTION1": "Have a maximum of {{members}} members in all your private projects",
+            "ACCEPT": "Ok, understood"
+        },
+        "SELECT_PLAN": {
+            "TITLE": "Subscribe to a plan",
+            "SUBTITLE": "You will not billed anything. Enjoy your plan for free until <strong>April, 30th</strong>",
+            "YOUR_NEW_PLAN": "Your new plan",
+            "INTERVAL": "<strong>After the free period</strong> How would you like to pay?",
+            "PAY_MONTHLY": "Monthly",
+            "PAY_YEARLY": "Yeary",
+            "BACK": "Back",
+            "BACK_TITLE": "Back to select plans",
+            "CONTINUE": "Continue"
         }
     }
 }

From 62624f84a8a24e89f4ead1322c265869c0a7800e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 18 Feb 2016 15:29:10 +0100
Subject: [PATCH 064/155] Fix lightboxes and scss mixins

---
 app/coffee/modules/common/lightboxes.coffee | 4 ++++
 app/styles/dependencies/mixins.scss         | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index ed65d28f..fe3dd88d 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -38,6 +38,8 @@ class LightboxService extends taiga.Service
     constructor: (@animationFrame, @q) ->
 
     open: ($el) ->
+        if _.isString($el)
+            $el = $($el)
         defered = @q.defer()
 
         lightboxContent = $el.children().not(".close")
@@ -63,6 +65,8 @@ class LightboxService extends taiga.Service
         return defered.promise
 
     close: ($el) ->
+        if _.isString($el)
+            $el = $($el)
         docEl = angular.element(document)
         docEl.off(".lightbox")
         docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER
diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss
index 58fa132d..746cc5d6 100644
--- a/app/styles/dependencies/mixins.scss
+++ b/app/styles/dependencies/mixins.scss
@@ -17,6 +17,15 @@
     }
 }
 
+@mixin placeholder {
+  $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input";
+  @each $placeholder in $placeholders {
+    &:#{$placeholder}-placeholder {
+      @content;
+    }
+  }
+}
+
 @mixin slide($max, $overflow, $min: 0) {
     max-height: $min;
     transition: max-height .5s ease-in;

From 68590db6b08a67e9265e507925cc9d39f7f00c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 09:10:27 +0100
Subject: [PATCH 065/155] Fix typo

---
 app/locales/taiga/locale-en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 1c3dfa54..0e9aa7da 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1523,7 +1523,7 @@
         "DOWNGRADE": {
             "TITLE": "Downgrade",
             "IMAGE_ALT": "Downgrading a plan",
-            "REASON": "You own more private projext or users per project than the maximum allowed by this plan. Your selected plan only allows <strong>{{projects}} private projects and {{members}} members per private project</strong>, so if you want to change to the {{plan}} plan you should make the following changes",
+            "REASON": "You own more private projects or users per project than the maximum allowed by this plan. Your selected plan only allows <strong>{{projects}} private projects and {{members}} members per private project</strong>, so if you want to change to the {{plan}} plan you should make the following changes",
             "MORE_PROJECTS": "If you have more than {{projects}} private projects",
             "MORE_PROJECTS_OPTION1": "Keep {{projects}} private projects as maximum and set the others as <strong>public</strong>",
             "MORE_PROJECTS_OPTION2": "Keep {{projects}} private projects and <strong>delete</strong> the others",

From eef8cfc0c76dd209e8dba3897e329f9fa18998fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 09:11:02 +0100
Subject: [PATCH 066/155] Fix design styles

---
 app/themes/taiga/variables.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/themes/taiga/variables.scss b/app/themes/taiga/variables.scss
index 4de07219..963d7dcb 100755
--- a/app/themes/taiga/variables.scss
+++ b/app/themes/taiga/variables.scss
@@ -7,13 +7,13 @@ $black: #000;
 $blackish: #050505;
 $grayer: #444;
 $gray: #555;
-$gray-light: #b8b8b8;
-$whitish: #f5f5f5;
+$gray-light: #767676;
+$whitish: #e4e3e3;
 $white: #fff;
 
 // Primary colors
 $primary-light: #9dce0a;
-$primary: #72a114;
+$primary: #5b8200;
 $primary-dark: #879b89;
 
 //Warning colors

From 9a1e81f730b334b3d048bd553415271f130e3e45 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 22 Feb 2016 12:33:01 +0100
Subject: [PATCH 067/155] support plugin locales

---
 app/coffee/app.coffee            |  3 ++
 app/locales/taiga/locale-en.json | 64 --------------------------------
 gulpfile.js                      | 18 ++++++++-
 package.json                     |  1 +
 4 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 2a860aea..e5fca90a 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -580,6 +580,9 @@ i18nInit = (lang, $translate) ->
 init = ($log, $rootscope, $auth, $events, $analytics, $translate, $location, $navUrls, appMetaService, projectService, loaderService, navigationBarService) ->
     $log.debug("Initialize application")
 
+    $rootscope.$on '$translatePartialLoaderStructureChanged', () ->
+        $translate.refresh()
+
     # Checksley - Extra validators
     validators = {
         linewidth: (val, width) ->
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 0e9aa7da..138fdb09 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -1480,69 +1480,5 @@
             "ACTION_TITLE": "Search",
             "RESULTS": "Search results"
         }
-    },
-    "SUBSCRIPTIONS": {
-        "PLAN": "Plan",
-        "PLAN_STARTING": "Active Plans starting April 30, 2016",
-        "YOUR_PLAN": "Your plan",
-        "YOUR_RECOMMENDED_PLAN": "Your recommended plan",
-        "WANT_PLAN": "I want it!",
-        "UPDATE_PLAN": "Update Plan",
-        "PRIVATE_PROJECTS_LIMIT": "Up to <strong>{{number}}</strong> private projects + Unlimited public projects",
-        "MEMBERS_LIMIT": "Up to <strong>{{number}}</strong> members per private project",
-        "CONTACT_SUBSCRIBE": "Subscribe to this plan by contacting us at <a href='mailto:support@taiga.io'>support@taiga.io</a>",
-        "FREQUENCY_MONTH": "month",
-        "FREQUENCY_YEAR": "year",
-        "HELP": {
-            "WHY": "Why do we recommend this plan?",
-            "NO_PROJECTS": "Currently you have no private projects, so the plan that fits for you is the {{name}} plan.",
-            "FEW_PROJECTS": "You just have {{private_num}} private project, so the plan that fits for you is the {{name}} plan.",
-            "NUM_PROJECTS": "You own {{private_num}} private projects and {{public_num}} public projects, so the plan that better fits for you is the {{plan}} Plan.",
-            "NUM_PROJECTS_CUSTOM": "You own {{private_num}} private projects and {{public_num}} public projects, so the plan that better fits for you is the Custom Plan.",
-            "SUBSCRIBE": "You can already ensure the privacity of your projects subscribing the recommended plan, or that better fits for your use. You have until April, 30th to select your plan. You don't need to pay anything until then!",
-            "UPGRADE": "You can upgrade your plan if you need it.",
-            "ACTIVATION": "On 30th April we will activate the paid plans. If you have more than 1 provate project you could keep its privacity making the payment for the plan that better fits for you.",
-            "PAYMENT": "After April 30th, if you are not subscribed to a plan, your private projects will be temporarily blocked. Do not worry, we will not delete them, its just that we cannot decide for you what to do with your projects and we will wait for your decission",
-            "PUBLIC": "We love to share, so if you keep your projects public, it will be completely free.",
-            "MORE_INFO_TITLE": "Frequently Asked Questions",
-            "MORE_INFO": "More info (FAQ)"
-        },
-        "PAYMENT_HISTORY": {
-            "TITLE": "Payment History",
-            "FREE": "Free until April, 30th",
-            "CHANGE_DATA": "Change payment data"
-        },
-        "PLANS_SELECTOR": {
-            "TITLE": "What plan do you need?",
-            "FREE": "Enjoy free plans until <strong>30th April</strong>",
-            "CURRENT": "Current Plan",
-            "RECOMMENDED": "Recommended Plan",
-            "CUSTOM": "Custom",
-            "CONTACT": "Do you need more than 25 users per projects? We have custom plan for enterprises. Get in touch with us at <a href='mailto:support@taiga.io' title='Contact Us'>support@taiga.io</a>"
-        },
-        "DOWNGRADE": {
-            "TITLE": "Downgrade",
-            "IMAGE_ALT": "Downgrading a plan",
-            "REASON": "You own more private projects or users per project than the maximum allowed by this plan. Your selected plan only allows <strong>{{projects}} private projects and {{members}} members per private project</strong>, so if you want to change to the {{plan}} plan you should make the following changes",
-            "MORE_PROJECTS": "If you have more than {{projects}} private projects",
-            "MORE_PROJECTS_OPTION1": "Keep {{projects}} private projects as maximum and set the others as <strong>public</strong>",
-            "MORE_PROJECTS_OPTION2": "Keep {{projects}} private projects and <strong>delete</strong> the others",
-            "MORE_PROJECTS_OPTION3": "<strong>Transfer the property</strong> of the private projects to another person that has capacity to own more projects",
-            "MORE_PROJECTS_OPTION4": "Or a combination of the above options",
-            "MORE_MEMBERS": "If you have more than {{members}} members per private project",
-            "MORE_MEMBERS_OPTION1": "Have a maximum of {{members}} members in all your private projects",
-            "ACCEPT": "Ok, understood"
-        },
-        "SELECT_PLAN": {
-            "TITLE": "Subscribe to a plan",
-            "SUBTITLE": "You will not billed anything. Enjoy your plan for free until <strong>April, 30th</strong>",
-            "YOUR_NEW_PLAN": "Your new plan",
-            "INTERVAL": "<strong>After the free period</strong> How would you like to pay?",
-            "PAY_MONTHLY": "Monthly",
-            "PAY_YEARLY": "Yeary",
-            "BACK": "Back",
-            "BACK_TITLE": "Back to select plans",
-            "CONTINUE": "Continue"
-        }
     }
 }
diff --git a/gulpfile.js b/gulpfile.js
index 03ee1164..1ea5bd33 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -28,6 +28,8 @@ var gulp = require("gulp"),
     livereload = require('gulp-livereload'),
     gulpFilter = require('gulp-filter'),
     addsrc = require('gulp-add-src');
+    mergeStream = require('merge-stream'),
+    path = require('path'),
     coffeelint = require('gulp-coffeelint');
 
 var argv = require('minimist')(process.argv.slice(2));
@@ -379,8 +381,22 @@ gulp.task("app-loader", function() {
 });
 
 gulp.task("locales", function() {
-    return gulp.src(paths.locales)
+    var plugins = gulp.src(paths.app + "modules/**/locales/*.json")
+        .pipe(rename(function (localeFile) {
+            // rename app/modules/compiles-modules/tg-contrib/locales/locale-en.json
+            // to tg-contrib/locale-en.json
+
+            var pluginPath = path.join(localeFile.dirname, '..');
+            var pluginFolder = pluginPath.split('/').pop();
+
+            localeFile.dirname = pluginFolder;
+        }))
         .pipe(gulp.dest(paths.distVersion + "locales"));
+
+    var core = gulp.src(paths.locales)
+            .pipe(gulp.dest(paths.distVersion + "locales"));
+
+    return mergeStream(plugins, core);
 });
 
 gulp.task("coffee-lint", function () {
diff --git a/package.json b/package.json
index 5e4eb334..ec26f476 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "karma-coffee-preprocessor": "^0.3.0",
     "karma-mocha": "^0.2.0",
     "karma-sourcemap-loader": "^0.3.4",
+    "merge-stream": "^1.0.0",
     "minimist": "^1.1.1",
     "mocha": "^2.2.4",
     "node-uuid": "^1.4.3",

From db8853d0500494a3bffdc1f00016222a3cfd5088 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 23 Feb 2016 13:05:49 +0100
Subject: [PATCH 068/155] login - redirect to homepage if the user is logged

---
 app/coffee/app.coffee          |  3 ++-
 app/coffee/modules/auth.coffee | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index e5fca90a..83976ab3 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -367,7 +367,8 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
             templateUrl: "auth/login.html",
             title: "LOGIN.PAGE_TITLE",
             description: "LOGIN.PAGE_DESCRIPTION",
-            disableHeader: true
+            disableHeader: true,
+            controller: "LoginPage",
         }
     )
     $routeProvider.when("/register",
diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 3694838b..f30006c0 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -27,6 +27,19 @@ debounce = @.taiga.debounce
 
 module = angular.module("taigaAuth", ["taigaResources"])
 
+class LoginPage
+    @.$inject = [
+        'tgCurrentUserService',
+        '$location',
+        '$tgNavUrls'
+    ]
+
+    constructor: (currentUserService, $location, $navUrls) ->
+        if currentUserService.isAuthenticated()
+            $location.path($navUrls.resolve("home"))
+
+module.controller('LoginPage', LoginPage)
+
 #############################################################################
 ## Authentication Service
 #############################################################################

From 69a2202b5f7b7239a64e133f77e2b1cab652f2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 09:43:30 +0100
Subject: [PATCH 069/155] Redirect new registers to dashboard instead of
 discover

---
 app/coffee/modules/auth.coffee | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index f30006c0..452bd217 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -299,16 +299,11 @@ RegisterDirective = ($auth, $confirm, $location, $navUrls, $config, $routeParams
         $scope.data = {}
         form = $el.find("form").checksley({onlyOneErrorElement: true})
 
-        if $routeParams['next'] and $routeParams['next'] != $navUrls.resolve("register")
-            $scope.nextUrl = decodeURIComponent($routeParams['next'])
-        else
-            $scope.nextUrl = $navUrls.resolve("home")
+        $scope.nextUrl = $navUrls.resolve("home")
 
         onSuccessSubmit = (response) ->
             $analytics.trackEvent("auth", "register", "user registration", 1)
 
-            $confirm.notify("success", $translate.instant("LOGIN_FORM.SUCCESS"))
-
             $location.url($scope.nextUrl)
 
         onErrorSubmit = (response) ->

From 90a8d1724bb16a647dd97f3dc301eefd456d99f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Sat, 20 Feb 2016 11:32:39 +0100
Subject: [PATCH 070/155] Hide burndown graph placeholder if the user is not an
 admin of the project

---
 app/partials/backlog/backlog.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index f87992bc..97d41dbc 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -11,7 +11,7 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
         div.backlog-summary(tg-toggle-burndown-visibility)
             include ../includes/components/summary
 
-            div.empty-burndown(ng-if="showGraphPlaceholder")
+            div.empty-burndown(ng-if="showGraphPlaceholder && project.i_am_owner")
                 svg.icon.icon-graph
                     use(xlink:href="#icon-graph")
                 div.empty-text

From 08eaa931b794cef2dbcceba26da054e6fdf8eb55 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 24 Feb 2016 07:58:39 +0100
Subject: [PATCH 071/155] Refactoring code parts where owner really means admin

---
 app/coffee/modules/admin/memberships.coffee           | 2 +-
 app/coffee/modules/admin/project-profile.coffee       | 2 +-
 app/coffee/modules/admin/project-values.coffee        | 2 +-
 app/coffee/modules/admin/roles.coffee                 | 2 +-
 app/coffee/modules/admin/third-parties.coffee         | 2 +-
 app/modules/components/project-menu/project-menu.jade | 2 +-
 app/partials/backlog/backlog.jade                     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index dc4c694a..17d157ee 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -72,7 +72,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
 
     loadProject: ->
         return @rs.projects.getBySlug(@params.pslug).then (project) =>
-            if not project.i_am_owner
+            if not project.i_am_admin
                 @location.path(@navUrls.resolve("permission-denied"))
 
             @scope.projectId = project.id
diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 4a6bee65..9e81d553 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -78,7 +78,7 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
 
     loadProject: ->
         return @rs.projects.getBySlug(@params.pslug).then (project) =>
-            if not project.i_am_owner
+            if not project.i_am_admin
                 @location.path(@navUrls.resolve("permission-denied"))
 
             @scope.projectId = project.id
diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index de031bdc..e4bef2be 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -73,7 +73,7 @@ class ProjectValuesSectionController extends mixOf(taiga.Controller, taiga.PageM
 
     loadProject: ->
         return @rs.projects.getBySlug(@params.pslug).then (project) =>
-            if not project.i_am_owner
+            if not project.i_am_admin
                 @location.path(@navUrls.resolve("permission-denied"))
 
             @scope.projectId = project.id
diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index 1883adc7..f6d3ecff 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -70,7 +70,7 @@ class RolesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fil
 
     loadProject: ->
         return @rs.projects.getBySlug(@params.pslug).then (project) =>
-            if not project.i_am_owner
+            if not project.i_am_admin
                 @location.path(@navUrls.resolve("permission-denied"))
 
             @scope.projectId = project.id
diff --git a/app/coffee/modules/admin/third-parties.coffee b/app/coffee/modules/admin/third-parties.coffee
index ec778ff3..071e669c 100644
--- a/app/coffee/modules/admin/third-parties.coffee
+++ b/app/coffee/modules/admin/third-parties.coffee
@@ -71,7 +71,7 @@ class WebhooksController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.
 
     loadProject: ->
         return @rs.projects.getBySlug(@params.pslug).then (project) =>
-            if not project.i_am_owner
+            if not project.i_am_admin
                 @location.path(@navUrls.resolve("permission-denied"))
 
             @scope.projectId = project.id
diff --git a/app/modules/components/project-menu/project-menu.jade b/app/modules/components/project-menu/project-menu.jade
index acde56ac..3d5a4045 100644
--- a/app/modules/components/project-menu/project-menu.jade
+++ b/app/modules/components/project-menu/project-menu.jade
@@ -93,7 +93,7 @@ nav.menu(
                         use(xlink:href="#icon-bubble")
                     span.helper(translate="PROJECT.SECTION.MEETUP")
 
-            li(id="nav-admin", ng-if="vm.project.get('i_am_owner')")
+            li(id="nav-admin", ng-if="vm.project.get('i_am_admin')")
                 a(
                     tg-nav="project-admin-home:project=vm.project.get('slug')"
                     ng-class="{active: vm.active == 'admin'}"
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index 97d41dbc..046fefb2 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -11,7 +11,7 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
         div.backlog-summary(tg-toggle-burndown-visibility)
             include ../includes/components/summary
 
-            div.empty-burndown(ng-if="showGraphPlaceholder && project.i_am_owner")
+            div.empty-burndown(ng-if="showGraphPlaceholder && project.i_am_admin")
                 svg.icon.icon-graph
                     use(xlink:href="#icon-graph")
                 div.empty-text

From 86848ae3f1cadcc637d56d13fb5c29d5f9e75086 Mon Sep 17 00:00:00 2001
From: Yasuhiro Asaka <grauwoelfchen@gmail.com>
Date: Sun, 28 Feb 2016 18:39:25 +0900
Subject: [PATCH 072/155] Remove a unnecessary double quotation mark

---
 app/modules/projects/project/project.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade
index f24b9239..d7d2dbb6 100644
--- a/app/modules/projects/project/project.jade
+++ b/app/modules/projects/project/project.jade
@@ -63,7 +63,7 @@ div.wrapper
                         title="{{'PROJECT.LOOKING_FOR_PEOPLE' | translate}}"
                     )
                     h3 {{'PROJECT.LOOKING_FOR_PEOPLE' | translate}}
-                    p(ng-if="vm.project.get('looking_for_people_note')") {{::vm.project.get('looking_for_people_note')}}"
+                    p(ng-if="vm.project.get('looking_for_people_note')") {{::vm.project.get('looking_for_people_note')}}
                 h2.title {{"PROJECT.SECTION.TEAM" | translate}}
                 ul.involved-team
                     li(tg-repeat="member in vm.members")

From 21d22a7dfb89e3003e55790bef4a071552d4d88e Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 26 Feb 2016 08:20:43 +0100
Subject: [PATCH 073/155] edit project restrictions (max public/private
 projects)

---
 .../modules/admin/project-profile.coffee      |  29 ++-
 app/coffee/modules/auth.coffee                |  11 +
 app/coffee/modules/resources.coffee           |   1 +
 app/locales/taiga/locale-en.json              |   6 +-
 .../services/current-user.service.coffee      |  48 ++++
 .../services/current-user.service.spec.coffee | 242 ++++++++++++++++++
 app/partials/admin/admin-project-profile.jade |   7 +
 .../admin/admin-project-restrictions.jade     |  11 +
 app/styles/components/buttons.scss            |  12 +
 .../modules/admin/admin-project-profile.scss  |  43 ++++
 gulpfile.js                                   |   3 +-
 test-utils.js                                 |   2 +
 12 files changed, 409 insertions(+), 6 deletions(-)
 create mode 100644 app/partials/admin/admin-project-restrictions.jade

diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 9e81d553..e28b1ef7 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -51,11 +51,13 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
         "$tgLocation",
         "$tgNavUrls",
         "tgAppMetaService",
-        "$translate"
+        "$translate",
+        "$tgAuth",
+        "tgCurrentUserService"
     ]
 
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls,
-                  @appMetaService, @translate) ->
+                  @appMetaService, @translate, @tgAuth, @currentUserService) ->
         @scope.project = {}
 
         promise = @.loadInitialData()
@@ -67,6 +69,11 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
             description = @scope.project.description
             @appMetaService.setAll(title, description)
 
+            @scope.canBePrivateProject = @.currentUserService.canBePrivateProject(@scope.project.id)
+            @scope.canBePublicProject = @.currentUserService.canBePublicProject(@scope.project.id)
+
+            @scope.isPrivateProject = @scope.project.is_private
+
         promise.then null, @.onInitialDataError.bind(@)
 
         @scope.$on "project:loaded", =>
@@ -94,8 +101,10 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
             return project
 
     loadInitialData: ->
-        promise = @.loadProject()
-        return promise
+        return @q.all([
+            @.loadProject(),
+            @tgAuth.refresh()
+        ])
 
     openDeleteLightbox: ->
         @rootscope.$broadcast("deletelightbox:new", @scope.project)
@@ -510,3 +519,15 @@ ProjectLogoModelDirective = ($parse) ->
     return {link:link}
 
 module.directive('tgProjectLogoModel', ['$parse', ProjectLogoModelDirective])
+
+
+AdminProjectRestrictionsDirective = () ->
+    return {
+        scope: {
+            "canBePrivateProject": "=",
+            "canBePublicProject": "="
+        },
+        templateUrl: "admin/admin-project-restrictions.html"
+    }
+
+module.directive('tgAdminProjectRestrictions', [AdminProjectRestrictionsDirective])
diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 452bd217..b6448ca9 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -135,6 +135,17 @@ class AuthService extends taiga.Service
         return false
 
     ## Http interface
+    refresh: () ->
+        url = @urls.resolve("user-me")
+
+        return @http.get(url).then (data, status) =>
+            user = data.data
+            user.token = @.getUser().auth_token
+
+            user = @model.make_model("users", user)
+
+            @.setUser(user)
+            return user
 
     login: (data, type) ->
         url = @urls.resolve("auth")
diff --git a/app/coffee/modules/resources.coffee b/app/coffee/modules/resources.coffee
index fda8262b..a4a45eb9 100644
--- a/app/coffee/modules/resources.coffee
+++ b/app/coffee/modules/resources.coffee
@@ -45,6 +45,7 @@ urls = {
     "user-voted": "/users/%s/voted"
     "user-watched": "/users/%s/watched"
     "user-contacts": "/users/%s/contacts"
+    "user-me": "/users/me"
 
     # User - Notification
     "permissions": "/permissions"
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 138fdb09..28c7e652 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -463,7 +463,11 @@
             "DELETE": "Delete this project",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximun members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximun members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Reports",
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index 568c53f3..44fc08ce 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -118,4 +118,52 @@ class CurrentUserService
 
         return @.projects
 
+    canBePrivateProject: (projectId) ->
+        project = @.projects.get('all').find (project) -> project.get('id') == projectId
+
+        return {valid: true} if project.get('is_private')
+
+        result = @.canCreatePrivateProjects()
+
+        return result if !result.valid
+
+        user = @.getUser()
+
+        if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects')
+            return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
+
+        return {valid: true}
+
+    canBePublicProject: (projectId) ->
+        project = @.projects.get('all').find (project) -> project.get('id') == projectId
+
+        return {valid: true} if !project.get('is_private')
+
+        result = @.canCreatePublicProjects()
+
+        return result if !result.valid
+
+        user = @.getUser()
+
+        if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects')
+            return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
+
+        return {valid: true}
+
+    canCreatePrivateProjects: () ->
+        user = @.getUser()
+
+        if user.get('max_private_projects') != null && user.get('max_private_projects') <= user.get('total_private_projects')
+            return {valid: false, reason: 'max_private_projects', type: 'private_project'}
+
+        return {valid: true}
+
+    canCreatePublicProjects: () ->
+        user = @.getUser()
+
+        if user.get('max_public_projects') != null && user.get('max_public_projects') <= user.get('total_public_projects')
+            return {valid: false, reason: 'max_public_projects', type: 'public_project'}
+
+        return {valid: true}
+
 angular.module("taigaCommon").service("tgCurrentUserService", CurrentUserService)
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index a3fe43b7..32b51b0b 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -203,3 +203,245 @@ describe "tgCurrentUserService", ->
             expect(config).to.be.eql(joyride)
 
             done()
+
+    it "the user can't create private projects if they reach the maximum number of private projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 1,
+            total_private_projects: 1
+        })
+
+        currentUserService._user = user
+
+        result = currentUserService.canCreatePrivateProjects(0)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_private_projects',
+            type: 'private_project'
+        })
+
+    it "the user can create private projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 1,
+            max_members_private_projects: 20
+        })
+
+        currentUserService._user = user
+
+        result = currentUserService.canCreatePrivateProjects(10)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't convert a private project to a public project if they reach the maximum number of members", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 1,
+            max_members_public_projects: 2
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePublicProject(2)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_members_public_projects',
+            type: 'public_project'
+        })
+
+    it "the user can convert private projects to a public project", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 1,
+            max_members_public_projects: 20
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePublicProject(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can convert public projects to a public project if it is already public", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 100,
+            max_members_public_projects: 2
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePublicProject(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't create public projects if they reach the maximum number of private projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 1,
+            total_public_projects: 1
+        })
+
+        currentUserService._user = user
+
+        result = currentUserService.canCreatePublicProjects(0)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_public_projects',
+            type: 'public_project'
+        })
+
+    it "the user can create public projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 10,
+            total_public_projects: 1,
+            max_members_public_projects: 20
+        })
+
+        currentUserService._user = user
+
+        result = currentUserService.canCreatePublicProjects(10)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't convert a public projects to a private project if they reach the maximum number of members", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 10,
+            total_public_projects: 1,
+            max_members_private_projects: 2
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePrivateProject(2)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_members_private_projects',
+            type: 'private_project'
+        })
+
+    it "the user can convert public projects to a private project", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 10,
+            total_public_projects: 1,
+            max_members_private_projects: 20
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePrivateProject(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can convert private project to a private project if it is already private", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 10,
+            total_public_projects: 1,
+            max_members_private_projects: 20
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canBePrivateProject(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index a527c4bb..bb5e3b2e 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -126,10 +126,16 @@ div.wrapper(
                             placeholder="{{ 'ADMIN.PROJECT_PROFILE.RECRUITING_PLACEHOLDER' | translate }}"
                         )
 
+                tg-admin-project-restrictions(
+                    can-be-private-project="canBePrivateProject"
+                    can-be-public-project="canBePublicProject"
+                )
+
                 fieldset
                     .project-privacy-settings
                         div.privacy-option
                             input.privacy-project(
+                                ng-disabled="!canBePublicProject.valid"
                                 type="radio"
                                 id="private-project"
                                 name="privacy-project"
@@ -140,6 +146,7 @@ div.wrapper(
 
                         div.privacy-option
                             input.privacy-project(
+                                ng-disabled="!canBePrivateProject.valid"
                                 type="radio"
                                 id="public-project"
                                 name="privacy-project"
diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade
new file mode 100644
index 00000000..12a481bf
--- /dev/null
+++ b/app/partials/admin/admin-project-restrictions.jade
@@ -0,0 +1,11 @@
+fieldset(ng-if="!canBePrivateProject.valid")
+    p
+      span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
+
+      span(ng-if="canBePrivateProject.reason == 'max_members_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
+
+fieldset(ng-if="!canBePublicProject.valid")
+    p
+      span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
+
+      span(ng-if="canBePublicProject.reason == 'max_members_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index 7c57383b..77c4b389 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -31,6 +31,18 @@
     .icon {
         color: $white;
     }
+    &.disabled,
+    &[disabled] {
+        background: lighten($whitish, 10%);
+        box-shadow: none;
+        color: $gray-light;
+        cursor: not-allowed;
+        opacity: .65;
+        &:hover {
+            background: lighten($whitish, 10%);
+            color: $gray-light;
+        }
+    }
 }
 
 .trans-button {
diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss
index 5e4e0483..50562431 100644
--- a/app/styles/modules/admin/admin-project-profile.scss
+++ b/app/styles/modules/admin/admin-project-profile.scss
@@ -103,4 +103,47 @@
             display: block;
         }
     }
+    .privacy-project[disabled] {
+        + label {
+            background: $whitish;
+            box-shadow: none;
+            color: $gray-light;
+            cursor: not-allowed;
+            opacity: .65;
+            &:hover {
+                background: $whitish;
+                color: $gray-light;
+            }
+        }
+    }
+}
+
+tg-admin-project-restrictions {
+    p {
+        @extend %xsmall;
+        margin-bottom: 0;
+    }
+    span {
+        display: block;
+    }
+    a {
+        color: $primary;
+    }
+    fieldset {
+        text-align: center;
+    }
+    span:first-child {
+        &::before {
+            border: 1px solid $red-light;
+            border-radius: 6px;
+            color: $red-light;
+            content: '!';
+            display: inline-block;
+            height: 12px;
+            line-height: 12px;
+            margin-right: .5rem;
+            text-align: center;
+            width: 12px;
+        }
+    }
 }
diff --git a/gulpfile.js b/gulpfile.js
index 1ea5bd33..92d40f2c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -70,6 +70,7 @@ paths.css_vendor = [
     paths.vendor + "intro.js/introjs.css"
 ];
 paths.locales = paths.app + "locales/**/*.json";
+paths.modulesLocales = paths.app + "modules/**/locales/*.json";
 
 paths.sass = [
     paths.app + "**/*.scss",
@@ -566,7 +567,7 @@ gulp.task("watch", function() {
     gulp.watch(paths.svg, ["copy-svg"]);
     gulp.watch(paths.coffee, ["app-watch"]);
     gulp.watch(paths.libs, ["jslibs-watch"]);
-    gulp.watch(paths.locales, ["locales"]);
+    gulp.watch([paths.locales, paths.modulesLocales], ["locales"]);
     gulp.watch(paths.images, ["copy-images"]);
     gulp.watch(paths.fonts, ["copy-fonts"]);
 });
diff --git a/test-utils.js b/test-utils.js
index 4b33b6ad..751db5a0 100644
--- a/test-utils.js
+++ b/test-utils.js
@@ -30,4 +30,6 @@
         var original = searchOriginal(this);
         original._rejectfn.apply(this, arguments);
     };
+
+    window.addDecorator = function() {};
 }());

From 7e0d0ad04b413a12ba423c5c90c3f365ecb7720d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 26 Feb 2016 14:06:18 +0100
Subject: [PATCH 074/155] Add owner badge to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9ea09e2..6b75f68c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 ### Features
 - Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).
 - Moved from iconfont to SVG sprite icon system and redesign.
+- Add badge to project owners
 
 ### Misc
 - Lots of small and not so small bugfixes.

From ecb7aa2a2b92aded44d6989e6afa46a7fcdad90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 26 Feb 2016 10:35:53 +0100
Subject: [PATCH 075/155] Add badge to project owner

---
 app/coffee/modules/admin/memberships.coffee   |  1 +
 app/coffee/modules/team/main.coffee           | 19 ++++++++-------
 app/locales/taiga/locale-en.json              |  1 +
 .../projects/listing/projects-listing.jade    | 13 +++++------
 .../projects/listing/styles/project-list.scss |  9 +++++++-
 app/modules/projects/project/project.jade     |  3 +++
 .../admin/memberships-row-avatar.jade         |  5 ++++
 .../includes/modules/team/team-table.jade     | 13 ++++++++++-
 .../team/team-member-current-user.jade        |  8 +++++--
 app/partials/team/team-members.jade           | 23 +++++++++++++------
 app/styles/modules/home-project.scss          |  6 +++++
 app/styles/modules/team/team-table.scss       |  4 ++++
 app/svg/sprite.svg                            |  6 ++---
 13 files changed, 82 insertions(+), 29 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 17d157ee..bd3dc25e 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -224,6 +224,7 @@ MembershipsRowAvatarDirective = ($log, $template, $translate) ->
                 email: if member.user_email then member.user_email else member.email
                 imgurl: if member.photo then member.photo else "/" + window._version + "/images/unnamed.png"
                 pending: if !member.is_user_active then pending else ""
+                isOwner: member.is_owner
             }
 
             html = template(ctx)
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 3de5ade8..b74006f4 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -95,6 +95,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.issuesEnabled = project.is_issues_activated
             @scope.tasksEnabled = project.is_kanban_activated or project.is_backlog_activated
             @scope.wikiEnabled = project.is_wiki_activated
+            @scope.owner = project.owner.id
 
             return project
 
@@ -185,10 +186,11 @@ TeamMemberCurrentUserDirective = () ->
         scope: {
             projectId: "=projectid",
             currentUser: "=currentuser",
-            stats: "="
-            issuesEnabled: "=issuesenabled"
-            tasksEnabled: "=tasksenabled"
-            wikiEnabled: "=wikienabled"
+            stats: "=",
+            issuesEnabled: "=issuesenabled",
+            tasksEnabled: "=tasksenabled",
+            wikiEnabled: "=wikienabled",
+            owner: "=owner"
         }
     }
 
@@ -208,10 +210,11 @@ TeamMembersDirective = () ->
             memberships: "=",
             filtersQ: "=filtersq",
             filtersRole: "=filtersrole",
-            stats: "="
-            issuesEnabled: "=issuesenabled"
-            tasksEnabled: "=tasksenabled"
-            wikiEnabled: "=wikienabled"
+            stats: "=",
+            issuesEnabled: "=issuesenabled",
+            tasksEnabled: "=tasksenabled",
+            wikiEnabled: "=wikienabled",
+            owner: "=owner"
         }
     }
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 28c7e652..11a0ec7a 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "This value seems to be invalid.",
diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade
index 69a6dfe0..237e1061 100644
--- a/app/modules/projects/listing/projects-listing.jade
+++ b/app/modules/projects/listing/projects-listing.jade
@@ -49,16 +49,15 @@
                                     )
                                         svg.icon.icon-lock
                                             use(xlink:href="#icon-lock")
+                                    
+                                    svg.icon.icon-badge(ng-if="project.get('i_am_owner')")
+                                        use(xlink:href="#icon-badge")
+                                            title(translate="COMMON.OWNER")
+                                            
+                                            
                                 p {{ ::project.get('description') | limitTo:300 }}
                                     span(ng-if="::project.get('description').length > 300") ...
 
-                        .list-itemtype-project-tags.tag-container(ng-if="::project.get('tags').size")
-                            span.tag(
-                                style='border-left: 5px solid {{::tag.get("color")}};'
-                                tg-repeat="tag in ::project.get('colorized_tags')"
-                            )
-                                span.tag-name {{::tag.get('name')}}
-
                     svg.drag.icon.icon-drag
                         use(xlink:href="#icon-drag")
 
diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss
index 522358f2..f2599a51 100644
--- a/app/modules/projects/listing/styles/project-list.scss
+++ b/app/modules/projects/listing/styles/project-list.scss
@@ -13,6 +13,13 @@
             margin: 0;
         }
     }
+    .icon-lock,
+    .icon-badge {
+        @include svg-size();
+    }
+    .icon-badge {
+        margin-left: .5rem;
+    }
     .create-project-btn {
         margin-right: .25rem;
         padding: .6rem 2.5rem;
@@ -48,7 +55,7 @@
     .list-itemtype-project {
         background: rgba($white, .6);
         &:hover {
-            background: lighten($primary, 63%);
+            background: rgba($primary-light, .1);
             cursor: move;
             transition: background .3s;
             .drag {
diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade
index d7d2dbb6..89a52c87 100644
--- a/app/modules/projects/project/project.jade
+++ b/app/modules/projects/project/project.jade
@@ -72,3 +72,6 @@ div.wrapper
                             title="{{::member.get('full_name')}}"
                         )
                             img(ng-src="{{::member.get('photo')}}", alt="{{::member.get('full_name')}}")
+                            svg.icon.icon-badge(ng-if="member.get('id') == vm.project.getIn(['owner', 'id'])")
+                                use(xlink:href="#icon-badge")
+                                    title(translate="COMMON.OWNER")
diff --git a/app/partials/admin/memberships-row-avatar.jade b/app/partials/admin/memberships-row-avatar.jade
index 838f44cc..294a0143 100644
--- a/app/partials/admin/memberships-row-avatar.jade
+++ b/app/partials/admin/memberships-row-avatar.jade
@@ -2,6 +2,11 @@ figure.avatar
     img(src!="<%- imgurl %>", alt!="<%- full_name %>")
     figcaption
         span.name <%- full_name %>
+            <% if (isOwner) { %>
+            svg.icon.icon-badge
+                use(xlink:href="#icon-badge")
+                    title(translate="COMMON.OWNER")
+            <% }  %>
         div
             span.pending <%- pending %>
             span.email <%- email %>
diff --git a/app/partials/includes/modules/team/team-table.jade b/app/partials/includes/modules/team/team-table.jade
index 27dc7e42..0f9ac475 100644
--- a/app/partials/includes/modules/team/team-table.jade
+++ b/app/partials/includes/modules/team/team-table.jade
@@ -35,6 +35,7 @@ section.table-team.basic-table
         issuesEnabled="issuesEnabled"
         tasksenabled="tasksEnabled"
         wikienabled="wikiEnabled"
+        owner="owner"
         ng-if="::currentUser"
     )
 
@@ -42,4 +43,14 @@ h2(ng-show="memberships.length")
     span(translate="TEAM.SECTION_TITLE_TEAM")
     span  {{filtersRole.name || ("TEAM.SECTION_FILTER_ALL" | translate)}}
 
-section.table-team.basic-table(tg-team-members, memberships="memberships", stats="stats", filtersq="filtersQ", filtersrole="filtersRole", issuesEnabled="issuesEnabled", tasksenabled="tasksEnabled", wikienabled="wikiEnabled")
+section.table-team.basic-table(
+    tg-team-members
+    memberships="memberships"
+    stats="stats"
+    filtersq="filtersQ"
+    filtersrole="filtersRole"
+    issuesEnabled="issuesEnabled"
+    tasksenabled="tasksEnabled"
+    wikienabled="wikiEnabled"
+    owner="owner"
+)
diff --git a/app/partials/team/team-member-current-user.jade b/app/partials/team/team-member-current-user.jade
index f8fa273e..623c936c 100644
--- a/app/partials/team/team-member-current-user.jade
+++ b/app/partials/team/team-member-current-user.jade
@@ -4,9 +4,13 @@
             img(tg-bo-src="currentUser.photo", tg-bo-alt="currentUser.full_name_display")
 
             .avatar-data
-                span.name(tg-bo-bind="currentUser.full_name_display")
+                .name
+                    span(tg-bo-bind="currentUser.full_name_display")
+                    svg.icon.icon-badge(ng-if="currentUser.id == owner")
+                        use(xlink:href="#icon-badge")
+                            title(translate="COMMON.OWNER")
 
-                span.position(tg-bo-bind="currentUser.role_name")
+                .position(tg-bo-bind="currentUser.role_name")
 
                 div(tg-leave-project="", projectid="{{projectId}}")
 
diff --git a/app/partials/team/team-members.jade b/app/partials/team/team-members.jade
index 342d0bf6..1c88dfde 100644
--- a/app/partials/team/team-members.jade
+++ b/app/partials/team/team-members.jade
@@ -4,12 +4,21 @@
             img(tg-bo-src="user.photo", tg-bo-alt="user.full_name_display")
 
             .avatar-data
-                a.name(tg-nav="user-profile:username=user.username",
-                       title="{{::user.full_name_display}}") {{::user.full_name_display}}
+                a.name(
+                    tg-nav="user-profile:username=user.username",
+                    title="{{::user.full_name_display}}"
+                ) {{::user.full_name_display}}
+                    svg.icon.icon-badge(ng-if="user.id == owner")
+                        use(xlink:href="#icon-badge")
+                            title(translate="COMMON.OWNER")
+                    
                 span.position {{::user.role_name}}
 
-    .member-stats(tg-team-member-stats, stats="stats",
-                                        user="user.user",
-                                        issuesEnabled="issuesEnabled",
-                                        tasksenabled="tasksEnabled",
-                                        wikienabled="wikiEnabled")
+    .member-stats(
+        tg-team-member-stats
+        stats="stats"
+        user="user.user"
+        issuesEnabled="issuesEnabled"
+        tasksenabled="tasksEnabled"
+        wikienabled="wikiEnabled"
+    )
diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss
index a58aab65..70c5d1eb 100644
--- a/app/styles/modules/home-project.scss
+++ b/app/styles/modules/home-project.scss
@@ -96,6 +96,7 @@
         li {
             flex-basis: 24%;
             margin-right: .14rem;
+            position: relative;
             &:nth-child(4n) {
                 margin-right: 0;
             }
@@ -107,5 +108,10 @@
             border-radius: .2rem;
             width: 100%;
         }
+        .icon-badge {
+            bottom: 15%;
+            position: absolute;
+            right: 15%;
+        }
     }
 }
diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss
index a84e4660..1e2edc11 100644
--- a/app/styles/modules/team/team-table.scss
+++ b/app/styles/modules/team/team-table.scss
@@ -100,4 +100,8 @@
     .popover {
         @include popover(100%, '', 0, 30px, '', 15px, '', 50%, -5px);
     }
+    .icon-badge {
+        position: relative;
+        top: .15rem;
+    }
 }
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
index cd74aed7..a0283ab7 100644
--- a/app/svg/sprite.svg
+++ b/app/svg/sprite.svg
@@ -361,9 +361,9 @@
             <title>Looking for people</title>
             <path d="M510.5 3l-159 141.7-207 14.2-19.3 203L0 513.4l125.2 151.2 19.3 208 207 19 159 132.3 159-132.4 207-19 14.5-203L1021 518 896 362.2 876.6 159l-207-19-159-137zm0 250.5c72.3 0 135 56.7 135 132.3 0 75.7-62.7 132.4-135 132.4-72.2 0-134.8-56.7-134.8-127.6 0-71 62.6-127.7 134.8-127.7zm0 331c96.4 0 269.8 47 269.8 127.5v66.2H240.8V712c0-85 178.2-132.4 269.7-132.4z"/>
         </symbol>
-        <symbol id="icon-activity" viewBox="0 0 1024 1024">
-            <title>Activity</title>
-            <path d="M715.5 206.7l117 117-249.3 246.8L379.7 367 3.2 748.6l71.2 68.7L379.7 512l203.5 203.5L903.8 395l117 117V206.7z"/>
+        <symbol id="icon-badge" viewBox="0 0 1024 1024">
+            <title>Owner Badge</title>
+            <path fill="#9dce0a" d="M512.053 24.761l-130.433 173.609-213.936-30.392 30.427 214.125-173.349 130.201 173.349 130.2-30.427 214.123 214.747-30.506 130.064 173.118 129.997-173.027 214.355 30.451-30.588-215.258 172.981-129.922-172.497-129.561 30.458-214.345-214.912 30.53-130.235-173.346z"></path>
         </symbol>
     </defs>
 </svg>

From 10e5af68471f98cbe1e8b0fca89334aa131559ed Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 1 Mar 2016 10:33:47 +0100
Subject: [PATCH 076/155] projects block warning

---
 app/coffee/modules/user-settings/lightboxes.coffee  |  4 ++--
 app/locales/taiga/locale-en.json                    |  6 ++++--
 .../user/lightbox/lightbox-delete-account.jade      | 13 +++++++------
 app/styles/modules/common/lightbox.scss             |  3 +++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/coffee/modules/user-settings/lightboxes.coffee b/app/coffee/modules/user-settings/lightboxes.coffee
index 4906c7e9..68545809 100644
--- a/app/coffee/modules/user-settings/lightboxes.coffee
+++ b/app/coffee/modules/user-settings/lightboxes.coffee
@@ -53,11 +53,11 @@ DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxSe
             promise.then null, ->
                 console.log "FAIL"
 
-        $el.on "click", ".button-red", (event) ->
+        $el.on "click", ".button-green", (event) ->
             event.preventDefault()
             lightboxService.close($el)
 
-        $el.on "click", ".button-green", debounce 2000, (event) ->
+        $el.on "click", ".button-red", debounce 2000, (event) ->
             event.preventDefault()
             submit()
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 11a0ec7a..9ab57ff9 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -826,8 +826,10 @@
             "SECTION_NAME": "Delete Taiga Account",
             "CONFIRM": "Are you sure you want to delete your Taiga account?",
             "SUBTITLE": "We're going to miss you! :-(",
-            "NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore"
-
+            "NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Delete project",
diff --git a/app/partials/user/lightbox/lightbox-delete-account.jade b/app/partials/user/lightbox/lightbox-delete-account.jade
index f7915fdd..b59670cb 100644
--- a/app/partials/user/lightbox/lightbox-delete-account.jade
+++ b/app/partials/user/lightbox/lightbox-delete-account.jade
@@ -2,12 +2,13 @@ a.close(href="", title="{{'close' | translate}}")
     svg.icon.icon-close
         use(xlink:href="#icon-close")
 form
-    h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.SECTION_NAME")
+    h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.CONFIRM")
     p
-        span.question(translate="LIGHTBOX.DELETE_ACCOUNT.CONFIRM")
         span.subtitle(translate="LIGHTBOX.DELETE_ACCOUNT.SUBTITLE")
+
+    p(ng-bind-html="'LIGHTBOX.DELETE_ACCOUNT.BLOCK_PROJECT' | translate")
     div.options
-        a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
-            span(translate="COMMON.ACCEPT")
-        a.button-red(href="", title="{{'Cancel' | translate}}", )
-            span(translate="COMMON.CANCEL")
+        a.button-green(href="", title="{{'LIGHTBOX.DELETE_ACCOUNT.CANCEL' | translate}}")
+            span(translate="LIGHTBOX.DELETE_ACCOUNT.CANCEL")
+        a.button-red(href="", title="{{'LIGHTBOX.DELETE_ACCOUNT.ACCEPT' | translate}}")
+            span(translate="LIGHTBOX.DELETE_ACCOUNT.ACCEPT")
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index e2cf502c..2cc9ed85 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -325,6 +325,9 @@
 }
 
 .lightbox-delete-account {
+    p {
+        text-align: center;
+    }
     form {
         flex-basis: 420px;
         flex-grow: 0;

From 8cc02a9cbfecc97e766640f1c2cdadbf53f61348 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 1 Mar 2016 15:27:15 +0100
Subject: [PATCH 077/155] fix max members restrictions

---
 app/modules/services/current-user.service.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index 44fc08ce..a14ffb8d 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -129,7 +129,7 @@ class CurrentUserService
 
         user = @.getUser()
 
-        if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects')
+        if user.get('max_members_private_projects') != null && project.get('members').size > user.get('max_members_private_projects')
             return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
 
         return {valid: true}
@@ -145,7 +145,7 @@ class CurrentUserService
 
         user = @.getUser()
 
-        if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects')
+        if user.get('max_members_public_projects') != null && project.get('members').size > user.get('max_members_public_projects')
             return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
 
         return {valid: true}

From a53d61267b775c0857326d06e54849de0509d269 Mon Sep 17 00:00:00 2001
From: Andrea Stagi <stagi.andrea@gmail.com>
Date: Tue, 1 Mar 2016 16:33:37 +0100
Subject: [PATCH 078/155] Fix bug on save/close related task form directive

---
 app/coffee/modules/related-tasks.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index 700d0873..0a44213c 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -170,10 +170,10 @@ RelatedTaskCreateFormDirective = ($repo, $compile, $confirm, $tgmodel, $loading,
                 else if event.keyCode == 27
                     $scope.$apply () -> close()
 
-            $el.on "click", ".icon-delete", (event)->
+            $el.on "click", ".icon-close", (event)->
                 $scope.$apply () -> close()
 
-            $el.on "click", ".icon-floppy", (event)->
+            $el.on "click", ".icon-save", (event)->
                 createTask(newTask).then ->
                     close()
 

From fd45a02fef073d43c9f67aa9ca1792d78a92eafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 22 Feb 2016 16:30:00 +0100
Subject: [PATCH 079/155] Redesign Taiga modules

---
 CHANGELOG.md                                  |   1 +
 .../modules/admin/project-profile.coffee      |  40 +--
 app/locales/taiga/locale-en.json              |  10 +-
 app/partials/admin/admin-project-modules.jade | 244 +++++++++++-------
 app/partials/admin/admin-project-profile.jade |  24 --
 app/partials/backlog/backlog.jade             |   2 +-
 app/styles/components/check.scss              |   4 +-
 .../modules/admin/admin-functionalities.scss  | 109 ++++----
 8 files changed, 252 insertions(+), 182 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b75f68c..3edcdd55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 ### Features
 - Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).
 - Moved from iconfont to SVG sprite icon system and redesign.
+- Redesign 'Admin > Project > Modules' panel.
 - Add badge to project owners
 
 ### Misc
diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index e28b1ef7..144970de 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -207,41 +207,51 @@ ProjectModulesDirective = ($repo, $confirm, $loading, projectService) ->
     link = ($scope, $el, $attrs) ->
         submit = =>
             form = $el.find("form").checksley()
+            form.initializeFields() # Need to reset the form constrains
+            form.reset() # Need to reset the form constrains
             return if not form.validate()
 
-            target = angular.element(".admin-functionalities .submit-button")
-            currentLoading = $loading()
-                .target(target)
-                .start()
-
             promise = $repo.save($scope.project)
             promise.then ->
-                currentLoading.finish()
-                $confirm.notify("success")
                 $scope.$emit("project:loaded", $scope.project)
+                $confirm.notify("success")
 
                 projectService.fetchProject()
 
             promise.then null, (data) ->
-                currentLoading.finish()
-                $confirm.notify("error", data._error_message)
+                form.setErrors(data)
+                if data._error_message
+                    $confirm.notify("error", data._error_message)
+
+        $el.on "change", ".module-activation.module-direct-active input", (event) ->
+            event.preventDefault()
+            submit()
 
         $el.on "submit", "form", (event) ->
             event.preventDefault()
             submit()
 
-        $el.on "click", ".admin-functionalities a.button-green", (event) ->
+        $el.on "click", ".icon-save", (event) ->
             event.preventDefault()
             submit()
 
-        $scope.$watch "isVideoconferenceActivated", (isVideoconferenceActivated) ->
-            if isVideoconferenceActivated
-                $el.find(".videoconference-attributes").removeClass("hidden")
-            else
-                $el.find(".videoconference-attributes").addClass("hidden")
+        $el.on "keydown", ".videoconference-attributes input", (e) ->
+            return e.which != 32
+
+        $scope.$watch "project.videoconferences", (newVal, oldVal) ->
+            # Reset videoconferences_extra_data if videoconference system change
+            if newVal? and oldVal? and newVal != oldVal
+                $scope.project.videoconferences_extra_data = ""
+
+        $scope.$watch "isVideoconferenceActivated", (newValue, oldValue) ->
+            if newValue == false
+                # Reset videoconference attributes
                 $scope.project.videoconferences = null
                 $scope.project.videoconferences_extra_data = ""
 
+                # Save when videoconference is desactivated
+                submit() if oldValue == true
+
         $scope.$watch "project", (project) ->
             if project.videoconferences?
                 $scope.isVideoconferenceActivated = true
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 11a0ec7a..34bbf115 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -430,6 +430,10 @@
             "DISABLE": "Disable",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Manage your user stories to maintain an organized view of upcoming and prioritized work.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organize your project in a lean way with this board.",
             "ISSUES": "Issues",
@@ -437,9 +441,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Add, modify, or delete content in collaboration with others. This is the right place for your project documentation.",
             "MEETUP": "Meet Up",
-            "MEETUP_DESCRIPTION": "Choose your videoconference system. Even developers need face to face contact.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Select a videoconference system",
-            "SALT_CHAT_ROOM": "If you want you can append a salt code to the name of the chat room",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -451,8 +455,6 @@
             "PROJECT_DETAILS": "Project details",
             "PROJECT_NAME": "Project name",
             "PROJECT_SLUG": "Project slug",
-            "NUMBER_SPRINTS": "Number of sprints (0 for an undetermined quantity)",
-            "NUMBER_US_POINTS": "Number of US points (0 for an undetermined quantity)",
             "TAGS": "Tags",
             "DESCRIPTION": "Description",
             "RECRUITING": "Is this project looking for people?",
diff --git a/app/partials/admin/admin-project-modules.jade b/app/partials/admin/admin-project-modules.jade
index fac254da..93ae5d6b 100644
--- a/app/partials/admin/admin-project-modules.jade
+++ b/app/partials/admin/admin-project-modules.jade
@@ -1,7 +1,10 @@
 doctype html
 
-div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl",
-            ng-init="section='admin'; sectionName='ADMIN.MODULES.TITLE'")
+div.wrapper(
+    tg-project-modules
+    ng-controller="ProjectProfileController as ctrl"
+    ng-init="section='admin'; sectionName='ADMIN.MODULES.TITLE'"
+)
     tg-project-menu
     sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="project-profile")
         include ../includes/modules/admin-menu
@@ -13,94 +16,159 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
         header
             include ../includes/components/mainTitle
 
-        form
-            div.functionality(ng-class="{true:'active', false:''}[project.is_backlog_activated]")
-                svg.icon.icon-scrum
-                    use(xlink:href="#icon-scrum")
-                div.desc
-                    p
-                        span.title(translate="ADMIN.MODULES.BACKLOG")
-                        span(translate="ADMIN.MODULES.BACKLOG_DESCRIPTION")
-                    div.activate
-                        input.activate-input(type="checkbox", id="functionality-backlog",
-                                             ng-model="project.is_backlog_activated")
-                        label.button.button-gray(ng-switch="project.is_backlog_activated",
-                                                 for="functionality-backlog")
-                            span(ng-switch-when="true", translate="ADMIN.MODULES.DISABLE")
-                            span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
+        form.module-container
+            .module.module-scrum(ng-class="{true:'active', false:''}[project.is_backlog_activated]")
+                .module-icon
+                    svg.icon.icon-scrum
+                        use(xlink:href="#icon-scrum")
+                .module-name(translate="ADMIN.MODULES.BACKLOG")
+                .module-desc
+                    p(translate="ADMIN.MODULES.BACKLOG_DESCRIPTION")
+                    .module-desc-options(ng-if="project.is_backlog_activated")
+                        fieldset
+                            label(for="total-sprints") {{ 'ADMIN.MODULES.NUMBER_SPRINTS' | translate }}
+                            input(
+                                id="total-sprints"
+                                name="total-sprints"
+                                type="number"
+                                min="0"
+                                placeholder="{{'ADMIN.MODULES.NUMBER_SPRINTS_HELP' | translate}}"
+                                ng-model="project.total_milestones"
+                                data-type="digits"
+                            )
 
-            div.functionality(ng-class="{true:'active', false:''}[project.is_kanban_activated]")
-                svg.icon.icon-kanban
-                    use(xlink:href="#icon-kanban")
-                div.desc
-                    p
-                        span.title(translate="ADMIN.MODULES.KANBAN")
-                        span(translate="ADMIN.MODULES.KANBAN_DESCRIPTION")
-                    div.activate
-                        input.activate-input(type="checkbox", id="functionality-kanban",
-                                             ng-model="project.is_kanban_activated")
-                        label.button.button-gray(ng-switch="project.is_kanban_activated",
-                                                 for="functionality-kanban")
-                            span(ng-switch-when="true", translate="ADMIN.MODULES.DISABLE")
-                            span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
+                        fieldset
+                            label(for="total-story-points") {{ 'ADMIN.MODULES.NUMBER_US_POINTS' | translate }}
+                            input(
+                                id="total-story-points"
+                                name="total-story-points"
+                                type="number"
+                                min="0"
+                                placeholder="{{'ADMIN.MODULES.NUMBER_US_POINTS_HELP' | translate}}"
+                                ng-model="project.total_story_points"
+                                data-type="digits"
+                            )
+                        svg.icon.icon-save(ng-if="project.is_backlog_activated")
+                            use(xlink:href="#icon-save")
+                .module-activation.module-direct-active
+                    div.check
+                        input.activate-input(
+                            id="functionality-backlog"
+                            name="functionality-backlog"
+                            type="checkbox"
+                            ng-checked="project.is_backlog_activated"
+                            ng-model="project.is_backlog_activated"
+                        )
+                        div
+                        span.check-text.check-yes(translate="COMMON.YES")
+                        span.check-text.check-no(translate="COMMON.NO")
 
-            div.functionality(ng-class="{true:'active', false:''}[project.is_issues_activated]")
-                svg.icon.icon-issues
-                    use(xlink:href="#icon-issues")
-                div.desc
-                    p
-                        span.title(translate="ADMIN.MODULES.ISSUES")
-                        span(translate="ADMIN.MODULES.ISSUES_DESCRIPTION")
-                    div.activate
-                        input.activate-input(type="checkbox", id="functionality-issues",
-                                             ng-model="project.is_issues_activated")
-                        label.button.button-gray(ng-switch="project.is_issues_activated",
-                                                 for="functionality-issues")
-                            span(ng-switch-when="true", translate="ADMIN.MODULES.DISABLE")
-                            span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
+            .module.module-kanban(ng-class="{true:'active', false:''}[project.is_kanban_activated]")
+                .module-icon
+                    svg.icon.icon-kanban
+                        use(xlink:href="#icon-kanban")
+                .module-name(translate="ADMIN.MODULES.KANBAN")
+                .module-desc(translate="ADMIN.MODULES.KANBAN_DESCRIPTION")
+                .module-activation.module-direct-active
+                    div.check
+                        input.activate-input(
+                            id="functionality-kanban"
+                            name="functionality-kanban"
+                            type="checkbox"
+                            ng-checked="project.is_kanban_activated"
+                            ng-model="project.is_kanban_activated"
+                        )
+                        div
+                        span.check-text.check-yes(translate="COMMON.YES")
+                        span.check-text.check-no(translate="COMMON.NO")
 
-            div.functionality(ng-class="{true:'active', false:''}[project.is_wiki_activated]")
-                svg.icon.icon-wiki
-                    use(xlink:href="#icon-wiki")
-                div.desc
-                    p
-                        span.title(translate="ADMIN.MODULES.WIKI")
-                        span(translate="ADMIN.MODULES.WIKI_DESCRIPTION")
-                    div.activate
-                        input.activate-input(type="checkbox", id="functionality-wiki",
-                                             ng-model="project.is_wiki_activated")
-                        label.button.button-gray(ng-switch="project.is_wiki_activated",
-                                                 for="functionality-wiki")
-                            span(ng-switch-when="true", translate="ADMIN.MODULES.DISABLE")
-                            span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
+            .module.module-issues(ng-class="{true:'active', false:''}[project.is_issues_activated]")
+                .module-icon
+                    svg.icon.icon-issues
+                        use(xlink:href="#icon-issues")
+                .module-name(translate="ADMIN.MODULES.ISSUES")
+                .module-desc(translate="ADMIN.MODULES.ISSUES_DESCRIPTION")
+                .module-activation.module-direct-active
+                    div.check
+                        input.activate-input(
+                            id="functionality-issues"
+                            name="functionality-issues"
+                            type="checkbox"
+                            ng-checked="project.is_issues_activated"
+                            ng-model="project.is_issues_activated"
+                        )
+                        div
+                        span.check-text.check-yes(translate="COMMON.YES")
+                        span.check-text.check-no(translate="COMMON.NO")
 
-            div.functionality(ng-class="{true:'active', false:''}[isVideoconferenceActivated]")
-                svg.icon.icon-bubble-empty
-                    use(xlink:href="#icon-bubble-empty")
-                div.desc
-                    p
-                        span.title(translate="ADMIN.MODULES.MEETUP")
-                        span(translate="ADMIN.MODULES.MEETUP_DESCRIPTION")
-                    div.activate
-                        input.activate-input(type="checkbox", id="functionality-video",
-                                             ng-model="isVideoconferenceActivated")
-                        label.button.button-gray(ng-switch="isVideoconferenceActivated",
-                                                 for="functionality-video")
-                            span(ng-switch-when="true", translate="ADMIN.MODULES.DISABLE")
-                            span(ng-switch-when="false", translate="ADMIN.MODULES.ENABLE")
+            .module.module-wiki(ng-class="{true:'active', false:''}[project.is_wiki_activated]")
+                .module-icon
+                    svg.icon.icon-wiki
+                        use(xlink:href="#icon-wiki")
+                .module-name(translate="ADMIN.MODULES.WIKI")
+                .module-desc(translate="ADMIN.MODULES.WIKI_DESCRIPTION")
+                .module-activation.module-direct-active
+                    div.check
+                        input.activate-input(
+                            id="functionality-wiki"
+                            name="functionality-wiki"
+                            type="checkbox"
+                            ng-checked="project.is_wiki_activated"
+                            ng-model="project.is_wiki_activated"
+                        )
+                        div
+                        span.check-text.check-yes(translate="COMMON.YES")
+                        span.check-text.check-no(translate="COMMON.NO")
 
-                    div.videoconference-attributes.hidden
-                        select(ng-model="project.videoconferences",
-                               ng-options="e.id as e.name|translate for e in [{'id':'appear-in', 'name':'ADMIN.MODULES.APPEARIN_CHAT_ROOM'},{'id':'jitsi', 'name': 'ADMIN.MODULES.JITSI_CHAT_ROOM'},{'id':'talky', 'name': 'ADMIN.MODULES.TALKY_CHAT_ROOM'},{'id':'custom', 'name': 'ADMIN.MODULES.CUSTOM_CHAT_ROOM'}]")
-                            option(value="", translate="ADMIN.MODULES.SELECT_VIDEOCONFERENCE")
-                        input(ng-if="project.videoconferences && project.videoconferences != 'custom'",
-                              type="text",
-                              ng-model="project.videoconferences_extra_data",
-                              data-maxlength="255",
-                              placeholder="{{'ADMIN.MODULES.SALT_CHAT_ROOM' | translate}}")
-                        input(ng-if="project.videoconferences == 'custom'",
-                              type="text",
-                              ng-model="project.videoconferences_extra_data",
-                              data-maxlength="255",
-                              placeholder="{{'ADMIN.MODULES.URL_CHAT_ROOM' | translate}}")
-            button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
+            .module.module-videoconference(ng-class="{true:'active', false:''}[isVideoconferenceActivated]")
+                .module-icon
+                    svg.icon.icon-bubble-empty
+                        use(xlink:href="#icon-bubble-empty")
+                .module-name(translate="ADMIN.MODULES.MEETUP")
+                .module-desc
+                    p(translate="ADMIN.MODULES.MEETUP_DESCRIPTION")
+                    div.videoconference-attributes(ng-if="isVideoconferenceActivated")
+                        select(
+                            id="videoconference-type"
+                            name="videoconference-type"
+                            ng-model="project.videoconferences"
+                            ng-options="e.id as e.name|translate for e in [{'id':'appear-in', 'name':'ADMIN.MODULES.APPEARIN_CHAT_ROOM'},{'id':'jitsi', 'name': 'ADMIN.MODULES.JITSI_CHAT_ROOM'},{'id':'talky', 'name': 'ADMIN.MODULES.TALKY_CHAT_ROOM'},{'id':'custom', 'name': 'ADMIN.MODULES.CUSTOM_CHAT_ROOM'}]")
+                            option(
+                                value=""
+                                translate="ADMIN.MODULES.SELECT_VIDEOCONFERENCE"
+                            )
+                        fieldset(ng-if="project.videoconferences && project.videoconferences != 'custom'")
+                            input(
+                                id="videoconference-prefix"
+                                name="videoconference-prefix"
+                                type="text"
+                                ng-model="project.videoconferences_extra_data"
+                                data-maxlength="250"
+                                placeholder="{{'ADMIN.MODULES.SALT_CHAT_ROOM' | translate}}"
+                            )
+                        fieldset(ng-if="project.videoconferences == 'custom'")
+                            input(
+                                id="videoconference-url"
+                                name="videoconference-url"
+                                type="url"
+                                ng-model="project.videoconferences_extra_data"
+                                data-maxlength="250"
+                                placeholder="{{'ADMIN.MODULES.URL_CHAT_ROOM' | translate}}"
+                                data-type="url"
+                                data-required="true"
+                            )
+                        svg.icon.icon-save(ng-if="project.videoconferences")
+                            use(xlink:href="#icon-save")
+
+                .module-activation
+                    div.check
+                        input.activate-input(
+                            id="functionality-video"
+                            name="functionality-video"
+                            type="checkbox"
+                            ng-checked="project.isVideoconferenceActivated"
+                            ng-model="isVideoconferenceActivated"
+                        )
+                        div
+                        span.check-text.check-yes(translate="COMMON.YES")
+                        span.check-text.check-no(translate="COMMON.NO")
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index bb5e3b2e..229739af 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -78,30 +78,6 @@ div.wrapper(
                         ng-model="project.tags"
                     )
 
-                fieldset
-                    label(for="project-sprints") {{ 'ADMIN.PROJECT_PROFILE.NUMBER_SPRINTS' | translate }}
-                    input(
-                        type="number"
-                        name="total_milestones"
-                        min="0"
-                        placeholder="{{'ADMIN.PROJECT_PROFILE.NUMBER_SPRINTS' | translate}}"
-                        id="project-sprints"
-                        ng-model="project.total_milestones"
-                        data-type="digits"
-                    )
-
-                fieldset
-                    label(for="total-story-points") {{ 'ADMIN.PROJECT_PROFILE.NUMBER_US_POINTS' | translate }}
-                    input(
-                        type="number"
-                        name="total_story_points"
-                        min="0"
-                        placeholder="{{'ADMIN.PROJECT_PROFILE.NUMBER_US_POINTS' | translate}}"
-                        id="total-story-points"
-                        ng-model="project.total_story_points"
-                        data-type="digits"
-                    )
-
                 fieldset.looking-for-people
                     .looking-for-people-selector
                         span {{ 'ADMIN.PROJECT_PROFILE.RECRUITING' | translate }}
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index 046fefb2..11556f1a 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -16,7 +16,7 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
                     use(xlink:href="#icon-graph")
                 div.empty-text
                     p.title(translate="BACKLOG.CUSTOMIZE_GRAPH")
-                    p {{'BACKLOG.CUSTOMIZE_GRAPH_TEXT' | translate}} #[a(href="", tg-nav="project-admin-project-profile-details:project=project.slug", title="{{'BACKLOG.CUSTOMIZE_GRAPH_TITLE' | translate}}") {{'BACKLOG.CUSTOMIZE_GRAPH_ADMIN' | translate}}]
+                    p {{'BACKLOG.CUSTOMIZE_GRAPH_TEXT' | translate}} #[a(href="", tg-nav="project-admin-project-profile-modules:project=project.slug", title="{{'BACKLOG.CUSTOMIZE_GRAPH_TITLE' | translate}}") {{'BACKLOG.CUSTOMIZE_GRAPH_ADMIN' | translate}}]
 
             div.graphics-container.js-burndown-graph
                 div.burndown(tg-burndown-backlog-graph)
diff --git a/app/styles/components/check.scss b/app/styles/components/check.scss
index 1cada375..176b1b2e 100644
--- a/app/styles/components/check.scss
+++ b/app/styles/components/check.scss
@@ -8,12 +8,12 @@
     width: 65px;
     input {
         cursor: pointer;
-        height: 500px;
+        height: 50px;
         left: -10px;
         opacity: 0;
         position: absolute;
         top: -10px;
-        width: 500px;
+        width: 100px;
         z-index: 999;
         + div {
             background-color: $gray;
diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss
index e928d937..0dacc074 100644
--- a/app/styles/modules/admin/admin-functionalities.scss
+++ b/app/styles/modules/admin/admin-functionalities.scss
@@ -1,62 +1,75 @@
 .admin-functionalities {
-    form {
-        display: flex;
-        flex-wrap: wrap;
+    .module-container {
+        max-width: 900px;
+        width: 100%;
     }
-    .functionality {
+    .module {
         align-content: center;
-        align-items: center;
-        background-color: $whitish;
+        align-items: flex-start;
+        border-bottom: 1px solid $whitish;
         display: flex;
-        flex-direction: column;
-        justify-content: center;
-        margin-bottom: .3rem;
-        margin-right: .3rem;
-        opacity: .5;
-        padding: 1rem;
-        position: relative;
-        transition: all .2s linear;
-        vertical-align: top;
-        width: 32%;
+        padding: 1rem 0;
         &.active {
-            background-color: rgba($primary, .3);
-            opacity: 1;
-        }
-        .icon {
-            fill: $gray;
-            height: 3rem;
-            margin: 1rem auto;
-            width: 3rem;
-        }
-        .desc {
-            text-align: center;
-            width: 100%;
-        }
-        .activate-input {
-            display: none;
-            +label {
-                color: $white;
-                cursor: pointer;
-                display: block;
-                text-align: center;
+            .module-icon .icon,
+            .module-name {
+                color: $primary;
+                fill: $primary;
             }
         }
-        .title {
-            @extend %bold;
-            display: block;
-        }
-        select {
-            margin-top: 1rem;
+    }
+    .module-icon {
+        flex-basis: 2rem;
+        flex-shrink: 0;
+        margin: 0 .5rem 0 0;
+        .icon {
+            @include svg-size(3rem);
+            fill: $gray-light;
         }
     }
+    .module-name {
+        @extend %bold;
+        @extend %large;
+        color: $gray-light;
+        flex-basis: 100px;
+        flex-shrink: 0;
+        margin: 0 .5rem;
+    }
+    .module-desc {
+        @extend %small;
+        color: $gray-light;
+        flex: 1;
+        margin: 0 2rem 0 0;
+        p {
+            margin: 0;
+        }
+    }
+    .module-desc-options,
     .videoconference-attributes {
-        select {
-            margin-bottom: .5rem;
+        align-items: flex-start;
+        display: flex;
+        margin-top: .5rem;
+        fieldset,
+        .icon {
+            margin: 0 .5rem;
+        }
+        .icon {
+            @include svg-size(2.5rem);
+            align-self: center;
+            cursor: pointer;
+            fill: $gray-light;
+            &:hover {
+                fill: $primary;
+            }
         }
     }
-    .button-green {
-        color: $white;
-        display: block;
-        text-align: center;
+    .module-scrum {
+        .icon {
+            align-self: flex-end;
+        }
+    }
+    .module-videoconference {
+        .icon {
+            align-self: flex-start;
+        }
     }
 }

From 66921944b05a7f86d976bbc52d6136f4eccb60ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 2 Mar 2016 10:20:02 +0100
Subject: [PATCH 080/155] Fix some errors with the project menu when jitsi is
 selected as videoconference system

---
 .../project-menu/project-menu.controller.coffee       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/modules/components/project-menu/project-menu.controller.coffee b/app/modules/components/project-menu/project-menu.controller.coffee
index cf5710a3..23fc3591 100644
--- a/app/modules/components/project-menu/project-menu.controller.coffee
+++ b/app/modules/components/project-menu/project-menu.controller.coffee
@@ -95,25 +95,28 @@ class ProjectMenuController
         return sectionName
 
     _videoConferenceUrl: () ->
+        # Get base url
         if @.project.get("videoconferences") == "appear-in"
             baseUrl = "https://appear.in/"
         else if @.project.get("videoconferences") == "talky"
             baseUrl = "https://talky.io/"
         else if @.project.get("videoconferences") == "jitsi"
             baseUrl = "https://meet.jit.si/"
-            url = @.project.get("slug") + "-" + taiga.slugify(@.project.get("videoconferences_extra_data"))
-            url = url.replace(/-/g, "")
-            return baseUrl + url
         else if @.project.get("videoconferences") == "custom"
             return @.project.get("videoconferences_extra_data")
         else
             return ""
 
+        # Add prefix to the chat room name if exist
         if @.project.get("videoconferences_extra_data")
-            url = @.project.get("slug") + "-" + @.project.get("videoconferences_extra_data")
+            url = @.project.get("slug") + "-" + taiga.slugify(@.project.get("videoconferences_extra_data"))
         else
             url = @.project.get("slug")
 
+        # Some special cases
+        if @.project.get("videoconferences") == "jitsi"
+            url = url.replace(/-/g, "")
+
         return baseUrl + url
 
 angular.module("taigaComponents").controller("ProjectMenu", ProjectMenuController)

From acfd53edbfc2540658fc0c7dc93344f5705089cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 29 Feb 2016 10:40:45 +0100
Subject: [PATCH 081/155] Warning Max Users per Project

---
 CHANGELOG.md                                  |   1 +
 app/coffee/modules/admin/memberships.coffee   |  30 +++-
 app/coffee/modules/common/confirm.coffee      |   7 +-
 app/locales/taiga/locale-en.json              |   4 +-
 .../dropdown-project-list.jade                |   4 +-
 .../services/current-user.service.coffee      |  19 +++
 .../services/current-user.service.spec.coffee | 108 ++++++++++++-
 app/partials/admin/admin-memberships.jade     |  16 +-
 app/styles/components/buttons.scss            |  10 --
 app/styles/dependencies/helpers.scss          |   5 +
 app/styles/layout/admin-memberships.scss      |   5 +
 app/styles/modules/common/lightbox.scss       |   4 +-
 app/svg/icons/team-question.svg               |   4 +
 app/svg/sprite.svg                            | 147 ++++++++++++------
 14 files changed, 293 insertions(+), 71 deletions(-)
 create mode 100644 app/svg/icons/team-question.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3edcdd55..4246e874 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Moved from iconfont to SVG sprite icon system and redesign.
 - Redesign 'Admin > Project > Modules' panel.
 - Add badge to project owners
+- Limit of user per project.
 
 ### Misc
 - Lots of small and not so small bugfixes.
diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index bd3dc25e..9dbae4fe 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -47,11 +47,13 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         "$tgNavUrls",
         "$tgAnalytics",
         "tgAppMetaService",
-        "$translate"
+        "$translate",
+        "tgCurrentUserService",
+        "$tgAuth"
     ]
 
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls, @analytics,
-                  @appMetaService, @translate) ->
+                  @appMetaService, @translate, @currentUserService, @tgAuth) ->
         bindMethods(@)
 
         @scope.project = {}
@@ -63,6 +65,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
            title = @translate.instant("ADMIN.MEMBERSHIPS.PAGE_TITLE", {projectName:  @scope.project.name})
            description = @scope.project.description
            @appMetaService.setAll(title, description)
+           @._checkUsersLimit()
 
         promise.then null, @.onInitialDataError.bind(@)
 
@@ -93,8 +96,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
 
     loadInitialData: ->
         promise = @.loadProject()
-        promise.then =>
-            @.loadMembers()
+
+        @q.all([
+            @.loadMembers(),
+            @tgAuth.refresh()
+        ])
 
         return promise
 
@@ -106,6 +112,22 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
     addNewMembers:  ->
         @rootscope.$broadcast("membersform:new")
 
+    _checkUsersLimit: ->
+        @scope.canAddUsers = true
+        userData = @currentUserService.getUser().toJS()
+
+        if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false
+            @.maxMembers = userData.max_members_private_projects
+            @scope.canAddUsers = false
+        else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
+            @.maxMembers = userData.max_members_private_projects
+            @scope.canAddUsers = false
+
+    limitUsersWarning: ->
+        title = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING")
+        message = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE", {members: @.maxMembers})
+        icon = "/" + window._version + "/svg/icons/team-question.svg"
+        @confirm.success(title, message,icon)
 
 module.controller("MembershipsController", MembershipsController)
 
diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index c7c93e20..e9e6184e 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -161,11 +161,16 @@ class ConfirmService extends taiga.Service
 
         return defered.promise
 
-    success: (title, message) ->
+    success: (title, message, icon) ->
         defered = @q.defer()
 
         el = angular.element(".lightbox-generic-success")
 
+        el.find("img").remove()
+        detailImage = $('<img>').addClass('lb-icon').attr('src', icon)
+        if detailImage
+            el.find('section').prepend(detailImage)
+
         # Render content
         el.find(".title").html(title) if title
         el.find(".message").html(message) if message
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 9b644e2d..c53fc45b 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -408,7 +408,9 @@
             "TITLE": "Manage members",
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ New member",
-            "ADD_BUTTON_TITLE": "Add new member"
+            "ADD_BUTTON_TITLE": "Add new member",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
index 50bc0a4d..47a2a7c0 100644
--- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
+++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
@@ -4,8 +4,8 @@ a(href="", title="Projects", tg-nav="projects")
 
 div.navbar-dropdown.dropdown-project-list
     ul
-      li(tg-repeat="project in vm.projects track by project.get('id')")
-        a(href="#", tg-nav="project:project=project.get('slug')") {{::project.get("name")}}
+        li(tg-repeat="project in vm.projects track by project.get('id')")
+            a(href="#", tg-nav="project:project=project.get('slug')") {{::project.get("name")}}
 
     a.see-more-projects-btn.button-gray(
         href="#",
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index a14ffb8d..cfc5ad4b 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -118,6 +118,25 @@ class CurrentUserService
 
         return @.projects
 
+    canAddMoreMembersInPrivateProjects: (projectId) ->
+        project = @.projects.get('all').find (project) -> project.get('id') == projectId
+        user = @.getUser()
+
+        if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects')
+            return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
+
+        return {valid: true}
+
+    canAddMoreMembersInPublicProjects: (projectId) ->
+        project = @.projects.get('all').find (project) -> project.get('id') == projectId
+        user = @.getUser()
+
+        if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects')
+            return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
+
+        return {valid: true}
+
+
     canBePrivateProject: (projectId) ->
         project = @.projects.get('all').find (project) -> project.get('id') == projectId
 
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index 32b51b0b..9747924b 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -204,6 +204,112 @@ describe "tgCurrentUserService", ->
 
             done()
 
+    it "the user can't add more members in private projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_members_private_projects: 2
+        })
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._user = user
+        currentUserService._projects = projects
+
+        result = currentUserService.canAddMoreMembersInPrivateProjects(2)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_members_private_projects',
+            type: 'private_project'
+        })
+
+    it "the user can add more members in private projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_members_private_projects: 7
+        })
+
+        currentUserService._user = user
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._projects = projects
+
+        result = currentUserService.canAddMoreMembersInPrivateProjects(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't add more members in public projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_members_public_projects: 2
+        })
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._user = user
+        currentUserService._projects = projects
+
+        result = currentUserService.canAddMoreMembersInPublicProjects(2)
+
+        expect(result).to.be.eql({
+            valid: false,
+            reason: 'max_members_public_projects',
+            type: 'public_project'
+        })
+
+    it "the user can add more members in public projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_members_public_projects: 7
+        })
+
+        projects = Immutable.fromJS({
+            all: [
+                {id: 1, name: "fake1"},
+                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
+                {id: 3, name: "fake3"},
+                {id: 4, name: "fake4"}
+            ]
+        })
+
+        currentUserService._user = user
+        currentUserService._projects = projects
+
+        result = currentUserService.canAddMoreMembersInPublicProjects(2)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+
     it "the user can't create private projects if they reach the maximum number of private projects", () ->
         user = Immutable.fromJS({
             id: 1,
@@ -214,7 +320,7 @@ describe "tgCurrentUserService", ->
 
         currentUserService._user = user
 
-        result = currentUserService.canCreatePrivateProjects(0)
+        result = currentUserService.canCreatePrivateProjects()
 
         expect(result).to.be.eql({
             valid: false,
diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade
index 1944fb21..b97c5451 100644
--- a/app/partials/admin/admin-memberships.jade
+++ b/app/partials/admin/admin-memberships.jade
@@ -13,9 +13,19 @@ div.wrapper.memberships(ng-controller="MembershipsController as ctrl",
                 include ../includes/components/mainTitle
 
             .action-buttons
-                a.button-green(href="", title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
-                               ng-click="ctrl.addNewMembers()")
-                   span.text(translate="ADMIN.MEMBERSHIPS.ADD_BUTTON")
+                a.limit-users-warning(
+                    ng-if="!canAddUsers"
+                    translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING"
+                    translate-values="{members: ctrl.maxMembers}"
+                    href=""
+                    ng-click="ctrl.limitUsersWarning()"
+                )
+                button.button-green(
+                    title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
+                    ng-click="ctrl.addNewMembers()"
+                    translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
+                    ng-disabled="!canAddUsers"
+                )
 
         include ../includes/modules/admin/admin-membership-table
 
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index 77c4b389..1be18ede 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -44,7 +44,6 @@
         }
     }
 }
-
 .trans-button {
     @extend %medium;
     @extend %title;
@@ -61,12 +60,9 @@
         color: $blackish;
     }
 }
-
-
 .submit-button {
     width: 100%;
 }
-
 .button-green,
 a.button-green {
     @extend %button;
@@ -77,7 +73,6 @@ a.button-green {
         color: $white;
     }
 }
-
 .button-gray,
 a.button-gray {
     @extend %button;
@@ -88,7 +83,6 @@ a.button-gray {
         color: $white;
     }
 }
-
 .button-blackish {
     @extend %button;
     background: $blackish;
@@ -98,7 +92,6 @@ a.button-gray {
         color: $white;
     }
 }
-
 .button-red {
     @extend %button;
     background: $red-light;
@@ -110,7 +103,6 @@ a.button-gray {
         color: $white;
     }
 }
-
 .button-block {
     background: $white;
     color: $red;
@@ -119,7 +111,6 @@ a.button-gray {
         color: $white;
     }
 }
-
 .button-bulk {
     @extend %button;
     background: $primary;
@@ -134,7 +125,6 @@ a.button-gray {
         background: $primary-light;
     }
 }
-
 .button-auth {
     @extend %button;
     background: $grayer;
diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss
index e71a081c..d6d4d8aa 100644
--- a/app/styles/dependencies/helpers.scss
+++ b/app/styles/dependencies/helpers.scss
@@ -50,6 +50,11 @@
         opacity: 0;
         transition: opacity .3s ease;
     }
+    .lb-icon {
+        @include svg-size(6rem);
+        display: block;
+        margin: 1rem auto;
+    }
     .title {
         text-align: center;
     }
diff --git a/app/styles/layout/admin-memberships.scss b/app/styles/layout/admin-memberships.scss
index 7d7ad3c4..6a8d22fd 100644
--- a/app/styles/layout/admin-memberships.scss
+++ b/app/styles/layout/admin-memberships.scss
@@ -5,6 +5,11 @@
             float: right;
         }
     }
+    .limit-users-warning {
+        @extend %small;
+        color: $primary;
+        margin-right: 1rem;
+    }
     .check {
         input { // IE needs smaller size
             height: 40px;
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 2cc9ed85..1a9b3379 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -1,8 +1,8 @@
 .lightbox {
     @extend %lightbox;
     h2 {
-        @extend %larger;
-        @extend %text;
+        @extend %xlarge;
+        @extend %light;
     }
 }
 
diff --git a/app/svg/icons/team-question.svg b/app/svg/icons/team-question.svg
new file mode 100644
index 00000000..e8678f64
--- /dev/null
+++ b/app/svg/icons/team-question.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 400">
+    <path
+        fill="#b8b8b8" d="M165 91.5c-33 0-60 28.7-60 64 0 35.2 27 64 60 64s60-28.8 60-64c0-35.3-27-64-60-64zm0 16.2c24.8 0 44.8 21.3 44.8 47.8 0 26.5-20 47.8-44.8 47.8-25 0-45-21.3-45-47.8 0-26.5 20-47.8 45-47.8zm-77.8 13.5c-29.2 0-53 25.5-53 56.7 0 31 23.8 56.5 53 56.5 16 0 27.5-4.5 37.3-16.6-21.8-9.7-34-36-34-62.5 0-12 3-23.3 8.5-33-3.8-.8-7.7-1.3-11.8-1.3zM165 229.7c-53.3 0-95.8 50.8-96 112.5v8h192v-8c-.2-61.7-42.8-112.5-96-112.5zm-78.7 13.6c-3.4 0-5.8.3-5.8.3-47.2 0-78 45-78.3 99.5v7.3h52.2v-8c0-41.3 15.2-78.6 43.7-98.2-3.8-.6-8.2-.8-11.7-.7zM165 246c42 0 76.8 38.2 80.5 88h-161c3.6-49.8 38.6-88 80.5-88zM339.3 49.7C307 49.7 281 76 281 108.2c0 32.2 26 58.4 58.3 58.4s58.5-26.2 58.5-58.4c0-32.3-26.2-58.5-58.5-58.5zm0 7.3c28.3 0 51.2 23 51.2 51.2 0 28.3-23 51-51.2 51-28.3 0-51-22.7-51-51S311 57 339.2 57zm-.2 11.8c-7 0-14 1.7-20.5 5l3 7c3.5-1.6 6.5-2.7 9-3.3 2.7-.7 5.4-1 8-1 4.4 0 7.6 1 10 3 2.2 1.8 3.3 4.5 3.3 8 0 3-.6 5.4-1.8 7.4-1.2 2-4.2 5-9 9-3.3 2.8-5.7 5.6-7 8.2-1.2 2.6-1.8 6-1.8 10v2.8h6.7v-1.7c0-3.3.5-6 1.6-8 1-2 3.5-4.4 7-7.3 4.4-4 7.2-6.6 8.5-8.3 1.4-1.8 2.4-3.6 3-5.5.8-2 1-4.2 1-6.7 0-6-1.7-10.6-5.4-13.8-3.7-3.3-8.8-5-15.5-5zm-6.8 62.5V148h7.3v-16.7h-7.3z" />
+</svg>
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
index a0283ab7..68d91a7e 100644
--- a/app/svg/sprite.svg
+++ b/app/svg/sprite.svg
@@ -2,32 +2,38 @@
     <defs>
         <symbol id="icon-iocaine" viewBox="0 0 1024 1024">
             <title>iocaine</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M613.658 0c-3.54 0-7.091 0.225-10.619 0.699-70.636 1.408-141.466-1.833-211.986 1.587-37.804 7.936-60.948 53.517-45.542 88.858 2.109 12.795 9.257 29.535 9.139 40.584h-73.738v65.213h51.474c-3.405 29.655-35.712 42.196-57.779 55.916-46.546 26.419-94.093 64.614-103.898 120.356-10.227 52.465-1.293 106.273-4.36 159.035 0.827 144.205-2.36 288.563 1.787 432.691 6.569 36.488 43.971 62.572 80.435 58.388 139.121 1.203 278.272-0.189 417.382 0.673 45.512-0.87 91.387 1.147 136.678-2.808 34.877-8.166 58.957-44.416 54.989-79.685 1.216-140.723-0.23-281.472 0.717-422.195-0.707-46.787 0.748-93.814-2.926-140.442-10.112-57.498-56.658-100.413-106.401-126.382-22.648-12.966-52.257-26.836-57.19-55.539h3.866c4.25 0.545 8.724 0.538 13.158 0h33.556v-31.002c0.064-1.132 0.064-2.245 0-3.338v-30.871h-74.138c7.567-31.309 24.717-66.726 6.958-97.741-12.442-22.262-36.782-33.946-61.568-33.989zM610.15 63.173c4.357-0.072 8.259 0.614 9.779 4.070-1.088 12.298-7.278 23.68-9.505 35.738-4.004 8.678-0.556 22.17-7.526 28.749h-182.17c-4.787-22.492-14.659-45.542-15.078-67.86 5.048-1.331 10.412-0.154 15.549-0.297 58.798 0.998 117.663-0.118 176.422 0.082 3.343 0.415 8.166-0.415 12.526-0.486zM396.314 196.941h232.842c-0.243 42.463 30.687 78.029 66.591 97.083 36.792 22.712 84.070 43.635 95.959 89.472 5.089 11.827 1.756 18.371-12.201 14.651-183.245-0.087-366.848 0.174-549.862-0.133 3.599-39.025 36.027-69.645 69.99-86.564 37.806-21.594 82.772-46.523 92.826-92.731 2.734-6.543-0.046-17.797 3.845-21.78zM348.741 462.643c37.996 15.301 59.156 54.118 90.394 78.833 16.691-11.948 36.183-19.999 56.428-23.475 35.814-8.1 71.352 5.018 103.357 20.045 30.38-24.205 46.188-45.901 72.179-65.708 15.693-15.094 42.765-8.422 42.939 12.836-20.787 36.956-53.368 59.73-82.918 88.586 21.555 30.216 30.625 69.773 21.683 106.066-0.783 18.662-18.514 30.502-20.769 48.456 20.813 30.428 48.397 51.374 71.122 78.31 19.021 10.888 8.975 43.848-12.672 43.172-37.76-20.736-59.387-60.57-94.894-84.173-4.518 13.368-0.223 33.723-0.627 50.010 3.584 16.289-8.934 32.548-25.349 34.028-32.768-1.766-65.723 0.384-98.555-0.87-18.918 1.178-26.358-20.045-25.101-35.64-0.051-12.948 7.68-33.546-8.576-39.634-32.138 15.514-52.813 44.518-87.782 67.904-12.173 17.004-41.505 3.021-39.724-16.594 25.933-40.543 69.13-64.691 101.934-98.778-39.209-39.56-38.492-107.75-4.854-150.51-20.014-25.974-46.446-45.875-68.516-69.939-18.58-9.733-10.593-42.586 10.296-42.918zM524.9 560.399c-1.889-0.051-3.789-0.033-5.693 0.059-37.427-0.128-73.536 24.916-86.897 60.475-15.045 32.584 0.709 72.602 30.828 90.373 16.358 4.698 28.237 19.835 29.696 36.736 3.602 17.357-7.834 36.285 1.649 52.142 16.41 6.108 36.956 6.973 54.182 1.172 5.24-17.836-2.202-38.868 0.461-58.143 5.548-28.426 40.96-33.928 53.752-57.3 28.127-53.921-19.52-123.86-77.983-125.517zM487.089 616.399c12.16-0.287 20.070 11.807 22.426 22.408 5.274 16.973-5.898 43.32-26.675 39.117-29.665-6.738-26.957-59.715 4.25-61.522zM556.526 616.43c11.105 0.538 18.304 10.752 20.659 21.082 5.957 17.132-4.447 44.032-25.702 40.468-29.737-5.862-27.745-58.616 2.77-61.524 0.776-0.051 1.536-0.061 2.273-0.026zM230.075 923.758c54.469 2.732 109.053-0.614 163.571 0.768h401.044c-0.179 11.73 6.060 33.116-10.691 35.22-37.952 3.83-76.006-0.904-114.107 1.080-144.691-0.479-289.459 1.697-434.099-1.254-10.45-7.46-7.117-26.235-5.74-35.814z"></path>
         </symbol>
         <symbol id="icon-lock" viewBox="0 0 1024 1024">
             <title>lock</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M427.571 0c-149.486 0-270.822 121.6-270.822 271.411v119.639h-156.749v632.95h1024v-632.96h-156.749v-119.642c0-149.811-121.349-271.411-270.822-271.411h-168.832zM427.571 64.136h168.832c115.141 0 206.838 91.889 206.838 207.276v119.639h-582.502v-119.639c0-115.384 91.692-207.276 206.83-207.276zM64 455.201h896v504.678h-896v-504.678zM480 586.721v229.325h64v-229.325h-64z"></path>
         </symbol>
         <symbol id="icon-promote" viewBox="0 0 1024 1024">
             <title>promote</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v1024h1024v-1024h-1024zM64 64h416v896h-416v-896zM544 64h416v252.16h-416v-252.16zM272.589 113.485l-186.163 186.163 44.524 44.524 109.64-109.645v681.83h64v-681.83l109.645 109.645 44.518-44.518-186.163-186.168zM544 380.16h416v273.92h-416v-273.92zM544 718.080h416v241.92h-416v-241.92z"></path>
         </symbol>
         <symbol id="icon-trash" viewBox="0 0 1024 1024">
             <title>trash</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M273.382 0v143.726h-273.382v64h119.77v816.282h780.8v-816.282h123.43v-64h-277.018v-143.726zM337.382 64h345.6v79.726h-345.6zM183.782 207.726h89.6v682.982h64v-682.982h140.8v682.982h64v-682.982h140.8v682.982h64v-682.982h89.6v752.282h-652.8z"></path>
         </symbol>
         <symbol id="icon-unlock" viewBox="0 0 1024 1024">
             <title>unlock</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M427.571 0c-146.12 0-265.318 116.191-270.618 261.325h64.036c5.158-110.612 94.822-197.197 206.592-197.197h168.832c115.139 0 206.835 91.886 206.835 207.273v119.639h-803.249v632.947h1024v-632.96h-156.749v-119.642c0-149.806-121.352-271.411-270.822-271.411zM64 455.194h896v504.678h-896zM480 586.701v229.325h64v-229.325z"></path>
         </symbol>
         <symbol id="icon-client-requirement" viewBox="0 0 1024 1024">
             <title>client-requirement</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M273.375 0v139.336h-274.289v611.84h452.388v-64h-388.388v-483.84h61.425v243.2h606.72v-243.2h61.455v247.224h64v-306.47h-0.036v-4.754h-263.278v-139.336h-320zM337.375 64h192v75.336h-192v-75.336zM188.511 203.336h478.72v179.2h-478.72v-179.2zM395.871 254.228v73.139h64v-73.134h-64zM512.914 512v512h512v-512h-512zM576.914 576h384v70.060l-37.179-31.345-189.765 225.075-127.219-107.256-29.837 35.387v-191.921zM960.914 669.901v290.099h-384v-168.909l164.731 138.885 219.269-260.076z"></path>
         </symbol>
         <symbol id="icon-project" viewBox="0 0 1024 1024">
@@ -36,7 +42,8 @@
         </symbol>
         <symbol id="icon-team-requirement" viewBox="0 0 1024 1024">
             <title>team-requirement</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M404.421 0c-139.443 0-253.171 113.725-253.171 253.169s113.725 253.176 253.171 253.176c139.443 0 253.174-113.728 253.174-253.171s-113.731-253.174-253.174-253.174zM404.421 64c104.858 0 189.174 84.314 189.174 189.169 0 104.858-84.319 189.176-189.174 189.176-104.858 0-189.171-84.316-189.171-189.171 0-104.858 84.314-189.171 189.171-189.171zM512.914 512v512h512v-512h-512zM404.396 546.9c-224.645 0.056-404.216 201.055-405.181 444.972l-0.128 32.128h452.388v-64h-386.68c15.329-197.402 162.803-349.041 339.602-349.1h0.026c15.949 0 31.657 1.254 47.053 3.651v-64.632c-15.437-1.971-31.13-3.021-47.068-3.021zM576.914 576h384v70.060l-37.179-31.345-189.765 225.075-127.219-107.256-29.837 35.387v-191.921zM960.914 669.901v290.099h-384v-168.909l164.731 138.885 219.269-260.076z"></path>
         </symbol>
         <symbol id="icon-add" viewBox="0 0 1024 1024">
@@ -49,7 +56,8 @@
         </symbol>
         <symbol id="icon-bulk" viewBox="0 0 1024 1024">
             <title>bulk</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v64h214.976v-64h-214.976zM330.176 0v64h693.824v-64h-693.824zM0 335.36v64h214.976v-64h-214.976zM330.176 335.36v64h693.824v-64h-693.824zM0 652.8v64h214.976v-64h-214.976zM330.176 652.8v64h693.824v-64h-693.824zM0 960v64h214.976v-64h-214.976zM330.176 960v64h693.824v-64h-693.824z"></path>
         </symbol>
         <symbol id="icon-close" viewBox="0 0 1024 1024">
@@ -58,12 +66,14 @@
         </symbol>
         <symbol id="icon-dashboard" viewBox="0 0 1024 1024">
             <title>dashboard</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v296.96h296.96v-296.96h-296.96zM360.96 0v296.96h296.96v-296.96h-296.96zM721.92 0v296.96h302.080v-296.96h-302.080zM0 360.96v296.96h296.96v-296.96h-296.96zM360.96 360.96v296.96h296.96v-296.96h-296.96zM721.92 360.96v296.96h302.080v-296.96h-302.080zM0 721.92v302.080h296.96v-302.080h-296.96zM360.96 721.92v302.080h296.96v-302.080h-296.96zM721.92 721.92v302.080h302.080v-302.080h-302.080z"></path>
         </symbol>
         <symbol id="icon-discover" viewBox="0 0 1024 1024">
             <title>discover</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c50.98 0 99.932 8.492 145.554 24.11 15.905 133.478-41.797 135.48-96.402 244.69-205.594 411.177 276.372 55.386 303.539 109.714 82.34 164.685-107.684 261.253-17.382 366.848-37.274 42.017-82.335 76.964-132.959 102.579-85.233-74.982-144.059-75.121-180.439 47.524-7.265 0.351-14.566 0.538-21.914 0.538-53.596 0-104.96-9.377-152.561-26.565 83.028-77.747 11.981-329.119-50.637-454.349-35.546-71.101 142.111-271.677 95.091-365.719-8.635-17.267-23.892-24.020-43.308-23.199 47.283-16.929 98.245-26.171 151.416-26.171zM75.945 408.686c59.29 100.058 212.28 198.477 39.030 300.8-1.229 1.341-2.253 2.811-3.174 4.334-30.572-60.621-47.8-129.167-47.8-201.82 0-35.574 4.147-70.154 11.945-103.314z"></path>
         </symbol>
         <symbol id="icon-drag" viewBox="0 0 1024 1024">
@@ -72,12 +82,14 @@
         </symbol>
         <symbol id="icon-exclamation" viewBox="0 0 1024 1024">
             <title>exclamation</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM480 162.918v473.052h64v-473.052h-64zM480 714.514v146.57h64v-146.568h-64z"></path>
         </symbol>
         <symbol id="icon-flag" viewBox="0 0 1024 1024">
             <title>flag</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M185.615 0c-170.665 0-185.615 0.051-185.615 0.051v1023.949h64v-460.792c17.72-0.026 9.795-0.036 121.615-0.036 180.419 0 286.277 44.846 431.345 69.164 145.065 24.32 407.040-53.76 407.040-53.76v-563.164s-261.975 78.072-407.040 53.752c-145.068-24.317-269.21-69.164-431.345-69.164zM186.826 66.074c116.511-0.571 230.328 30.408 343.926 54.118 140.526 36.232 288.077 15.647 426.68-18.988v426.002c-37.847 9.618-75.738 18.534-114.094 25.746-98.862 23.808-202.734 21.059-301.376-2.432-153.549-47.206-315.546-58.156-475.374-54.469 0.143-143.206-0.486-286.418 0.246-429.624 39.997 0.115 79.992-0.261 119.987-0.358z"></path>
         </symbol>
         <symbol id="icon-fold-column" viewBox="0 0 1024 1024">
@@ -94,7 +106,8 @@
         </symbol>
         <symbol id="icon-issues" viewBox="0 0 1024 1024">
             <title>issues</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v1024h1024v-1024h-1024zM64 64h896v896h-896v-896zM510.866 139.2l-189.765 225.075-127.222-107.256-41.254 48.932 176.148 148.508 231.020-274.010-48.929-41.249zM510.866 548.8l-189.765 225.075-127.222-107.256-41.254 48.932 176.148 148.508 231.020-274.010-48.929-41.249z"></path>
         </symbol>
         <symbol id="icon-kanban" viewBox="0 0 1024 1024">
@@ -103,32 +116,38 @@
         </symbol>
         <symbol id="icon-like-empty" viewBox="0 0 1024 1024">
             <title>like-empty</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M775.526 0.051c-161.362-3.994-260.677 227.96-262.51 232.274-1.823-4.288-100.805-235.469-261.796-232.261-30.088 0.602-62.344 9.395-96.525 29.422-265.277 155.397-216.197 594.77 358.111 994.273v0.241l0.205-0.128 0.205 0.128v-0.241c566.574-373.642 623.393-838.876 358.118-994.273-33.917-19.866-65.933-28.698-95.808-29.435zM254.029 62.080c36.467 0.589 72.312 17.178 97.262 44.25 85.75 76.5 122.496 189.788 164.659 293.409 25.446-77.281 52.301-155.407 98.304-223.386 35.277-51.571 81.37-104.581 146.752-113.907 77.23-1.428 143.334 56.865 175.119 123.894 46.95 103.084 25.075 222.72-20.628 322.007-86.085 183.086-237.036 326.922-401.562 440.627-52.198-37.934-102.707-78.167-150.548-121.431-106.112-97.213-203.372-208.635-261.11-341.806-25.252-61.471-43.679-128.095-41.51-195.21 4.923-95.782 65.313-191.020 156.974-223.491 11.912-3.569 24.136-5.151 36.291-4.956z"></path>
         </symbol>
         <symbol id="icon-like" viewBox="0 0 1024 1024">
             <title>like</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M251.22 0.064c-30.088 0.602-62.344 9.4-96.52 29.422-265.28 155.402-216.202 594.775 358.106 994.278v0.236l0.205-0.123 0.205 0.123v-0.238c566.579-373.642 623.391-838.874 358.113-994.278-217.037-127.14-356.142 197.729-358.316 202.842-1.818-4.288-100.8-235.469-261.791-232.261z"></path>
         </symbol>
         <symbol id="icon-question" viewBox="0 0 1024 1024">
             <title>question</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM510.175 166.92c-62.687 0-122.785 15.063-180.301 45.189l26.931 61.619c29.517-14.909 55.688-25.101 78.51-30.579 22.822-5.78 46.254-8.673 70.298-8.673 37.427 0 66.033 8.517 85.811 25.559 20.086 16.737 30.126 40.627 30.126 71.665 0 24.952-5.478 46.259-16.435 63.905-10.65 17.651-36.664 43.971-78.049 78.966-29.824 25.559-50.212 49.905-61.166 73.032-10.957 22.822-16.435 52.037-16.435 87.642v24.643h58.885v-15.060c0-28.91 4.864-52.040 14.605-69.386 10.040-17.344 30.428-39.099 61.164-65.27 38.341-33.472 63.296-57.664 74.86-72.576 11.564-15.214 20.234-31.191 26.015-47.928 6.088-17.042 9.132-36.667 9.132-58.88 0-52.037-16.128-92.365-48.384-120.965-32.256-28.605-77.445-42.906-135.567-42.906zM449.28 714.514v146.57h64v-146.568h-64z"></path>
         </symbol>
         <symbol id="icon-search" viewBox="0 0 1024 1024">
             <title>search</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M427.866 0c-232.947 0-422.528 189.573-422.528 422.523s189.578 422.528 422.528 422.528c101.545 0 194.836-36.040 267.789-95.974l274.926 274.924 48.077-48.077-274.081-274.079c65.807-74.522 105.812-172.339 105.812-279.322 0-232.95-189.576-422.523-422.523-422.523zM427.866 67.994c196.204 0 354.534 158.326 354.534 354.529 0 196.206-158.331 354.534-354.534 354.534-196.206 0-354.534-158.328-354.534-354.534 0-196.204 158.328-354.534 354.534-354.534z"></path>
         </symbol>
         <symbol id="icon-settings" viewBox="0 0 1024 1024">
             <title>settings</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M360 0v145.034l-102.554-102.554-214.963 214.963 102.554 102.554h-145.037v304h145.039l-102.559 102.559 214.963 214.958 102.554-102.554v145.039h304v-145.044l102.561 102.559 214.963-214.958-102.561-102.554h145.039v-304h-145.039l102.554-102.561-214.956-214.963-102.559 102.561v-145.039h-304zM424 64h176v235.551l166.561-166.561 124.449 124.447-166.559 166.561h235.548v176h-235.556l166.566 166.561-124.449 124.442-166.559-166.559v235.558h-176v-235.556l-166.554 166.561-124.452-124.452 166.564-166.554h-235.561v-176h235.551l-166.554-166.559 124.449-124.454 166.554 166.559v-235.546zM512 317.146c-107.238 0-194.854 87.616-194.854 194.854s87.616 194.86 194.854 194.86c107.238 0 194.86-87.621 194.86-194.86s-87.621-194.854-194.86-194.854zM512 381.146c72.653 0 130.86 58.204 130.86 130.854 0 72.653-58.209 130.86-130.86 130.86-72.653 0-130.854-58.209-130.854-130.86 0-72.653 58.204-130.854 130.854-130.854z"></path>
         </symbol>
         <symbol id="icon-team" viewBox="0 0 1024 1024">
             <title>team</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M644.006 0c-130.729 0-237.345 113.725-237.345 253.171 0 139.443 106.616 253.174 237.343 253.174 130.729 0 237.356-113.728 237.356-253.171s-106.627-253.174-237.35-253.174zM644.006 64c98.304 0 177.357 84.314 177.357 189.171s-79.053 189.174-177.357 189.174c-98.304 0-177.347-84.316-177.347-189.171 0-104.858 79.040-189.171 177.344-189.171zM336.366 117.596c-115.717 0-210.092 100.659-210.092 224.095 0 123.43 94.374 224.102 210.092 224.102 63.739 0 108.877-17.626 147.456-65.69-86.072-38.072-134.758-141.627-134.758-246.932 0-47.48 12.365-91.971 33.83-130.012-14.976-3.635-30.548-5.565-46.528-5.565zM643.981 546.9c-210.606 0.056-378.949 201.052-379.853 444.969l-0.128 32.128h760l-0.128-32.128c-0.904-243.935-169.267-444.938-379.884-444.972zM332.91 600.545c-13.548 0.205-23.235 1.144-23.235 1.144-186.419 0.051-308.762 177.966-309.565 393.869l-0.11 28.442h206.405l0.128-32.128c0.604-162.885 60.127-310.49 172.787-388.037-15.45-2.959-32.86-3.492-46.413-3.29zM643.981 610.9h0.026c165.76 0.036 304.038 151.68 318.413 349.1h-636.813c14.374-197.402 152.627-349.038 318.374-349.1z"></path>
         </symbol>
         <symbol id="icon-timeline" viewBox="0 0 1024 1024">
@@ -145,22 +164,26 @@
         </symbol>
         <symbol id="icon-unwatch" viewBox="0 0 1024 1024">
             <title>unwatch</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M201.344 170.004l-45.248 45.256 47.703 47.706c-129.385 82.132-204.687 197.21-203.791 247.107 1.469 81.754 205.911 335.24 511.992 338.573 84.966 0.927 162.112-18.235 229.286-48.195l53.545 53.545 45.261-45.256-638.748-638.735zM512 171.489c-68.646 0-132.029 12.57-189.117 33.011l57.211 57.211c41.459-11.546 84.319-17.915 127.268-18.529 157.983-1.58 313.549 76.836 409.17 202.071 14.28 21.998 38.886 45.43 31.391 74.030-33.587 66.335-84.716 122.171-145.408 164.849l50.903 50.906c107.418-79.014 170.048-178.22 170.58-224.965 0.963-84.736-201.498-338.58-512-338.58zM514.099 308.424c-2.35 0-4.703 0.038-7.058 0.123-23.073 0.205-45.696 4.897-66.898 13.215l61.402 61.399c3.533-0.287 7.076-0.448 10.619-0.44 62.472-1.426 120.077 49.203 126.446 111.196 1.344 9.050 1.546 18.13 0.781 27.090l61.071 61.069c20.096-53.402 17.887-115.338-9.964-165.88-33.58-64.64-103.578-107.587-176.397-107.768zM255.532 314.696l86.84 86.84c-13.005 19.942-22.495 42.163-27.277 65.766-19.901 84.465 22.907 177.935 99.116 219.028 63.25 36.731 145.746 32.732 206.725-6.231l65.382 65.382c-24.11 9.096-48.804 16.42-73.769 21.811-183.327 38.252-382.523-41.779-498.022-188.237-15.196-24.325-42.565-45.701-40.192-77.112 41.221-78.572 105.382-142.551 181.197-187.249zM396.838 456l169.774 169.774c-7.16 3.354-14.682 6.031-22.52 7.872-59.418 16.41-126.899-16.742-149.44-73.754-14.625-33.093-12.657-71.585 2.189-103.892z"></path>
         </symbol>
         <symbol id="icon-user" viewBox="0 0 1024 1024">
             <title>user</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-139.443 0-253.166 113.725-253.166 253.169s113.725 253.176 253.169 253.176c139.448 0 253.179-113.728 253.179-253.174-0.003-139.446-113.733-253.171-253.181-253.171zM512 64c104.858 0 189.179 84.314 189.179 189.169 0 104.858-84.319 189.176-189.176 189.176-104.852 0-189.166-84.316-189.166-189.174s84.311-189.171 189.164-189.171zM511.974 546.9c-224.64 0.056-404.209 201.052-405.176 444.969l-0.128 32.128h810.662l-0.128-32.128c-0.973-243.935-180.557-444.938-405.217-444.972zM511.974 610.9h0.026c176.819 0.036 324.308 151.68 339.643 349.1h-679.27c15.334-197.402 162.806-349.041 339.61-349.1z"></path>
         </symbol>
         <symbol id="icon-wiki" viewBox="0 0 1024 1024">
             <title>wiki</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M46.298 0l-0.067 89.702-46.231-17.446v844.984l512 106.76 512-106.757v-844.984l-45.696 17.198v-87.619l-467.72 162.017-464.289-163.855zM100.513 88.325l379.41 133.366v662.963l-379.412-133.366v-662.963zM923.489 88.325v662.963l-379.407 133.371v-662.971l379.407-133.366z"></path>
         </symbol>
         <symbol id="icon-archive" viewBox="0 0 1024 1024">
             <title>archive</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512.65 0l-512.571 136.453v736.753l511.964 150.794 511.956-150.794v-736.932l-0.512 0.148-510.84-136.422zM60.262 217.508l421.258 124.083v609.91l-421.258-124.083v-609.907zM963.819 217.508v609.91l-421.261 124.083v-609.912l421.261-124.083zM105.247 319.135v122.86l318.072 97.3v-122.86l-318.077-97.3z"></path>
         </symbol>
         <symbol id="icon-arrow-down" viewBox="0 0 1024 1024">
@@ -181,7 +204,8 @@
         </symbol>
         <symbol id="icon-attachment" viewBox="0 0 1024 1024">
             <title>attachment</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M662.461 0.492l-573.568 572.526 45.215 45.294 528.353-527.393 226.542 226.084-617.208 616.082-136.796-136.515 519.439-518.495 44.329 44.237-424.929 424.159 45.215 45.297 470.316-469.463-134.938-134.651-610.028 608.922 227.389 226.934 707.802-706.509-317.13-316.513z"></path>
         </symbol>
         <symbol id="icon-briefcase" viewBox="0 0 1024 1024">
@@ -198,7 +222,8 @@
         </symbol>
         <symbol id="icon-bug" viewBox="0 0 1024 1024">
             <title>bug</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M475.674 1.946c-85.051 0-154.522 69.466-154.522 154.514s69.471 154.511 154.522 154.511h73.139c85.051 0 154.516-69.463 154.516-154.511s-69.466-154.514-154.516-154.514h-73.139zM475.674 65.946h73.139c50.701 0 90.516 39.816 90.516 90.514s-39.816 90.511-90.514 90.511h-73.139c-50.701 0-90.522-39.813-90.522-90.511s39.821-90.514 90.522-90.514zM197.394 285.594l-45.253 45.261 105.848 105.856c-20.14 29.696-31.918 65.49-31.918 103.962v84.818h-131.213v64h131.215v84.813c0 36.582 10.691 70.715 29.051 99.517l-102.984 102.989 45.253 45.251 100.9-100.9c31.447 24.387 70.856 38.963 113.595 38.963h200.714c46.874 0 89.748-17.528 122.491-46.318l108.255 108.255 45.253-45.253-113.162-113.162c14.628-26.537 22.976-56.986 22.976-89.344v-84.813h130.726v-64h-130.729v-84.815c0-34.266-9.377-66.381-25.651-93.983l115.84-115.84-45.256-45.253-112.172 112.179c-32.205-26.778-73.556-42.918-118.574-42.918h-200.714c-40.87 0-78.694 13.325-109.427 35.809l-105.062-105.068zM411.886 418.854h68.352v477.261h-68.352c-68.040 0-121.815-53.778-121.815-121.815v-233.628c0-68.040 53.773-121.818 121.812-121.818zM544.238 418.854h68.362c68.037 0 121.815 53.778 121.815 121.815v233.626c0 68.040-53.775 121.818-121.812 121.818h-68.36v-477.261z"></path>
         </symbol>
         <symbol id="icon-capslock" viewBox="0 0 1024 1024">
@@ -211,12 +236,14 @@
         </symbol>
         <symbol id="icon-clipboard" viewBox="0 0 1024 1024">
             <title>clipboard</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M202.24-0.179v129.093l-202.24-0.11v895.375h729.6v-234.419h-64v170.419h-601.6v-644.385h601.6v287.086h64v-474.076h-64v0.11h-138.24v-129.093h-325.12zM266.24 63.821h197.12v96.44h0.32v32.653h201.92v58.88h-601.6v-58.88h202.24v-129.093zM129.165 393.242v64h468.838v-64h-468.836zM522.76 515.302l-181.020 181.018 181.020 181.020 45.256-45.253-103.759-103.767h559.744v-64h-559.749l103.764-103.764-45.253-45.256zM129.165 541.722v64h228.086v-64h-228.083zM129.165 690.202v64h150.246v-64h-150.246zM129.165 833.562v64h258.854v-64h-258.854z"></path>
         </symbol>
         <symbol id="icon-document" viewBox="0 0 1024 1024">
             <title>document</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M477.23 0l-355.63 355.246v668.754h780.8v-1024h-425.17zM513.070 64h325.33v896h-652.8v-568.914h327.47v-327.086zM357.939 520.422v64h406.246v-64h-406.246zM536.1 668.902v64h228.086v-64h-228.086zM295.345 817.382v64h468.838v-64h-468.836z"></path>
         </symbol>
         <symbol id="icon-documents" viewBox="0 0 1024 1024">
@@ -233,7 +260,8 @@
         </symbol>
         <symbol id="icon-error" viewBox="0 0 1024 1024">
             <title>error</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM275.256 230.001l-45.256 45.251 236.744 236.749-236.744 236.744 45.256 45.256 236.744-236.744 236.744 236.744 45.256-45.256-236.744-236.744 236.744-236.749-45.253-45.251-236.749 236.744z"></path>
         </symbol>
         <symbol id="icon-filters-empty" viewBox="0 0 1024 1024">
@@ -246,27 +274,32 @@
         </symbol>
         <symbol id="icon-github" viewBox="0 0 1024 1024">
             <title>github</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 560.801q0 128 38.4 204.262 41.068 81.070 127.468 120.003 87.465 41.062 178.662 50.662 82.138 9.6 177.070 9.6 41.068 0 102.932-3.2 51.738-3.2 110.131-14.131 58.404-10.931 100.536-28.534 48-20.262 88.532-54.664 40.535-34.401 62.935-79.734 37.332-76.262 37.332-204.262 0-146.138-83.732-244.27 16.532-49.6 16.532-104 0-71.997-30.932-133.862-63.468 0-113.331 22.4-49.869 22.4-118.136 75.732-83.732-19.738-172.8-19.738-97.068 0-189.868 21.338-69.862-54.938-119.731-77.338t-113.331-22.4q-31.47 61.34-31.47 133.87 0 54.938 16.532 105.070-83.732 98.127-83.732 243.195zM137.6 669.064q0-75.73 43.469-126.397 43.464-50.67 114.399-50.67 28.262 0 120 13.338 46.932 6.93 96.532 6.93t97.068-6.932q93.332-13.338 120-13.338 70.932 0 114.132 50.67 43.2 50.662 43.2 126.397 0 53.868-19.732 94.932-19.738 39.468-49.331 62.669-29.604 23.199-75.469 37.069-75.735 22.93-178.135 22.93h-103.465q-50.668 0-91.735-4.8-43.732-4.27-88-18.67-44.262-14.4-73.062-36.265-31.47-24.52-50.67-65.326-19.2-40.801-19.2-92.534zM236.268 669.064q0 25.070 8 50.67 8 27.732 27.469 47.734 19.464 19.999 43.464 19.999 25.6 0 44.8-20.8 33.6-38.938 33.6-97.603 0-24.532-6.932-50.132-8-27.73-27.469-47.731-19.466-19.999-43.999-19.999-25.6 0-44.8 21.332-34.132 36.8-34.132 96.532zM630.4 669.064q0 25.070 8 50.67 8 27.735 27.2 47.734t43.2 19.999q26.132 0 45.332-20.8 33.6-38.938 33.6-97.603 0-22.932-7.465-50.132-8-27.73-27.469-47.731-19.466-19.999-43.999-19.999-25.6 0-43.732 21.332-34.668 36.8-34.668 96.532z"></path>
         </symbol>
         <symbol id="icon-maximize" viewBox="0 0 1024 1024">
             <title>maximize</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v325.519h63.734v-216.182l277.88 279.278 45.066-45.292-277.88-279.273h215.099v-64.051h-323.899zM700.101 0v64.051h215.104l-277.88 279.27 45.066 45.294 277.875-279.278v216.182h63.734v-325.519h-323.899zM341.614 635.384l-277.88 279.27v-216.174h-63.734v325.519h323.899v-64.051h-215.099l277.88-279.27-45.066-45.294zM682.391 635.384l-45.069 45.292 277.88 279.27h-215.104v64.054h323.901v-325.519h-63.731v216.174l-277.875-279.27z"></path>
         </symbol>
         <symbol id="icon-minimize" viewBox="0 0 1024 1024">
             <title>minimize</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M45.066 0l-45.066 45.286 277.88 279.278h-215.101v64.051h323.901v-325.522h-63.736v216.177l-277.88-279.27zM978.936 0l-277.88 279.27v-216.177h-63.736v325.522h323.901v-64.051h-215.101l277.88-279.278-45.064-45.286zM62.776 635.384v64.051h215.101l-277.878 279.278 45.066 45.286 277.878-279.27v216.177h63.736v-325.522h-323.901zM637.317 635.384v325.522h63.736v-216.177l277.88 279.27 45.066-45.286-277.88-279.281h215.101v-64.051h-323.901z"></path>
         </symbol>
         <symbol id="icon-move" viewBox="0 0 1024 1024">
             <title>move</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M794.004 118.164l-45.256 45.256 152.742 152.74h-901.491v64h901.491l-152.742 152.74 45.256 45.256 229.996-229.996zM229.996 445.844l-229.996 229.996 229.996 229.996 45.256-45.256-152.742-152.74h901.491v-64h-901.491l152.742-152.74z"></path>
         </symbol>
         <symbol id="icon-reload" viewBox="0 0 1024 1024">
             <title>reload</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M509.394 0c-233.518 0-429.484 165.98-447.278 381.896h60.073c17.953-175.969 181.99-317.737 387.205-317.737 182.817 0 332.954 112.517 376.243 261.486l-153.408-44.155-15.462 61.97 242.309 69.745 64.924-260.285-57.69-16.604-34.412 137.951c-62.42-161.050-229.647-274.266-422.502-274.266zM64.927 610.796l-64.927 260.285 57.69 16.604 34.412-137.951c62.42 161.050 229.647 274.266 422.502 274.266 233.523 0 429.486-165.98 447.283-381.896h-60.076c-17.953 175.967-181.99 317.737-387.205 317.737-182.817 0-332.954-112.517-376.243-261.486l153.408 44.155 15.462-61.97-242.309-69.745z"></path>
         </symbol>
         <symbol id="icon-save" viewBox="0 0 1024 1024">
@@ -283,12 +316,14 @@
         </symbol>
         <symbol id="icon-writer" viewBox="0 0 1024 1024">
             <title>writer</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M956.918 0c-3.584 0.758-149.99 33.782-305.971 85.171-79.708 26.26-163.092 57.866-234.691 94.321s-131.917 76.168-165.699 128.197c-61.824 95.206-74.56 225.979-74.803 333.338-0.2 85.069 8.448 155.786 12.083 181.811l-187.837 201.162 93.993-0.289 147.005-158.354c31.788 4.362 89.759 10.982 156.017 11.871 99.533 1.331 217.201-7.265 295.88-67.046 41.426-31.473 78.024-87.235 115.21-154.532 37.189-67.297 73.336-146.099 105.242-221.558 63.823-150.904 110.653-288.735 110.653-288.735l-58.56-23.099s-46.195 135.834-108.846 283.981c-11.277 26.67-23.101 53.714-35.251 80.41h-172.831v67.174h141.036c-11.592 23.519-23.314 46.259-35.034 67.466-2.714 4.908-5.432 9.708-8.156 14.451h-214.513v67.18h171.674c-17.364 24.102-33.48 42.419-46.574 52.367-55.066 41.838-164.762 56.033-259.154 54.769-40.33-0.538-73.882-2.934-100.275-5.581l701.642-755.799zM871.562 90.593l-627.799 672.346c-2.944-29.251-5.765-69.914-5.645-121.743 0.23-101.023 15.455-220.943 63.544-294.999 9.318-14.349 24.781-29.967 44.902-45.875v200.893h62.367v-242.552c10.829-6.254 22.162-12.424 33.971-18.437 13.507-6.876 27.589-13.609 42.074-20.198v138.977h62.367v-165.504c39.88-15.928 81.28-30.72 121.838-44.083 75.53-24.883 147.789-44.826 202.378-58.824z"></path>
         </symbol>
         <symbol id="icon-watch" viewBox="0 0 1024 1024">
             <title>watch</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 173.404c-310.502 0-513.464 256.829-511.995 338.58 1.469 81.756 205.911 335.24 511.995 338.575s511.027-253.837 511.995-338.575c0.965-84.736-201.498-338.58-511.995-338.58zM507.359 245.094c157.983-1.58 313.549 76.836 409.172 202.071 14.277 21.998 38.886 45.43 31.386 74.030-65.152 128.691-196.237 217.984-335.368 248.013-183.327 38.252-382.523-41.779-498.022-188.237-15.196-24.328-42.565-45.701-40.192-77.112 82.55-157.348 257.050-256.256 433.024-258.765zM514.092 310.341c-2.345 0-4.698 0.033-7.053 0.118-90.429 0.799-174.003 70.231-191.944 158.756-19.901 84.467 22.907 177.938 99.116 219.034 75.254 43.699 177.761 29.765 238.843-32.138 63.191-59.699 79.429-161.807 37.44-238.003-33.58-64.635-103.578-107.584-176.397-107.766z"></path>
         </symbol>
         <symbol id="icon-check-empty" viewBox="0 0 1024 1024">
@@ -297,37 +332,44 @@
         </symbol>
         <symbol id="icon-task" viewBox="0 0 1024 1024">
             <title>task</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M415.391-0.543v73.472l-71.071 0.026v-73.492h-64v73.498h-69.12v-0.113h-64v951.69h729.6v-951.69l-131.169 0.026v-73.416h-64v73.426l-71.071 0.026v-73.439h-64v73.446h-67.169v-73.454h-64zM211.2 136.968h69.12v54.495h64v-54.495h71.071v54.495h64v-54.495h67.169v54.495h64v-54.495h71.071v54.495h64v-54.495h67.169v115.2h-601.6v-115.2zM211.2 316.168h601.6v644.383h-601.6v-644.38zM276.365 393.613v64h78.356v-64h-78.356zM418.721 393.613v64h326.484v-64h-326.487zM276.365 542.093v64h78.356v-64h-78.356zM418.721 542.093v64h326.367v-64h-326.367zM276.365 690.573v64h78.356v-64h-78.356zM418.721 690.573v64h325.33v-64h-325.33zM276.365 833.933v64h78.356v-64h-78.356zM418.721 833.933v64h326.418v-64h-326.42z"></path>
         </symbol>
         <symbol id="icon-api" viewBox="0 0 1024 1024">
             <title>api</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M516.326 0c-39.188 0-74.688 5.32-103.224 15.45-14.269 5.064-26.921 11.169-37.983 20.454-11.059 9.28-21.837 24.123-21.837 42.854 0 0.358 0.026 0.701 0.036 1.055l-94.707 55.296c-25.792 2.189-49.285 6.917-69.338 14.034-14.269 5.064-26.926 11.169-37.99 20.454-10.662 8.947-21.028 23.081-21.76 40.868l-99.553 58.122 3.571 484.316 481.725 271.096 477.24-272.274 1.523-479.037-98.698-59.53c0-0.238 0.026-0.466 0.026-0.704 0-18.729-10.778-33.574-21.837-42.854-11.059-9.285-23.713-15.391-37.983-20.454-20.14-7.15-43.756-11.891-69.678-14.070l-86.682-52.275c0.113-1.331 0.179-2.673 0.179-4.045 0-18.729-10.77-33.572-21.832-42.854-11.059-9.283-23.718-15.386-37.99-20.454-28.529-10.122-64.020-15.447-103.209-15.447zM516.326 64.768c32.973 0 62.797 5.069 81.549 11.725 2.094 0.742 3.441 1.5 5.23 2.268-1.787 0.768-3.139 1.526-5.233 2.268-18.749 6.656-48.576 11.72-81.549 11.72s-62.807-5.069-81.556-11.72c-2.094-0.742-3.446-1.498-5.233-2.268 1.792-0.768 3.139-1.528 5.233-2.271 18.749-6.656 48.581-11.725 81.554-11.725zM386.028 129.459c8.274 5.146 17.28 9.139 27.072 12.616 28.536 10.127 64.036 15.45 103.219 15.45 39.188 0 74.683-5.32 103.219-15.447 9.677-3.436 18.596-7.378 26.796-12.442l17.618 10.179c-12.48 2.419-24.156 5.54-34.854 9.336-14.267 5.064-26.924 11.169-37.985 20.454-11.059 9.28-21.837 24.125-21.837 42.854 0 18.734 10.778 33.574 21.837 42.854 11.059 9.285 23.718 15.391 37.985 20.454 28.539 10.13 64.033 15.45 103.219 15.45s74.685-5.32 103.219-15.447c12.575-4.46 23.885-9.738 33.966-17.28l62.351 35.999-415.859 235.84-415.795-235.853 58.36-33.695c9.242 6.323 19.466 10.993 30.707 14.984 28.536 10.13 64.033 15.45 103.219 15.45 39.183 0 74.685-5.32 103.219-15.447 14.272-5.064 26.924-11.169 37.985-20.454 11.059-9.28 21.837-24.12 21.837-42.854 0-18.729-10.778-33.574-21.837-42.854-11.059-9.285-23.713-15.391-37.983-20.454-9.157-3.251-19.036-5.998-29.517-8.243l19.832-11.448zM292.49 198.477c32.973 0 62.804 5.059 81.554 11.715 2.094 0.742 3.443 1.495 5.233 2.266-1.792 0.768-3.139 1.526-5.233 2.271-18.749 6.656-48.581 11.717-81.554 11.717s-62.807-5.064-81.556-11.717c-2.094-0.742-3.443-1.503-5.233-2.273 1.792-0.773 3.139-1.526 5.233-2.268 18.749-6.656 48.581-11.715 81.556-11.715zM732.316 198.477c32.973 0 62.804 5.059 81.554 11.715 2.092 0.742 3.441 1.495 5.23 2.266-1.792 0.768-3.139 1.526-5.233 2.271-18.752 6.656-48.584 11.717-81.556 11.717s-62.804-5.064-81.556-11.717c-2.094-0.742-3.441-1.503-5.233-2.273 1.792-0.773 3.139-1.526 5.233-2.268 18.752-6.656 48.584-11.715 81.556-11.715zM516.321 272.522c-39.188 0-74.688 5.315-103.224 15.442-14.269 5.069-26.921 11.172-37.983 20.454-11.059 9.283-21.837 24.128-21.837 42.86s10.778 33.572 21.837 42.854c11.064 9.283 23.716 15.391 37.985 20.454 28.536 10.127 64.036 15.447 103.219 15.447 39.188 0 74.683-5.32 103.219-15.447 14.269-5.064 26.926-11.172 37.99-20.454 11.059-9.283 21.832-24.123 21.832-42.854s-10.772-33.577-21.837-42.86c-11.059-9.283-23.716-15.386-37.985-20.454-28.536-10.127-64.031-15.442-103.219-15.442zM516.321 337.29c32.973 0 62.797 5.061 81.549 11.717 2.094 0.742 3.441 1.498 5.23 2.268-1.787 0.768-3.139 1.523-5.233 2.268-18.749 6.656-48.576 11.72-81.549 11.72s-62.807-5.069-81.556-11.72c-2.094-0.742-3.446-1.498-5.233-2.268 1.792-0.768 3.139-1.528 5.233-2.271 18.749-6.656 48.581-11.717 81.554-11.717zM94.72 360.55l389.371 224.801v362.117l-389.371-224.806v-362.112zM933.427 362.811v359.040l-389.376 224.809v-359.048l389.376-224.804z"></path>
         </symbol>
         <symbol id="icon-customize" viewBox="0 0 1024 1024">
             <title>customize</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M740.291 1.889l-601.078 601.075-136.397 419.149 420.078-141.038 57.201-57.201c-25.226-4.974-73.692-15.168-75.054-15.455l-0.922 0.916-188.306-192.461 524.477-524.477 190.387 190.387-121.262 121.257 10.284 80.225 201.485-201.485-280.893-280.893zM721.49 417.774c-28.303 0-31.882 0.22-35.546 2.186-7.181 3.85-7.921 6.861-10.752 43.479-1.416 18.271-3.059 33.812-3.653 34.534-0.589 0.73-5.473 2.56-10.849 4.063-15.447 4.326-29.952 10.156-45.786 18.412-8.064 4.198-15.304 7.642-16.095 7.642-0.794 0-11.812-8.858-24.489-19.686-28.467-24.32-29.268-24.934-34.035-25.948-6.835-1.452-12.526 2.616-34.348 24.568-21.427 21.55-24.865 26.452-23.406 33.344 0.983 4.634 1.748 5.64 25.907 33.856 10.836 12.652 19.699 23.667 19.699 24.484 0 0.819-3.438 8.082-7.642 16.143-8.256 15.834-14.090 30.336-18.414 45.786-1.505 5.376-3.328 10.266-4.055 10.854-0.727 0.594-16.269 2.235-34.534 3.648-36.618 2.831-39.634 3.579-43.487 10.76-1.964 3.661-2.184 7.24-2.184 35.546 0 28.303 0.22 31.88 2.184 35.543 3.84 7.163 6.912 7.926 42.89 10.691 17.946 1.382 33.434 2.747 34.422 3.041 1.111 0.333 2.883 4.498 4.634 10.916 4.265 15.631 10.061 30.116 18.545 46.395 4.204 8.064 7.642 15.329 7.642 16.146 0 0.819-8.463 11.366-18.806 23.45-29.839 34.849-29.714 34.637-25.19 43.991 3.584 7.393 43.136 46.254 49.037 48.174 7.514 2.445 11.023 0.317 39.096-23.7l26.099-22.323 14.405 7.57c17.326 9.106 34.867 16.195 48.64 19.648 6.835 1.715 10.368 3.187 10.757 4.49 0.323 1.068 1.708 16.62 3.080 34.56 2.757 35.981 3.52 39.050 10.68 42.89 3.661 1.966 7.245 2.186 35.546 2.186 28.303 0 31.882-0.22 35.546-2.186 7.16-3.84 7.923-6.912 10.68-42.89 1.37-17.94 2.755-33.467 3.067-34.504 0.376-1.254 4.659-2.985 12.705-5.14 15.027-4.027 28.334-9.441 45.645-18.565 7.332-3.866 14.042-7.030 14.907-7.030s11.942 8.863 24.62 19.694c12.677 10.829 24.806 21.053 26.962 22.72 5.555 4.301 12.588 4.288 18.834-0.038 7.956-5.517 42.906-41.651 44.902-46.438 3.4-8.136 2.15-10.332-22.111-38.792-12.324-14.464-22.41-27.018-22.41-27.904 0-0.891 3.162-7.616 7.027-14.95 9.126-17.306 14.541-30.618 18.565-45.645 2.158-8.046 3.891-12.329 5.14-12.708 1.039-0.312 16.563-1.69 34.509-3.064 35.978-2.757 39.048-3.523 42.888-10.683 1.964-3.661 2.184-7.24 2.184-35.546 0-28.303-0.218-31.88-2.181-35.543-3.855-7.186-6.861-7.928-43.482-10.742-22.036-1.69-33.741-3.054-34.775-4.050-0.858-0.824-2.596-5.545-3.866-10.488-3.456-13.501-9.843-29.42-18.365-45.765-4.204-8.064-7.647-15.355-7.647-16.205 0-0.852 9.815-13.010 21.811-27.021 23.485-27.433 25.626-30.991 23.188-38.492-1.91-5.862-40.786-45.453-48.12-49.006-8.812-4.262-10.458-3.372-39.757 21.555-14.495 12.326-26.998 22.413-27.786 22.413-0.794 0-8.056-3.456-16.154-7.68-15.839-8.269-34.33-15.616-48.113-19.123-5.274-1.344-8.812-2.893-9.139-4.006-0.294-0.998-1.664-16.486-3.039-34.432-2.765-35.978-3.533-39.048-10.696-42.888-3.661-1.966-7.245-2.186-35.546-2.186zM724.511 588.815c28.293 0.581 56.402 10.225 79.898 29.025 41.293 33.034 58.573 86.185 45.128 138.778-3.43 13.396-14.894 35.845-24.325 47.611-21.432 26.734-51.858 43.904-86.52 48.837-7.588 1.075-25.948 1.444-30.244 0.602-0.978-0.192-5.78-0.998-10.675-1.792-16.604-2.703-35.297-10.273-50.414-20.424-41.37-27.776-64.384-78.715-57.49-127.214 4.531-31.872 21.010-62.702 44.16-82.627 26.112-22.477 58.419-33.459 90.486-32.799zM181.484 680.046l160.737 160.735-153.636 51.917-57.472-57.467 50.373-155.187z"></path>
         </symbol>
         <symbol id="icon-feel-love" viewBox="0 0 1024 1024">
             <title>feel-love</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M768.010 0.036c-156.923 3.218-253.192 228.045-254.996 232.289-1.818-4.288-100.803-235.469-261.793-232.261-30.093 0.602-62.344 9.395-96.525 29.422-265.277 155.397-216.2 594.77 358.108 994.273v0.241l0.205-0.128 0.205 0.128v-0.241c566.582-373.642 623.396-838.876 358.121-994.273-33.92-19.866-65.933-28.698-95.813-29.435-2.522-0.064-5.025-0.067-7.516-0.015zM364.191 400.051l45.97 44.524-101.53 104.824 101.53 104.819-45.972 44.529-144.589-149.358 144.589-149.343zM659.809 400.051l144.589 149.343-144.589 149.356-45.97-44.531 101.53-104.822-101.53-104.827 45.972-44.524zM537.646 404.959l59.069 24.645-115.2 276.116-59.069-24.645 115.2-276.116z"></path>
         </symbol>
         <symbol id="icon-highly-designed" viewBox="0 0 1024 1024">
             <title>highly-designed</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M603-0.451l-490.906 490.906-111.404 342.313 343.091-115.174 488.627-488.637-229.409-229.404zM603 73.469l155.489 155.487-430.042 430.047-153.792-157.184 428.344-428.352zM146.611 553.403l131.277 131.277-125.473 42.404-46.943-46.938 41.139-126.74zM760.243 748.687c-46.822-0.422-98.322 6.042-153.528 20.92-96.835 26.097-153.088 76.109-202.030 114.509-48.947 38.4-88.105 65.915-168.589 67.584-79.296 1.644-117.079-27.725-140.5-57.772-23.424-30.042-28.201-42.514-28.201-42.514l-60.723 18.34s0.481 18.934 34.084 62.034c33.6 43.103 97.505 85.955 196.838 83.896 98.138-2.035 159.283-42.117 210.647-82.414 51.361-40.294 95.411-80.092 177.203-102.139 168.817-45.501 281.536 1.326 322.893 56.251 7.7 10.23 8.253 17.357 5.299 25.94s-11.494 19.42-28.867 28.621c-34.739 18.414-103.578 27.679-198.63-3.302-65.5-21.35-96.581-40.771-109.64-51.871-7.009-3.994-7.764-3.963-7.764-3.963l-56.095 34.739c3.19 4.198 5.811 6.011 18.278 16.717 22.861 19.438 61.857 41.677 132.961 64.852 108.306 35.302 196.206 29.358 254.254-1.403 29.030-15.38 50.9-37.619 60.211-64.666 9.306-27.044 3.976-58.102-14.515-82.662-43.612-57.917-125.891-98.381-234.286-101.517-3.080-0.087-6.18-0.154-9.3-0.179z"></path>
         </symbol>
         <symbol id="icon-integration" viewBox="0 0 1024 1024">
             <title>integration</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M739.226 1021.253c-4.634-0.026-64.876-0.138-132.339-0.251-35.625-0.061-68.787-0.681-94.861-1.697-13.036-0.507-24.276-1.111-33.403-1.818-9.126-0.712-14.61-0.896-23.055-3.098-10.148-2.644-18.906-2.145-31.8-14.705-6.451-6.28-10.532-16.102-11.604-22.589-1.075-6.495-0.742-10.56-0.609-14.387 0.481-13.409 4.288-21.076 8.678-30.482 4.396-9.405 10.061-19.162 16.758-28.948 9.124-13.338 12.928-22.003 14.060-27.131 1.134-5.128 1.070-7.877-1.825-15.872-2.637-7.296-6.036-11.407-14.753-15.928-8.719-4.521-23.357-8.236-43.917-8.671-27.896-0.589-47.135 3.185-57.713 8.166-10.573 4.982-13.76 8.909-16.704 18.801-3.615 12.16-3.359 17.556-1.313 23.713 2.048 6.159 7.634 15.068 20.762 27.86 12.595 12.278 19.73 30.387 21.1 47.475 0.691 8.673 3.845 18.207-5.207 33.736-4.531 7.767-12.211 13.396-17.638 16.008-5.435 2.611-9.293 3.533-12.966 4.506-11.699 3.092-13.763 2.007-22.623 2.45-8.863 0.44-20.127 0.799-33.147 1.093-26.035 0.594-58.988 0.927-91.648 0.998-32.666 0.064-64.973-0.136-89.779-0.622-12.403-0.243-22.879-0.556-30.925-0.973-4.019-0.205-7.373-0.425-10.563-0.763-1.597-0.169-3.098-0.34-5.202-0.742-2.107-0.397-2.885 1.93-13.629-5.599-8.289-5.806-9.416-10.010-10.655-12.588-1.242-2.575-1.69-4.122-2.074-5.409-0.758-2.58-1.006-4.096-1.267-5.632-0.522-3.072-0.832-5.888-1.152-9.257-0.65-6.74-1.221-15.327-1.784-25.667-1.121-20.675-2.15-48.077-2.959-77.184-1.613-58.209-2.422-121.889-0.914-153.088 0.494-10.266 1.595-20.109 3.18-28.818 0.788-4.352 1.664-8.376 2.944-12.557s1.050-7.823 8.694-16.604c7.462-8.576 19.218-13.99 29.325-15.048 10.112-1.057 18.662 0.891 26.452 3.656 15.575 5.53 29.338 14.943 44.526 27.653 25.843 21.637 31.974 22.853 49.779 18.166 19.61-5.161 37.325-25.080 45.389-52.961 8.064-27.878 4.884-60.321-10.296-82.637-7.849-11.533-22.426-23.258-36.301-29.601-12.321-5.637-21.965-5.396-24.225-5.307-1.843 1.265-4.646 3.116-7.045 5.391-5.35 5.076-12.022 12.083-17.93 19.016-19.128 22.451-32.86 40.74-63.37 42.414-15.258 0.837-32.568-9.075-40.325-20.296-7.757-11.218-10.445-22.385-12.347-34.624-1.339-8.64-0.937-12.826-0.957-21.786s0.128-20.255 0.41-33.213c0.548-25.925 1.613-58.424 2.9-90.509s2.796-63.7 4.257-87.91c0.732-12.104 1.441-22.31 2.145-30.116 0.358-3.899 0.691-7.142 1.119-10.189 0.215-1.528 0.43-2.954 0.87-4.941 0.435-1.989-1.902-2.478 5.658-12.987 6.871-9.549 11.282-9.894 13.857-10.97s4.001-1.408 5.197-1.7c2.399-0.589 3.73-0.75 5.094-0.929 2.721-0.358 5.184-0.556 8.154-0.75 5.939-0.394 13.542-0.701 22.764-0.955 18.452-0.512 43.169-0.778 70.118-0.709 65.091 0.169 104.090-0.402 127.603-2.419s28.884-4.224 36.659-8.74c13.85-8.049 14.29-11.018 14.546-15.506s-3.174-17.828-18.245-37.683c-9.129-12.022-15.708-21.074-20.705-32.067-5-10.99-6.945-22.707-7.649-33.357 2.86-35.116 11.195-61.279 38.641-79.15 10.189-6.636 17.152-8.243 26.765-11.090 9.618-2.852 20.339-5.381 31.020-7.181h0.005c62.428-10.506 122.12 4.311 149.417 51.661 8.653 15.002 12.851 34.785 9.134 52.874-3.717 18.086-12.833 33.498-25.088 50.163-18.988 25.815-23.544 51.584-24.115 48.184v0.005c0.502 3.016 0.75 4.493 7.278 8.868 6.533 4.378 19.584 9.626 38.766 13.069-4.762-0.858 2.524 0.161 9.242 0.461 6.715 0.307 15.905 0.62 26.632 0.922 21.458 0.607 49.126 1.172 76.741 1.6 27.615 0.43 55.214 0.717 76.531 0.776 10.657 0.026 19.763 0 26.363-0.095 6.605-0.092 14.566-1.114 8.402-0.108 12.621-2.058 25.549 5.811 30.034 11.041 4.48 5.23 5.46 8.535 6.385 11.098 1.848 5.12 2.158 7.982 2.619 11.284 0.922 6.605 1.357 13.916 1.733 23.795 0.748 19.753 0.932 48.952 0.676 89.953-0.43 69.043 2.26 112.474 7.808 135.081 5.542 22.605 6.175 21.197 16.653 24.55 6.016 1.925 5.064 2.022 10.803 0.064 5.747-1.953 17.592-8.415 36.035-21.304 18.442-12.892 34.714-22.484 54.584-25.37 19.866-2.888 39.565 3.712 55.419 13.169 31.406 18.732 44.78 55.194 49.434 100.787 4.695 46.067-3.072 89.567-28.897 120.947-12.58 15.283-33.388 26.854-54.067 30.228-11.067 1.805-25.946 3.226-39.997-1.91-14.054-5.13-23.859-12.48-41.702-24.589-20.367-13.824-33.326-19.369-37.786-20.155-4.465-0.788-2.56-1.674-10.061 4.070-8.993 6.892-10.785 7.552-14.912 33.126-4.129 25.574-5.801 71.895-6.177 149.985-0.113 23.142-0.64 44.518-1.441 60.79-0.397 8.136-0.845 14.925-1.428 20.549-0.292 2.816-0.576 5.248-1.137 8.174-0.282 1.459-0.573 2.995-1.398 5.514s0.445 6.042-9.805 14.945c-9.436 8.2-13.96 8.049-19.041 9.267-5.082 1.224-9.984 1.851-15.642 1.823zM738.501 957.381h1.037c-0.282 0 0.563-0.090 0.404-0.051-0.082 0.026-0.32-0.351-1.441 0.051zM723.884 957.355c0.722-14.881 1.254-35.328 1.357-57.472 0.384-78.73 1.505-125.834 6.989-159.846 5.489-34.012 20.122-59.098 39.132-73.659 15.624-11.971 38.459-20.060 59.976-16.271 21.519 3.789 39.593 14.605 62.577 30.208 26.785 19.302 38.528 23.462 50.586 8.532 9.907-12.032 18.125-40.023 14.669-73.876-3.82-37.463-11.361-48.092-18.611-52.416-9.306-5.555-10.424-5.263-13.512-4.813-3.087 0.445-11.904 3.832-27.177 14.508-20.114 14.062-35.233 23.698-52.050 29.42-16.814 5.724-35.917 5.082-50.849 0.307-27.612-8.832-50.744-35.592-59.226-70.17-8.481-34.58-10.079-80.179-9.638-150.697 0.241-38.554-0.008-64.852-0.602-82.739-4.096 0.010-7.194 0.056-11.914 0.044-21.745-0.056-49.518-0.348-77.345-0.778-27.827-0.435-55.675-1.004-77.555-1.62-10.939-0.307-20.367-0.63-27.699-0.96-7.332-0.333-9.518 0.059-17.651-1.4-24.653-4.424-45.568-11.174-63.040-22.879-17.469-11.704-31.258-30.395-34.744-51.548-5.906-35.86 11.814-63.959 35.681-96.41 9.564-13.010 13.253-21.632 13.985-25.185 0.73-3.553 1.024-3.021-1.912-8.115-9.428-16.358-36.564-28.467-83.482-20.575-7.77 1.306-16.538 3.372-23.475 5.427-6.932 2.056-13.573 5.668-10.053 3.374-13.107 10.342-13.768 19.144-7.706 32.563 1.29 2.842 5.069 8.863 13.427 19.873 19.704 25.953 32.768 51.43 31.145 79.931-1.62 28.498-21.412 52.685-46.221 67.105-15.534 9.027-35.080 14.735-63.293 17.152-28.211 2.424-67.758 2.824-133.23 2.652-26.414-0.067-50.698 0.205-68.198 0.686-0.819 0.026-1.111 0.056-1.9 0.077-0.323 4.598-0.614 7.859-0.952 13.466-1.421 23.506-2.918 54.861-4.198 86.623-1.272 31.762-2.33 63.99-2.867 89.3-0.248 11.656-0.353 21.332-0.358 29.21 1.523-1.551 2.885-2.611 4.48-4.485 7.444-8.742 15.309-17.024 22.605-23.941 7.291-6.912 9.574-11.551 23.936-17.754 27.169-11.725 53.786-5.069 77.842 5.932 24.054 11 46.579 28.293 62.546 51.763 28.078 41.267 31.585 92.257 18.842 136.312-12.749 44.058-43.341 84.564-90.478 96.973-35.942 9.467-73.733-3.067-107.044-30.95-3.756-3.149-6.769-5.094-9.984-7.342-0.077 1.157-0.287 2.002-0.34 3.159-1.229 25.472-0.622 90.824 0.973 148.242 0.794 28.708 1.81 55.767 2.883 75.484 0.133 2.483 0.261 3.558 0.399 5.796 4.838 0.154 8.361 0.328 14.326 0.443 24.049 0.474 56.077 0.673 88.392 0.607 32.312-0.067 64.973-0.404 90.324-0.98 9.078-0.205 15.711-0.471 22.502-0.735-14.525-14.925-25.907-30.234-31.939-48.392-6.707-20.204-5.289-41.915 0.709-62.075 7.534-25.318 26.437-46.938 50.708-58.368 24.274-11.433 52.646-14.95 86.277-14.234 27.156 0.571 51.244 5.076 71.969 15.828 20.726 10.747 37.478 28.961 45.414 50.893 5.727 15.826 7.969 34.033 4.122 51.4-3.84 17.364-12.303 32.73-23.711 49.4-3.507 5.128-5.868 9.697-8.294 14.228 1.3 0.138 0.742 0.113 2.176 0.225 7.834 0.614 18.45 1.19 30.938 1.677 24.978 0.973 57.536 1.595 92.475 1.651 59.505 0.097 101.036 0.179 116.895 0.22zM51.602 954.795c-1.582-0.435-2.168-0.192-2.55-0.172 0.428 0.044 1.782 0.115 2.552 0.174zM69.491 701.463c0.571-1.221 0.369-1.516 0.266-1.183-0.044 0.133-0.197 0.911-0.269 1.178zM73.851 278.515c0.497-1.597 0.256-2.166 0.271-2.524-0.059 0.41-0.184 1.777-0.271 2.524z"></path>
         </symbol>
         <symbol id="icon-lend-hand" viewBox="0 0 1024 1024">
             <title>lend-hand</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M258.519 65.162c-52.92-0.315-109.614 17.984-160.481 62.899-80.781 71.327-111.36 153.395-92.774 233.416 18.304 78.853 76.69 151.987 157.709 228.71l-30.438 30.541c-31.242 31.355-36.948 83.64-4.751 115.948 12.723 12.767 28.557 19.574 44.979 21.222 1.649 16.486 8.435 32.376 21.161 45.146 12.723 12.764 28.557 19.574 44.979 21.228 1.651 16.486 8.438 32.379 21.161 45.146 12.723 12.769 28.557 19.574 44.984 21.228 1.646 16.481 8.428 32.369 21.151 45.138 32.197 32.307 84.301 26.583 115.546-4.767l82.089-82.373 92.28 92.278 2.324 1.644s52.838 33.887 109.146 3.853c25.024-13.345 37.499-36.48 42.273-56.768 20.626 2.186 45.624-1.403 65.818-19.917 19.374-17.754 32.369-37.98 32.312-59.546-0.013-5.248-0.527-9.805-1.29-13.893 17.367-2.647 36.063-9.615 50.401-27.141 36.966-45.972 15.452-82.834 7.296-101.248-8.166-18.406-39.245-49.946-39.245-49.946 22.287-23.163 70.177-77.396 103.565-147.213 22.413-46.868 38.84-101.75 34.637-160.138-4.206-58.388-30.456-119.278-86.963-172.255-45.558-42.711-97.216-62.067-147.523-63.757-16.768-0.563-33.39 0.84-49.587 3.994-64.776 12.595-123.295 49.469-173.714 91.4-12.575 10.458-24.678 21.292-36.224 32.246-20.109-20.552-66.806-64.443-127.974-97.157-41.26-22.067-89.92-39.603-142.838-39.921zM258.109 132.529c38.031 0.225 76.708 13.363 111.475 31.956 54.19 28.979 96.461 69.445 112.64 86.042-54.154 59.668-87.869 111.427-87.869 111.427l-6.656 10.138 1.347 12.058s2.55 33.536 25.523 63.462c11.482 14.968 29.637 29.594 53.642 35.392 24.005 5.793 51.858 2.696 82.504-9.789 23.45-9.549 42.696-20.449 58.488-31.872 0 0 250.112 245.844 252.068 247.954 7.212 7.782 20.572 26.501 7.334 38.572-13.235 12.070-34.519 5.914-41.152-1.644-4.211-4.795-71.084-69.069-71.084-69.069-4.18-4.045-7.588-7.634-11.776-11.653-49.193-47.155-96.261-90.24-97.229-91.126l-0.63-0.594-0.364-0.338-45.85 49.352 109.338 103.091c20.109 19.443 40.586 39.352 56 55.373 9.344 9.715 17.203 18.278 22.461 24.507 7.071 7.997 17.229 20.8 4.562 32.033-12.664 11.233-26.957 3.553-39.322-4.403l-169.083-166.397-47.447 47.826 0.192 0.189 167.186 167.186s11.098 20.536-6.257 32.556c-17.352 12.019-33.357-2.322-38.264-5.315l-99.205-99.208c4.9-24.609-0.881-50.683-19.909-69.778-6.579-6.605-14.003-11.597-21.903-15.13 7.91-26.772 3.072-56.448-17.984-77.581-6.001-6.016-12.698-10.714-19.814-14.172 9.889-27.914 5.755-59.794-16.502-82.13-22.259-22.336-54.026-26.483-81.843-16.563-3.446-7.142-8.125-13.857-14.124-19.878-32.197-32.307-84.301-26.578-115.54 4.774l-42.527 42.675c-77.499-73.272-126.618-140.032-139.661-196.211-13.166-56.704 2.445-106.488 71.747-167.68 39.598-34.964 77.46-46.259 115.489-46.029zM787.128 141.299c34.509 0.402 67.891 13.133 103.173 46.208 45.806 42.941 62.776 85.345 65.843 127.949 3.072 42.598-9.165 86.408-28.211 126.234-28.713 60.037-71.534 108.664-90.911 129.009l-180.813-177.613c0.481-0.753 0.998-1.51 1.454-2.258 1.446-2.355 2.176-4.567 3.4-6.899 4.859 2.181 9.695 4.385 15.155 6.502 30.021 11.628 69.478 23.337 110.446 10.624 68.291-21.197 119.066-76.764 121.83-140.421l-67.302-2.924c-1.080 24.883-31.142 65.551-74.496 79.002-14.848 4.608-42.752-0.041-66.143-9.101-23.388-9.062-40.568-19.896-40.568-19.896l-51.72-32.794v61.243s1.050 4.664-8.013 19.438c-9.068 14.771-28.429 36.275-74.949 55.229-21.325 8.689-33.889 8.479-41.283 6.694s-11.617-5.197-16.010-10.921c-4.385-5.714-7.378-13.169-9.285-19.2 17.812-25.48 74.504-102.912 149.901-165.614 45.338-37.709 96.051-67.84 143.508-77.071 11.866-2.304 23.491-3.548 34.995-3.415zM315.73 540.582c2.391 0.197 4.26 1.070 5.325 2.138 2.834 2.847 4.301 11.418-4.762 20.506l-120.53 120.96c-9.057 9.088-17.597 7.616-20.434 4.769-2.834-2.842-4.301-11.418 4.762-20.506l120.525-120.955c5.663-5.683 11.121-7.237 15.112-6.912zM411.694 577.019c2.394 0.192 4.262 1.068 5.325 2.132 2.836 2.847 4.306 11.423-4.751 20.511l-150.359 150.886c-9.057 9.088-17.603 7.613-20.436 4.769-2.836-2.847-4.306-11.41 4.751-20.5l150.364-150.892c5.658-5.683 11.118-7.237 15.109-6.912zM448.010 673.326c2.394 0.195 4.262 1.068 5.325 2.135 2.836 2.847 4.301 11.418-4.756 20.506l-120.535 120.955c-9.057 9.088-17.595 7.619-20.429 4.774-2.842-2.847-4.306-11.423 4.749-20.511l120.535-120.955c5.663-5.683 11.123-7.235 15.114-6.907zM487.903 766.034c2.396 0.195 4.257 1.070 5.325 2.135 2.831 2.847 4.301 11.423-4.756 20.511l-94.29 94.618c-9.057 9.088-17.6 7.611-20.436 4.762-2.834-2.842-4.301-11.412 4.762-20.5l94.285-94.618c5.658-5.678 11.121-7.235 15.109-6.907z"></path>
         </symbol>
         <symbol id="icon-powerful" viewBox="0 0 1024 1024">
@@ -336,17 +378,20 @@
         </symbol>
         <symbol id="icon-smiley" viewBox="0 0 1024 1024">
             <title>smiley</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM307.2 299.886c0 0 0 0 0 0-45.444 0-82.285 36.839-82.286 82.283 0 45.445 36.841 82.286 82.286 82.286s82.286-36.841 82.286-82.286c-0.001-45.444-36.842-82.284-82.286-82.284 0 0 0 0 0 0zM716.8 299.886c0 0 0 0 0 0-45.444 0-82.285 36.839-82.286 82.283 0 45.445 36.841 82.286 82.286 82.286 0 0 0 0 0 0 45.445 0 82.286-36.841 82.286-82.286s-36.842-82.284-82.286-82.284c0 0 0 0 0 0zM189.089 574.344c7.276 189.458 142.546 321.976 324.547 320.051 181.996-1.925 323.666-158.152 324.897-320.051h-649.444zM256.435 638.344h70.879v127.002c-37.299-34.066-62.73-78.208-70.879-127.002zM391.314 638.344h89.6v194.911c-32.192-3.571-62.387-12.288-89.6-25.17v-169.738zM544.914 638.344h89.6v170.565c-27.251 12.659-57.439 21.158-89.6 24.525v-195.087zM698.514 638.344h72.678c-8.279 49.567-34.406 94.316-72.678 128.596v-128.594z"></path>
         </symbol>
         <symbol id="icon-social-management" viewBox="0 0 1024 1024">
             <title>social-management</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M143.168 0c-77.806 0-141.568 63.764-141.568 141.568 0 77.811 63.762 141.568 141.568 141.568 13.245 0 26.066-1.889 38.246-5.338l34.422 57.789c-76.48 56.438-126.223 147.164-126.223 249.216 0 170.598 138.982 309.581 309.581 309.581 88.499 0 168.479-37.412 224.973-97.229l52.378 39.532c-4.954 14.372-7.685 29.747-7.685 45.74 0 77.804 63.759 141.568 141.568 141.568 77.806 0 141.568-63.764 141.568-141.568 0-77.811-63.762-141.568-141.568-141.568-38.802 0-74.104 15.857-99.753 41.403l-47.56-35.896c28.941-47.071 45.658-102.41 45.658-161.562 0-49.779-11.853-96.855-32.845-138.583l117.683-86.226c24.095 18.964 54.395 30.349 87.224 30.349 77.806 0 141.568-63.762 141.568-141.568 0-77.809-63.762-141.573-141.568-141.573-77.809 0-141.573 63.764-141.573 141.568 0 21.949 5.074 42.778 14.106 61.371l-112.026 82.081c-56.788-71.235-144.256-117.002-242.145-117.002-45.701 0-89.124 9.979-128.223 27.863l-33.492-56.223c28.948-25.979 47.258-63.611 47.258-105.293 0-77.804-63.762-141.568-141.568-141.568zM143.168 64c43.22 0 77.568 34.355 77.568 77.568 0 43.223-34.348 77.568-77.568 77.568-43.218 0-77.568-34.345-77.568-77.568 0-43.213 34.35-77.568 77.568-77.568zM880.832 171.205c43.218 0 77.568 34.355 77.568 77.573s-34.35 77.568-77.568 77.568c-43.22 0-77.573-34.35-77.573-77.568 0-43.22 34.355-77.576 77.573-77.576zM399.194 339.218c136.013 0 245.581 109.576 245.581 245.588s-109.568 245.581-245.581 245.581c-136.013 0-245.586-109.568-245.586-245.581s109.573-245.586 245.586-245.586zM397.069 403.858c-65.134-1.024-116.89 74.757-90.726 134.82 7.414 19.259 21.156 35.891 38.277 47.327-58.947 25.882-93.96 90.793-93.023 153.784-0.154 12.301-1.311 24.968 10.496 24.602 87.867-1.787 194.995 0.384 282.872-0.195 11.494-69.924-23.578-148.57-89.882-177.981 46.472-30.751 59.709-103.352 21.363-145.684-19.174-23.281-49.126-37.499-79.378-36.675zM398.743 464.41c1.357-0.018 2.732 0.044 4.116 0.189 33.349 1.528 49.093 52.659 19.205 70.574-23.578 16.755-63.872-0.614-61.133-31.693 0.307-20.495 17.418-38.789 37.811-39.071zM401.311 635.384c38.211 0.607 70.382 32.735 80 67.917-54.477-0.056-108.954 0.154-163.423-0.154 10.040-35.244 41.298-67.379 79.708-67.722 1.244-0.051 2.483-0.061 3.712-0.041zM810.419 804.864c43.223 0 77.576 34.345 77.576 77.568 0 43.213-34.355 77.568-77.573 77.568-43.213 0-77.568-34.355-77.568-77.568 0-43.223 34.355-77.568 77.568-77.568z"></path>
         </symbol>
         <symbol id="icon-speak-up" viewBox="0 0 1024 1024">
             <title>speak-up</title>
-            <path class="path1"
+            <path
+                class="path1"
                 d="M0 0v768h175.544v256h66.696l165.471-256h616.289v-768h-1024zM64 64h896v640l-580.854 0.914-139.602 218.854v-155.768h0.031l0.041-64h-175.616v-640zM654.405 103.439c-87.194-2.156-140.864 123.187-141.855 125.517-0.986-2.319-54.477-127.24-141.471-125.507-16.261 0.325-33.69 5.076-52.16 15.898-143.35 83.968-116.833 321.408 193.516 537.285v0.128l0.115-0.069 0.102 0.077v-0.133c306.168-201.907 336.87-453.315 193.523-537.293-18.33-10.732-35.622-15.503-51.771-15.903z"></path>
         </symbol>
         <symbol id="icon-gallery" viewBox="0 0 1024 1024">
@@ -359,11 +404,19 @@
         </symbol>
         <symbol id="icon-recruit" viewBox="0 0 1024 1024">
             <title>Looking for people</title>
-            <path d="M510.5 3l-159 141.7-207 14.2-19.3 203L0 513.4l125.2 151.2 19.3 208 207 19 159 132.3 159-132.4 207-19 14.5-203L1021 518 896 362.2 876.6 159l-207-19-159-137zm0 250.5c72.3 0 135 56.7 135 132.3 0 75.7-62.7 132.4-135 132.4-72.2 0-134.8-56.7-134.8-127.6 0-71 62.6-127.7 134.8-127.7zm0 331c96.4 0 269.8 47 269.8 127.5v66.2H240.8V712c0-85 178.2-132.4 269.7-132.4z"/>
+            <path
+                d="M510.5 3l-159 141.7-207 14.2-19.3 203L0 513.4l125.2 151.2 19.3 208 207 19 159 132.3 159-132.4 207-19 14.5-203L1021 518 896 362.2 876.6 159l-207-19-159-137zm0 250.5c72.3 0 135 56.7 135 132.3 0 75.7-62.7 132.4-135 132.4-72.2 0-134.8-56.7-134.8-127.6 0-71 62.6-127.7 134.8-127.7zm0 331c96.4 0 269.8 47 269.8 127.5v66.2H240.8V712c0-85 178.2-132.4 269.7-132.4z"/>
         </symbol>
         <symbol id="icon-badge" viewBox="0 0 1024 1024">
             <title>Owner Badge</title>
-            <path fill="#9dce0a" d="M512.053 24.761l-130.433 173.609-213.936-30.392 30.427 214.125-173.349 130.201 173.349 130.2-30.427 214.123 214.747-30.506 130.064 173.118 129.997-173.027 214.355 30.451-30.588-215.258 172.981-129.922-172.497-129.561 30.458-214.345-214.912 30.53-130.235-173.346z"></path>
+            <path
+                fill="#9dce0a"
+                d="M512.053 24.761l-130.433 173.609-213.936-30.392 30.427 214.125-173.349 130.201 173.349 130.2-30.427 214.123 214.747-30.506 130.064 173.118 129.997-173.027 214.355 30.451-30.588-215.258 172.981-129.922-172.497-129.561 30.458-214.345-214.912 30.53-130.235-173.346z"></path>
+        </symbol>
+        <symbol id="icon-team-question" viewBox="0 0 1024 1024">
+            <title>team-question</title>
+            <path
+                d="M165 91.5c-33 0-60 28.7-60 64 0 35.2 27 64 60 64s60-28.8 60-64c0-35.3-27-64-60-64zm0 16.2c24.8 0 44.8 21.3 44.8 47.8 0 26.5-20 47.8-44.8 47.8-25 0-45-21.3-45-47.8 0-26.5 20-47.8 45-47.8zm-77.8 13.5c-29.2 0-53 25.5-53 56.7 0 31 23.8 56.5 53 56.5 16 0 27.5-4.5 37.3-16.6-21.8-9.7-34-36-34-62.5 0-12 3-23.3 8.5-33-3.8-.8-7.7-1.3-11.8-1.3zM165 229.7c-53.3 0-95.8 50.8-96 112.5v8h192v-8c-.2-61.7-42.8-112.5-96-112.5zm-78.7 13.6c-3.4 0-5.8.3-5.8.3-47.2 0-78 45-78.3 99.5v7.3h52.2v-8c0-41.3 15.2-78.6 43.7-98.2-3.8-.6-8.2-.8-11.7-.7zM165 246c42 0 76.8 38.2 80.5 88h-161c3.6-49.8 38.6-88 80.5-88zM339.3 49.7C307 49.7 281 76 281 108.2c0 32.2 26 58.4 58.3 58.4s58.5-26.2 58.5-58.4c0-32.3-26.2-58.5-58.5-58.5zm0 7.3c28.3 0 51.2 23 51.2 51.2 0 28.3-23 51-51.2 51-28.3 0-51-22.7-51-51S311 57 339.2 57zm-.2 11.8c-7 0-14 1.7-20.5 5l3 7c3.5-1.6 6.5-2.7 9-3.3 2.7-.7 5.4-1 8-1 4.4 0 7.6 1 10 3 2.2 1.8 3.3 4.5 3.3 8 0 3-.6 5.4-1.8 7.4-1.2 2-4.2 5-9 9-3.3 2.8-5.7 5.6-7 8.2-1.2 2.6-1.8 6-1.8 10v2.8h6.7v-1.7c0-3.3.5-6 1.6-8 1-2 3.5-4.4 7-7.3 4.4-4 7.2-6.6 8.5-8.3 1.4-1.8 2.4-3.6 3-5.5.8-2 1-4.2 1-6.7 0-6-1.7-10.6-5.4-13.8-3.7-3.3-8.8-5-15.5-5zm-6.8 62.5V148h7.3v-16.7h-7.3z"></path>
         </symbol>
     </defs>
 </svg>

From 088986626db1a2d272b1b780fc4c5e6fca7030bf Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 25 Feb 2016 16:24:19 +0100
Subject: [PATCH 082/155] Blocked projects

Add blocked project page

Fix styles in plugins

Add blocked warning in dashboard

Add blocked warning to dropdown

Add blocked warning to projects list

Add blocked project in project profile

Minor style code fixes in project like/watch

Bloc project listing

Profile Favs in blocked projects

Blocked projects

Fix jade syntax error

Fixing tests

Updating changelog
---
 CHANGELOG.md                                  |  1 +
 app/coffee/app.coffee                         | 46 +++++++++++++++++++
 app/coffee/modules/base.coffee                |  1 +
 app/locales/taiga/locale-en.json              |  5 ++
 app/modules/home/duties/duty.jade             |  6 ++-
 app/modules/home/home.service.coffee          |  1 +
 app/modules/home/home.service.spec.coffee     |  6 +++
 .../home/projects/home-project-list.jade      | 12 ++++-
 .../home/projects/home-project-list.scss      | 14 ++++++
 app/modules/home/working-on/working-on.jade   |  6 ++-
 .../dropdown-project-list.jade                | 12 ++++-
 .../navigation-bar/navigation-bar.scss        |  8 ++++
 .../profile/profile-favs/items/project.jade   | 24 +++++-----
 .../profile/profile-favs/items/ticket.jade    | 14 +++---
 .../profile-favs.controller.coffee            |  1 -
 .../profile/profile-favs/profile-favs.jade    | 24 ++++++++--
 .../profile-projects/profile-projects.jade    | 20 ++++----
 app/modules/profile/profile.scss              |  1 -
 ...ocked-project-explanation.directive.coffee | 25 ++++++++++
 .../projects/listing/projects-listing.jade    |  8 +++-
 .../listing/styles/profile-projects.scss      | 15 +++++-
 .../projects/listing/styles/project-list.scss | 13 +++++-
 .../project/blocked-project-explanation.jade  |  5 ++
 .../projects/project/blocked-project.jade     | 15 ++++++
 .../projects/project/blocked-project.scss     | 42 +++++++++++++++++
 app/styles/components/list-items.scss         | 27 ++++++++++-
 app/svg/sprite.svg                            |  7 +++
 e2e/suites/project-home.e2e.js                |  7 +++
 28 files changed, 319 insertions(+), 47 deletions(-)
 create mode 100644 app/modules/projects/components/blocked-project-explanation.directive.coffee
 create mode 100644 app/modules/projects/project/blocked-project-explanation.jade
 create mode 100644 app/modules/projects/project/blocked-project.jade
 create mode 100644 app/modules/projects/project/blocked-project.scss

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4246e874..dfe2d59b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Features
 - Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).
+- Blocked projects support
 - Moved from iconfont to SVG sprite icon system and redesign.
 - Redesign 'Admin > Project > Modules' panel.
 - Add badge to project owners
diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 83976ab3..d0a750f5 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -111,6 +111,16 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
         }
     )
 
+
+    $routeProvider.when("/blocked-project/:pslug/",
+        {
+            templateUrl: "projects/project/blocked-project.html",
+            loader: true,
+            controller: "Project",
+            controllerAs: "vm"
+        }
+    )
+
     $routeProvider.when("/project/:pslug/",
         {
             templateUrl: "projects/project/project.html",
@@ -515,6 +525,42 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
 
     $httpProvider.interceptors.push("versionCheckHttpIntercept")
 
+
+    blockingIntercept = ($q, $routeParams, $location, $navUrls) ->
+        # API calls can return blocked elements and in that situation the user will be redirected
+        # to the blocked project page
+        # This can happens in two scenarios
+        # - An ok response containing a blocked_code in the data
+        # - An error reponse when updating/creating/deleting including a 451 error code
+        redirectToBlockedPage = ->
+            pslug = $routeParams.pslug
+            blockedUrl = $navUrls.resolve("blocked-project", {project: pslug})
+            currentUrl = $location.url()
+            if currentUrl.indexOf(blockedUrl) == -1
+                $location.replace().path(blockedUrl)
+
+        responseOk = (response) ->
+            if response.data.blocked_code
+                redirectToBlockedPage()
+
+            return response
+
+        responseError = (response) ->
+            if response.status == 451
+                redirectToBlockedPage()
+
+            return $q.reject(response)
+
+        return {
+            response: responseOk
+            responseError: responseError
+        }
+
+    $provide.factory("blockingIntercept", ["$q", "$routeParams", "$location", "$tgNavUrls", blockingIntercept])
+
+    $httpProvider.interceptors.push("blockingIntercept")
+
+
     $compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false)
 
     if localStorage.userInfo
diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index e0b8c33b..2806d182 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -67,6 +67,7 @@ urls = {
     "profile": "/profile"
     "user-profile": "/profile/:username"
 
+    "blocked-project": "/blocked-project/:project"
     "project": "/project/:project"
     "project-backlog": "/project/:project/backlog"
     "project-taskboard": "/project/:project/taskboard/:sprint"
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index c53fc45b..368d9784 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -740,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "project<br/> points",
             "DEFINED": "defined<br/> points",
diff --git a/app/modules/home/duties/duty.jade b/app/modules/home/duties/duty.jade
index ee04e0b8..c0678e0a 100644
--- a/app/modules/home/duties/duty.jade
+++ b/app/modules/home/duties/duty.jade
@@ -1,7 +1,7 @@
 a.list-itemtype-ticket(
     href="{{ ::vm.duty.get('url') }}"
     title="{{ ::duty.get('subject') }}"
-    ng-class="{'blocked': vm.duty.get('is_blocked')}"
+    ng-class="{'blocked': vm.duty.get('is_blocked'), 'blocked-project': vm.duty.get('blockedProject')}"
 )
     div.list-itemtype-avatar(ng-if="::vm.duty.get('assigned_to_extra_info')")
         img(
@@ -16,8 +16,12 @@ a.list-itemtype-ticket(
     div.list-itemtype-ticket-data
         p
             span.ticket-project {{ ::vm.duty.get('projectName')}}
+                
             span.ticket-type {{ ::vm.getDutyType() }}
             span.ticket-status(ng-style="{'color': vm.duty.get('status_extra_info').get('color')}") {{ ::vm.duty.get('status_extra_info').get('name') }}
+            svg.icon.icon-blocked-project(ng-if="vm.duty.get('blockedProject')")
+                use(xlink:href="#icon-blocked-project")
+                    title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
 
         h2
             span.ticket-id(tg-bo-ref="duty.get('ref')")
diff --git a/app/modules/home/home.service.coffee b/app/modules/home/home.service.coffee
index 625b31a2..47aa069f 100644
--- a/app/modules/home/home.service.coffee
+++ b/app/modules/home/home.service.coffee
@@ -41,6 +41,7 @@ class HomeService extends taiga.Service
 
             duty = duty.set('url', url)
             duty = duty.set('projectName', project.get('name'))
+            duty = duty.set('blockedProject', project.get('blocked_code'))
             duty = duty.set("_name", objType)
 
             return duty
diff --git a/app/modules/home/home.service.spec.coffee b/app/modules/home/home.service.spec.coffee
index 24b1f01f..41b162ff 100644
--- a/app/modules/home/home.service.spec.coffee
+++ b/app/modules/home/home.service.spec.coffee
@@ -128,6 +128,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/us/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'userstories'
                         }]
                         tasks: [{
@@ -136,6 +137,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/tasks/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'tasks'
                         }]
                         issues: [{
@@ -144,6 +146,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/issues/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'issues'
                         }]
                     }
@@ -154,6 +157,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/us/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'userstories'
                         }]
                         tasks: [{
@@ -162,6 +166,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/tasks/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'tasks'
                         }]
                         issues: [{
@@ -170,6 +175,7 @@ describe "tgHome", ->
                             project: '1',
                             url: '/testing-project/issues/1',
                             projectName: 'fake1',
+                            blockedProject: undefined,
                             _name: 'issues'
                         }]
                     }
diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index a5d4c52a..7bb4820a 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -1,6 +1,10 @@
 section.home-project-list(ng-if="vm.projects.size")
 
-    .home-project(tg-bind-scope, tg-repeat="project in vm.projects")
+    .home-project(
+        tg-bind-scope
+        tg-repeat="project in vm.projects"
+        ng-class="{'blocked-project': project.get('blocked_code')}"
+    )
         .tags-container
             .project-tag(
                 style="background: {{tag.get('color')}}"
@@ -19,7 +23,7 @@ section.home-project-list(ng-if="vm.projects.size")
                         alt="{{::project.get('name')}}"
                     )
                 h2.project-card-name
-                    a(
+                    a.project-title(
                         href="#"
                         tg-nav="project:project=project.get('slug')"
                         title="{{::project.get('name')}}"
@@ -27,6 +31,10 @@ section.home-project-list(ng-if="vm.projects.size")
                     svg.look-for-people.icon.icon-recruit(ng-if="project.get('is_looking_for_people')")
                         use(xlink:href="#icon-recruit")
                             title="{{ ::project.get('looking_for_people_note') }}"
+                    svg.icon.icon-blocked-project(ng-if="project.get('blocked_code')")
+                        use(xlink:href="#icon-blocked-project")
+                            title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
+                        
             p.project-card-description {{::project.get('description')| limitTo:100 }}
                  span(ng-if="::project.get('description').length > 100") ...
             .project-card-statistics
diff --git a/app/modules/home/projects/home-project-list.scss b/app/modules/home/projects/home-project-list.scss
index 503b1155..d87810e0 100644
--- a/app/modules/home/projects/home-project-list.scss
+++ b/app/modules/home/projects/home-project-list.scss
@@ -9,6 +9,20 @@
     &:hover {
         border: 1px solid $primary-light;
     }
+    &.blocked-project {
+        border: $whitish;
+        &:hover {
+            border: $whitish;
+        }
+        .tags-container,
+        .project-card-logo,
+        .project-card-name a,
+        .icon-recruit,
+        .project-card-description,
+        .project-card-statistics {
+            opacity: .3;
+        }
+    }
 }
 
 .projects-empty {
diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade
index 62e3d755..6b301ba8 100644
--- a/app/modules/home/working-on/working-on.jade
+++ b/app/modules/home/working-on/working-on.jade
@@ -20,7 +20,11 @@ section.watching-container
     .title-bar.watching-title(translate="HOME.WATCHING_SECTION")
 
     .watching(ng-if="vm.watching.size")
-        .duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{'blocked': duty.is_blocked}")
+        .duty-single(
+            tg-duty="duty"
+            tg-repeat="duty in vm.watching"
+            ng-class="{'blocked': duty.is_blocked}"
+        )
 
     .watching-empty(ng-if="vm.watching != undefined && vm.watching.size === 0")
         p(translate="HOME.EMPTY_WATCHING")
diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
index 47a2a7c0..c52a9961 100644
--- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
+++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
@@ -4,8 +4,16 @@ a(href="", title="Projects", tg-nav="projects")
 
 div.navbar-dropdown.dropdown-project-list
     ul
-        li(tg-repeat="project in vm.projects track by project.get('id')")
-            a(href="#", tg-nav="project:project=project.get('slug')") {{::project.get("name")}}
+      li(tg-repeat="project in vm.projects track by project.get('id')")
+        a(
+            href="#"
+            tg-nav="project:project=project.get('slug')"
+            ng-class="{'blocked-project': project.get('blocked_code')}"
+        )
+            span {{::project.get("name")}}
+            svg.icon.icon-blocked-project(ng-if="project.get('blocked_code')")
+                use(xlink:href="#icon-blocked-project")
+                    title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
 
     a.see-more-projects-btn.button-gray(
         href="#",
diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss
index 4a6f78a0..26f0fadf 100644
--- a/app/modules/navigation-bar/navigation-bar.scss
+++ b/app/modules/navigation-bar/navigation-bar.scss
@@ -173,6 +173,14 @@ $dropdown-width: 350px;
         &.create-project-btn {
             flex: 1;
         }
+        &.blocked-project {
+            color: $gray;
+            svg {
+                margin-left: .5rem;
+                position: relative;
+                top: .25rem;
+            }
+        }
     }
     .import-project-button {
         &:hover {
diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade
index c298b272..99f58d66 100644
--- a/app/modules/profile/profile-favs/items/project.jade
+++ b/app/modules/profile/profile-favs/items/project.jade
@@ -1,7 +1,6 @@
-.list-itemtype-project
+.list-itemtype-project(ng-class="{'blocked-project': vm.item.get('project_blocked_code')}")
     .list-itemtype-project-left
         .list-itemtype-project-data-wrapper
-
             a.list-itemtype-project-image(
                 href="#"
                 tg-nav="project:project=vm.item.get('slug')"
@@ -14,20 +13,21 @@
 
             .list-itemtype-project-data
                 h2
-                    a(
+                    a.list-itemtype-project-name(
                         href="#"
                         tg-nav="project:project=vm.item.get('slug')"
                         title="{{ ::vm.item.get('name') }}"
                     ) {{ ::vm.item.get('name') }}
-                    span.private(ng-if="::project.get('is_private')", title="{{'PROJECT.PRIVATE' | translate}}")
-                p {{ ::vm.item.get('description') }}
-
-        .list-itemtype-project-tags.tags-container(ng-if="::vm.item.get('tags_colors').size")
-            span.tag(
-                tg-repeat="tag in ::vm.item.get('tags_colors')"
-                style='border-left: 5px solid {{ ::tag.get("color") }};'
-            )
-                span.tag-name {{ ::tag.get('name') }}
+                    span.private(
+                        ng-if="::vm.item.get('project_is_private')"
+                        title="{{'PROJECT.PRIVATE' | translate}}"
+                    )
+                        svg.icon.icon-lock
+                            use(xlink:href="#icon-lock")
+                    svg.icon.icon-blocked-project(ng-if="vm.item.get('project_blocked_code')")
+                        use(xlink:href="#icon-blocked-project")
+                            title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
+                p.list-itemtype-project-description {{ ::vm.item.get('description') }}
 
     .list-itemtype-track
         span.list-itemtype-track-likers(
diff --git a/app/modules/profile/profile-favs/items/ticket.jade b/app/modules/profile/profile-favs/items/ticket.jade
index d938466a..599fd041 100644
--- a/app/modules/profile/profile-favs/items/ticket.jade
+++ b/app/modules/profile/profile-favs/items/ticket.jade
@@ -1,4 +1,4 @@
-div.list-itemtype-ticket
+div.list-itemtype-ticket(ng-class="{'blocked-project': vm.item.get('project_blocked_code')}")
     a.list-itemtype-avatar(
         href=""
         ng-if="::vm.item.get('assigned_to')"
@@ -38,6 +38,9 @@ div.list-itemtype-ticket
             )
             span.ticket-status(ng-style="::{'color': vm.item.get('status_color')}")
                 | {{:: vm.item.get('status') }}
+            svg.icon.icon-blocked-project(ng-if="vm.item.get('project_blocked_code')")
+                use(xlink:href="#icon-blocked-project")
+                    title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
         h2
             span.ticket-id(tg-bo-ref="vm.item.get('ref')")
             a.ticket-title(
@@ -45,22 +48,19 @@ div.list-itemtype-ticket
                 ng-if="::vm.item.get('type') === 'userstory'"
                 tg-nav="project-userstories-detail:project=vm.item.get('project_slug'),ref=vm.item.get('ref')"
                 title="#{{ ::vm.item.get('ref') }} {{ ::vm.item.get('subject') }}"
-            )
-                | {{ ::vm.item.get('subject') }}
+            ) {{ ::vm.item.get('subject') }}
             a.ticket-title(
                 href="#"
                 ng-if="::vm.item.get('type') === 'task'"
                 tg-nav="project-tasks-detail:project=vm.item.get('project_slug'),ref=vm.item.get('ref')"
                 title="#{{ ::vm.item.get('ref') }} {{ ::vm.item.get('subject') }}"
-            )
-                | {{ ::vm.item.get('subject') }}
+            ) {{ ::vm.item.get('subject') }}
             a.ticket-title(
                 href="#"
                 ng-if="::vm.item.get('type') === 'issue'"
                 tg-nav="project-issues-detail:project=vm.item.get('project_slug'),ref=vm.item.get('ref')"
                 title="#{{ ::vm.item.get('ref') }} {{ ::vm.item.get('subject') }}"
-            )
-                | {{ ::vm.item.get('subject') }}
+            ) {{ ::vm.item.get('subject') }}
 
     div.list-itemtype-track
         span.list-itemtype-track-likers(
diff --git a/app/modules/profile/profile-favs/profile-favs.controller.coffee b/app/modules/profile/profile-favs/profile-favs.controller.coffee
index 2022ee4a..5bd5917d 100644
--- a/app/modules/profile/profile-favs/profile-favs.controller.coffee
+++ b/app/modules/profile/profile-favs/profile-favs.controller.coffee
@@ -184,4 +184,3 @@ class ProfileWatchedController extends FavsBaseController
 
 angular.module("taigaProfile")
     .controller("ProfileWatched", ProfileWatchedController)
-
diff --git a/app/modules/profile/profile-favs/profile-favs.jade b/app/modules/profile/profile-favs/profile-favs.jade
index 24120ccb..9ec621c7 100644
--- a/app/modules/profile/profile-favs/profile-favs.jade
+++ b/app/modules/profile/profile-favs/profile-favs.jade
@@ -60,10 +60,26 @@ section.profile-favs
             tg-repeat="item in vm.items track by $index"
             ng-switch="item.get('type')"
         )
-            div(ng-switch-when="project", tg-fav-item="item", item-type="project")
-            div(ng-switch-when="userstory", tg-fav-item="item", item-type="userstory")
-            div(ng-switch-when="task", tg-fav-item="item", item-type="task")
-            div(ng-switch-when="issue", tg-fav-item="item", item-type="issue")
+            div(
+                ng-switch-when="project"
+                tg-fav-item="item"
+                item-type="project"
+            )
+            div(
+                ng-switch-when="userstory"
+                tg-fav-item="item"
+                item-type="userstory"
+            )
+            div(
+                ng-switch-when="task"
+                tg-fav-item="item"
+                item-type="task"
+            )
+            div(
+                ng-switch-when="issue"
+                tg-fav-item="item"
+                item-type="issue"
+            )
 
     div(ng-if="vm.isLoading")
         div.spin
diff --git a/app/modules/profile/profile-projects/profile-projects.jade b/app/modules/profile/profile-projects/profile-projects.jade
index 19e943c8..5e3ff52d 100644
--- a/app/modules/profile/profile-projects/profile-projects.jade
+++ b/app/modules/profile/profile-projects/profile-projects.jade
@@ -11,8 +11,10 @@ section.profile-projects
             translate="USER.PROFILE.PROJECTS_EMPTY"
             translate-values="{username: vm.user.get('full_name_display')}"
         )
-
-    .list-itemtype-project(tg-repeat="project in vm.projects")
+    .list-itemtype-project(
+        tg-repeat="project in vm.projects"
+        ng-class="{'blocked-project': project.get('blocked_code')}"
+    )
         .list-itemtype-project-left
             .project-list-single-title-wrapper
                 a.list-itemtype-project-image(
@@ -26,19 +28,15 @@ section.profile-projects
                     )
                 .project-list-single-title
                     h2
-                        a(
+                        a.project-title(
                             href="#"
                             tg-nav="project:project=project.get('slug')"
                             title="{{ ::project.get('name') }}"
                         ) {{::project.get('name')}}
-                    p {{ ::project.get('description') | limitTo:300 }}
-
-            .list-itemtype-project-tags.tags-container(ng-if="::project.get('tags').size")
-                span.tag(
-                    style='border-left: 5px solid {{::tag.get("color")}};'
-                    tg-repeat="tag in ::project.get('colorized_tags')"
-                )
-                    span.tag-name {{::tag.get('name')}}
+                        svg.icon.icon-blocked-project(ng-if="project.get('blocked_code')")
+                            use(xlink:href="#icon-blocked-project")
+                                title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
+                    p.project-description {{ ::project.get('description') | limitTo:300 }}
 
         .list-itemtype-project-right
 
diff --git a/app/modules/profile/profile.scss b/app/modules/profile/profile.scss
index d11826f6..a2b22bb7 100644
--- a/app/modules/profile/profile.scss
+++ b/app/modules/profile/profile.scss
@@ -11,7 +11,6 @@
         padding: 0;
     }
     .timeline-wrapper {
-        background: lighten($whitish, 10%);
         margin-right: 3.5rem;
         width: 768px;
         > div {
diff --git a/app/modules/projects/components/blocked-project-explanation.directive.coffee b/app/modules/projects/components/blocked-project-explanation.directive.coffee
new file mode 100644
index 00000000..fac3ed91
--- /dev/null
+++ b/app/modules/projects/components/blocked-project-explanation.directive.coffee
@@ -0,0 +1,25 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: blocked-project-explanation.directive.coffee
+###
+
+BlockedProjectExplanationDirective = () ->
+    return {
+        templateUrl: "projects/project/blocked-project-explanation.html"
+    }
+
+angular.module("taigaProjects").directive("tgBlockedProjectExplanation", BlockedProjectExplanationDirective)
diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade
index 237e1061..65414a43 100644
--- a/app/modules/projects/listing/projects-listing.jade
+++ b/app/modules/projects/listing/projects-listing.jade
@@ -23,6 +23,7 @@
                 li.list-itemtype-project(
                     tg-bind-scope
                     tg-repeat="project in vm.projects track by project.get('id')"
+                    ng-class="{'blocked-project': project.get('blocked_code')}"
                 )
                     .list-itemtype-project-left
 
@@ -38,7 +39,7 @@
                                 )
                             .list-itemtype-project-data
                                 h2
-                                    a(
+                                    a.project-title(
                                         href="#"
                                         tg-nav="project:project=project.get('slug')"
                                         title="{{ ::project.get('name') }}"
@@ -53,9 +54,12 @@
                                     svg.icon.icon-badge(ng-if="project.get('i_am_owner')")
                                         use(xlink:href="#icon-badge")
                                             title(translate="COMMON.OWNER")
+                                    svg.icon.icon-blocked-project(ng-if="project.get('blocked_code')")
+                                        use(xlink:href="#icon-blocked-project")
+                                            title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
                                             
                                             
-                                p {{ ::project.get('description') | limitTo:300 }}
+                                p.project-description {{ ::project.get('description') | limitTo:300 }}
                                     span(ng-if="::project.get('description').length > 300") ...
 
                     svg.drag.icon.icon-drag
diff --git a/app/modules/projects/listing/styles/profile-projects.scss b/app/modules/projects/listing/styles/profile-projects.scss
index e068e7c7..2a2a6041 100644
--- a/app/modules/projects/listing/styles/profile-projects.scss
+++ b/app/modules/projects/listing/styles/profile-projects.scss
@@ -3,7 +3,16 @@
     .list-itemtype-project {
         display: flex;
         justify-content: space-between;
-        min-height: 10rem;
+        min-height: 9rem;
+        padding: .75rem;
+        &.blocked-project {
+            .list-itemtype-project-image,
+            .project-title,
+            .project-description,
+            .list-itemtype-project-right {
+                opacity: .4;
+            }
+        }
         .project-list-single-title-wrapper {
             display: flex;
         }
@@ -14,7 +23,11 @@
             display: flex;
             flex-direction: column;
             flex-shrink: 0;
+            justify-content: space-between;
             width: 200px;
         }
+        .icon-blocked-project {
+            @include svg-size();
+        }
     }
 }
diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss
index f2599a51..fe26d12c 100644
--- a/app/modules/projects/listing/styles/project-list.scss
+++ b/app/modules/projects/listing/styles/project-list.scss
@@ -14,7 +14,8 @@
         }
     }
     .icon-lock,
-    .icon-badge {
+    .icon-badge,
+    .icon-blocked-project {
         @include svg-size();
     }
     .icon-badge {
@@ -62,6 +63,16 @@
                 opacity: 1;
             }
         }
+        &.blocked-project {
+            .list-itemtype-project-image,
+            .project-title,
+            .private,
+            .project-description,
+            .icon-badge,
+            .icon-drag {
+                opacity: .25;
+            }
+        }
         .list-itemtype-project-data-wrapper {
             display: flex;
         }
diff --git a/app/modules/projects/project/blocked-project-explanation.jade b/app/modules/projects/project/blocked-project-explanation.jade
new file mode 100644
index 00000000..0ce3441b
--- /dev/null
+++ b/app/modules/projects/project/blocked-project-explanation.jade
@@ -0,0 +1,5 @@
+div(ng-if="!vm.project.get('i_am_owner')")
+    div {{'PROJECT.BLOCKED_PROJECT.THIS_PROJECT_IS_BLOCKED' | translate}}
+
+div(ng-if="vm.project.get('i_am_owner')")
+    div {{'PROJECT.BLOCKED_PROJECT.TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF' | translate}}
diff --git a/app/modules/projects/project/blocked-project.jade b/app/modules/projects/project/blocked-project.jade
new file mode 100644
index 00000000..be6b75b8
--- /dev/null
+++ b/app/modules/projects/project/blocked-project.jade
@@ -0,0 +1,15 @@
+.blocked-project-detail
+    .blocked-project-inner
+        .blocked-project-title
+            .project-image
+                img(
+                    tg-project-logo-small-src="vm.project"
+                    alt="{{::vm.project.get('name')}}"
+                )
+                svg.icon.icon-blocked-project
+                    use(xlink:href="#icon-blocked-project")
+                        title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
+            span.project-title {{::vm.project.get("name")}}
+        .blocked-project-message
+            h1.project-block-title {{'PROJECT.BLOCKED_PROJECT.BLOCKED' | translate}}
+            tg-blocked-project-explanation.project-block-message
diff --git a/app/modules/projects/project/blocked-project.scss b/app/modules/projects/project/blocked-project.scss
new file mode 100644
index 00000000..40bbc218
--- /dev/null
+++ b/app/modules/projects/project/blocked-project.scss
@@ -0,0 +1,42 @@
+.blocked-project-detail {
+    align-items: center;
+    background: url('../images/discover.png') bottom center repeat-x;
+    display: flex;
+    justify-content: center;
+    min-height: calc(100vh - 40px);
+}
+
+.blocked-project-inner {
+    width: 330px;
+}
+
+.blocked-project-title {
+    align-items: center;
+    display: flex;
+    .project-image {
+        flex-basis: 6rem;
+        margin-right: 1rem;
+        max-width: 6rem;
+        position: relative;
+    }
+    img {
+        width: 100%;
+    }
+    .icon-blocked-project {
+        @include svg-size(1.5rem);
+        position: absolute;
+        right: -.5rem;
+        top: -.5rem;
+    }
+    .project-title {
+        @extend %larger;
+    }
+}
+
+.blocked-project-message {
+    margin-top: 4rem;
+    text-align: center;
+    .project-block-title {
+        @extend %xlarge;
+    }
+}
diff --git a/app/styles/components/list-items.scss b/app/styles/components/list-items.scss
index 0b715bac..547c4294 100644
--- a/app/styles/components/list-items.scss
+++ b/app/styles/components/list-items.scss
@@ -32,9 +32,21 @@
 .list-itemtype-project {
     @include list-itemtype-common;
     justify-content: space-between;
+    &.blocked-project {
+        .list-itemtype-track,
+        .list-itemtype-project-image,
+        .list-itemtype-project-name,
+        .list-itemtype-project-description,
+        .list-itemtype-project-private {
+            opacity: .4;
+        }
+    }
     h2 {
         @extend %large;
     }
+    .icon-blocked-project {
+        @include svg-size();
+    }
     .list-itemtype-project-data-wrapper {
         display: flex;
     }
@@ -75,6 +87,20 @@
 
 .list-itemtype-ticket {
     @include list-itemtype-common;
+    position: relative;
+    &.blocked-project {
+        .ticket-project,
+        .ticket-type,
+        .ticket-status,
+        .list-itemtype-avatar,
+        .list-itemtype-track,
+        .ticket-title {
+            opacity: .4;
+        }
+        .icon-blocked-project {
+            @include svg-size();
+        }
+    }
     h2 {
         @extend %medium;
     }
@@ -97,7 +123,6 @@
         color: $red;
         margin-left: .3rem;
     }
-
 }
 
 
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
index 68d91a7e..2a25e0c5 100644
--- a/app/svg/sprite.svg
+++ b/app/svg/sprite.svg
@@ -418,5 +418,12 @@
             <path
                 d="M165 91.5c-33 0-60 28.7-60 64 0 35.2 27 64 60 64s60-28.8 60-64c0-35.3-27-64-60-64zm0 16.2c24.8 0 44.8 21.3 44.8 47.8 0 26.5-20 47.8-44.8 47.8-25 0-45-21.3-45-47.8 0-26.5 20-47.8 45-47.8zm-77.8 13.5c-29.2 0-53 25.5-53 56.7 0 31 23.8 56.5 53 56.5 16 0 27.5-4.5 37.3-16.6-21.8-9.7-34-36-34-62.5 0-12 3-23.3 8.5-33-3.8-.8-7.7-1.3-11.8-1.3zM165 229.7c-53.3 0-95.8 50.8-96 112.5v8h192v-8c-.2-61.7-42.8-112.5-96-112.5zm-78.7 13.6c-3.4 0-5.8.3-5.8.3-47.2 0-78 45-78.3 99.5v7.3h52.2v-8c0-41.3 15.2-78.6 43.7-98.2-3.8-.6-8.2-.8-11.7-.7zM165 246c42 0 76.8 38.2 80.5 88h-161c3.6-49.8 38.6-88 80.5-88zM339.3 49.7C307 49.7 281 76 281 108.2c0 32.2 26 58.4 58.3 58.4s58.5-26.2 58.5-58.4c0-32.3-26.2-58.5-58.5-58.5zm0 7.3c28.3 0 51.2 23 51.2 51.2 0 28.3-23 51-51.2 51-28.3 0-51-22.7-51-51S311 57 339.2 57zm-.2 11.8c-7 0-14 1.7-20.5 5l3 7c3.5-1.6 6.5-2.7 9-3.3 2.7-.7 5.4-1 8-1 4.4 0 7.6 1 10 3 2.2 1.8 3.3 4.5 3.3 8 0 3-.6 5.4-1.8 7.4-1.2 2-4.2 5-9 9-3.3 2.8-5.7 5.6-7 8.2-1.2 2.6-1.8 6-1.8 10v2.8h6.7v-1.7c0-3.3.5-6 1.6-8 1-2 3.5-4.4 7-7.3 4.4-4 7.2-6.6 8.5-8.3 1.4-1.8 2.4-3.6 3-5.5.8-2 1-4.2 1-6.7 0-6-1.7-10.6-5.4-13.8-3.7-3.3-8.8-5-15.5-5zm-6.8 62.5V148h7.3v-16.7h-7.3z"></path>
         </symbol>
+        <symbol id="icon-blocked-project" viewBox="0 0 1024 1024">
+            <title>Blocked Project</title>
+            <path fill="#ff8282" d="M1017.075 512c0 278.946-226.13 505.076-505.076 505.076s-505.076-226.13-505.076-505.076c0-278.946 226.13-505.076 505.076-505.076s505.076 226.13 505.076 505.076z"></path>
+            <path
+                fill="#fff"
+                d="M511.998 107.939c-222.856 0-404.061 181.204-404.061 404.061s181.205 404.061 404.061 404.061c222.856 0 404.061-181.203 404.061-404.061s-181.205-404.061-404.061-404.061zM511.998 158.447c88.671 0 169.621 32.484 231.616 86.222l-498.947 498.948c-53.74-61.998-86.223-142.945-86.223-231.617 0-195.561 157.992-353.553 353.553-353.553zM779.328 280.383c53.74 61.998 86.223 142.945 86.223 231.617 0 195.561-157.992 353.553-353.553 353.553-88.671 0-169.617-32.484-231.616-86.222l498.947-498.948z"></path>
+        </symbol>
     </defs>
 </svg>
diff --git a/e2e/suites/project-home.e2e.js b/e2e/suites/project-home.e2e.js
index 5afb2343..dfaf8295 100644
--- a/e2e/suites/project-home.e2e.js
+++ b/e2e/suites/project-home.e2e.js
@@ -138,4 +138,11 @@ describe('project home', function() {
         expect(watchCounter).to.be.equal(watchCounterOld + 1);
     });
 
+    it('blocked project', async function() {
+      browser.get(browser.params.glob.host + 'project/project-6/');
+      await utils.common.waitLoader();
+      await utils.common.takeScreenshot("project", "blocked-project");
+      expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + 'blocked-project/project-6/');
+    });
+
 });

From fb4c8545dcafb1fc8ea109c63f333300859ae602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 3 Mar 2016 09:35:14 +0100
Subject: [PATCH 083/155] New creation project wizard

Create project wizard layout

Adding is_private attribute on create projects

WIP wizard create project

Wizard create WIP

Wizard create public projects

Add restrictions to create project

Layout for common platforms

remove more info button until UX issue gets resolved

Add to changelog
---
 CHANGELOG.md                                  |   1 +
 app/coffee/modules/base/navurls.coffee        |   6 +-
 ...reate-project-restriction.directive.coffee |   8 +
 app/coffee/modules/projects/lightboxes.coffee |  49 +---
 app/locales/taiga/locale-en.json              |  18 +-
 app/modules/projects/projects.service.coffee  |   2 +-
 .../projects/projects.service.spec.coffee     |   2 +-
 .../project/wizard-create-project.jade        | 169 +++++++-----
 app/partials/project/wizard-restrictions.jade |   9 +
 app/styles/modules/common/wizard.scss         | 260 ++++++++----------
 app/svg/sprite.svg                            |   6 +-
 11 files changed, 255 insertions(+), 275 deletions(-)
 create mode 100644 app/coffee/modules/projects/create-project-restriction.directive.coffee
 create mode 100644 app/partials/project/wizard-restrictions.jade

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe2d59b..5ba53a2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Redesign 'Admin > Project > Modules' panel.
 - Add badge to project owners
 - Limit of user per project.
+- Redesign of the create project wizard
 
 ### Misc
 - Lots of small and not so small bugfixes.
diff --git a/app/coffee/modules/base/navurls.coffee b/app/coffee/modules/base/navurls.coffee
index 85fee430..28fa20de 100644
--- a/app/coffee/modules/base/navurls.coffee
+++ b/app/coffee/modules/base/navurls.coffee
@@ -59,7 +59,7 @@ module.service("$tgNavUrls", NavigationUrlsService)
 ## Navigation Urls Directive
 #############################################################################
 
-NavigationUrlsDirective = ($navurls, $auth, $q, $location) ->
+NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) ->
     # Example:
     # link(tg-nav="project-backlog:project='sss',")
 
@@ -157,9 +157,11 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location) ->
                             when 2
                                 window.open fullUrl
 
+                        lightboxService.closeAll()
+
         $scope.$on "$destroy", ->
             $el.off()
 
     return {link: link}
 
-module.directive("tgNav", ["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", NavigationUrlsDirective])
+module.directive("tgNav", ["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", "lightboxService", NavigationUrlsDirective])
diff --git a/app/coffee/modules/projects/create-project-restriction.directive.coffee b/app/coffee/modules/projects/create-project-restriction.directive.coffee
new file mode 100644
index 00000000..66564563
--- /dev/null
+++ b/app/coffee/modules/projects/create-project-restriction.directive.coffee
@@ -0,0 +1,8 @@
+module = angular.module("taigaProject")
+
+createProjectRestrictionDirective = () ->
+    return {
+        templateUrl: "project/wizard-restrictions.html"
+    }
+
+module.directive('tgCreateProjectRestriction', [createProjectRestrictionDirective])
diff --git a/app/coffee/modules/projects/lightboxes.coffee b/app/coffee/modules/projects/lightboxes.coffee
index c5561ae8..774bb866 100644
--- a/app/coffee/modules/projects/lightboxes.coffee
+++ b/app/coffee/modules/projects/lightboxes.coffee
@@ -29,12 +29,16 @@ debounce = @.taiga.debounce
 
 module = angular.module("taigaProject")
 
-CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $projectUrl, $loading, lightboxService, $cacheFactory, $translate, currentUserService) ->
+CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $projectUrl, $loading, lightboxService, $cacheFactory, $translate, currentUserService, $auth) ->
     link = ($scope, $el, attrs) ->
         $scope.data = {}
         $scope.templates = []
         currentLoading = null
 
+        $auth.refresh()
+        $scope.canCreatePrivateProjects = currentUserService.canCreatePrivateProjects()
+        $scope.canCreatePublicProjects = currentUserService.canCreatePublicProjects()
+
         form = $el.find("form").checksley({"onlyOneErrorElement": true})
 
         onSuccessSubmit = (response) ->
@@ -58,10 +62,6 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project
             selectors = []
             for error_field in _.keys(response)
                 selectors.push("[name=#{error_field}]")
-            $el.find(".active").removeClass("active")
-            error_step = $el.find(selectors.join(",")).first().parents(".wizard-step")
-            error_step.addClass("active")
-            $el.find('.progress-bar').removeClass().addClass('progress-bar').addClass(error_step.data("step"))
 
         submit = (event) =>
             event.preventDefault()
@@ -77,7 +77,9 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project
             promise.then(onSuccessSubmit, onErrorSubmit)
 
         openLightbox = ->
-            $scope.data = {}
+            $scope.data = {
+                is_private: false
+            }
 
             if !$scope.templates.length
                 $rs.projects.templates().then (result) =>
@@ -86,40 +88,7 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project
             else
                 $scope.data.creation_template = _.head(_.filter($scope.templates, (x) -> x.slug == "scrum")).id
 
-            $el.find(".active").removeClass("active")
-            $el.find(".create-step1").addClass("active")
-
             lightboxService.open($el)
-            timeout 600, ->
-                $el.find(".progress-bar").addClass('step1')
-
-        $el.on "click", ".button-next", (event) ->
-            event.preventDefault()
-
-            current = $el.find(".active")
-
-            valid = true
-            for field in form.fields
-                if current.find("[name=#{field.element.attr('name')}]").length
-                    valid = field.validate() != false and valid
-
-            if not valid
-                return
-
-            next = current.next()
-            current.toggleClass('active')
-            next.toggleClass('active')
-            step = next.data('step')
-            $el.find('.progress-bar').removeClass().addClass('progress-bar').addClass(step)
-
-        $el.on "click", ".button-prev", (event) ->
-            event.preventDefault()
-            current = $el.find(".active")
-            prev = current.prev()
-            current.toggleClass('active')
-            prev.toggleClass('active')
-            step = prev.data('step')
-            $el.find('.progress-bar').removeClass().addClass('progress-bar').addClass(step)
 
         submitButton = $el.find(".submit-button")
 
@@ -145,7 +114,7 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project
 
 module.directive("tgLbCreateProject", ["$rootScope", "$tgRepo", "$tgConfirm",
     "$location", "$tgNavUrls", "$tgResources", "$projectUrl", "$tgLoading",
-    "lightboxService", "$cacheFactory", "$translate", "tgCurrentUserService", CreateProject])
+    "lightboxService", "$cacheFactory", "$translate", "tgCurrentUserService", "$tgAuth", CreateProject])
 
 
 #############################################################################
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 368d9784..608e67fa 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -470,9 +470,9 @@
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximun members number in private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximun members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -1324,12 +1324,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Choose a template",
-        "CHOOSE_TEMPLATE_TEXT": "Which template would fit better in your project?",
         "SECTION_TITLE_CREATE_PROJECT": "Create Project",
         "CREATE_PROJECT_TEXT": "Fresh and clean. So exciting!",
-        "PROGRESS_TEMPLATE_SELECTION": "Template selection",
-        "PROGRESS_NAME_DESCRIPTION": "Name and description"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/modules/projects/projects.service.coffee b/app/modules/projects/projects.service.coffee
index a7c2ab65..5aca481e 100644
--- a/app/modules/projects/projects.service.coffee
+++ b/app/modules/projects/projects.service.coffee
@@ -57,7 +57,7 @@ class ProjectsService extends taiga.Service
 
     newProject: ->
         @lightboxFactory.create("tg-lb-create-project", {
-            "class": "wizard-create-project"
+            "class": "wizard-create-project lightbox"
         })
 
     bulkUpdateProjectsOrder: (sortData) ->
diff --git a/app/modules/projects/projects.service.spec.coffee b/app/modules/projects/projects.service.spec.coffee
index 046d1d23..6b49303b 100644
--- a/app/modules/projects/projects.service.spec.coffee
+++ b/app/modules/projects/projects.service.spec.coffee
@@ -79,7 +79,7 @@ describe "tgProjectsService", ->
         projectsService.newProject()
 
         expect(mocks.lightboxFactory.create).to.have.been.calledWith("tg-lb-create-project", {
-            "class": "wizard-create-project"
+            "class": "wizard-create-project lightbox"
         })
 
     it "bulkUpdateProjectsOrder and then fetch projects again", () ->
diff --git a/app/partials/project/wizard-create-project.jade b/app/partials/project/wizard-create-project.jade
index f32cc8c0..ca9808be 100644
--- a/app/partials/project/wizard-create-project.jade
+++ b/app/partials/project/wizard-create-project.jade
@@ -1,77 +1,94 @@
+svg.close.icon.icon-close(title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
 form
-    section.wizard-step.create-step1(data-step="step1")
-        div.title
-            h1(translate="WIZARD.SECTION_TITLE_CHOOSE_TEMPLATE")
-            p(translate="WIZARD.CHOOSE_TEMPLATE_TEXT")
-        div.template-wrapper
-            div.template-inner
-                fieldset(ng-repeat="template in templates")
-                    input(
-                        type="radio"
-                        name="template"
-                        id="template-{{ template.id }}"
-                        ng-value='template.id'
-                        ng-model="data.creation_template"
-                        data-required="true"
-                    )
-                    label.backlog(for="template-{{ template.id }}")
-                        svg.icon(ng-class="'icon-'+template.slug")
-                            use(xlink:href="{{'#icon-' + template.slug }}")
-                        h2 {{ template.name }}
-                    p {{ template.description }}
-
-        fieldset
-            a.button-next.button-green(
-                href="#"
-                title="{{'PAGINATION.NEXT' | translate}}"
-                translate="PAGINATION.NEXT"
-            )
-
-    section.wizard-step.create-step2.active(data-step="step2")
-        div.title
-            h1(translate="WIZARD.SECTION_TITLE_CREATE_PROJECT")
-            p(translate="WIZARD.CREATE_PROJECT_TEXT")
-        div.template-wrapper
-            div.template-inner
-                fieldset
-                    input(
-                        type="text"
-                        name="name"
-                        ng-model="data.name"
-                        data-required="true"
-                        placeholder="{{'COMMON.FIELDS.NAME' | translate}}"
-                        maxlength="45"
-                    )
-                fieldset
-                    textarea(
-                        name="description"
-                        ng-model="data.description"
-                        data-required="true"
-                        ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}"
-                    )
-                fieldset.wizard-action
-                    div
-                        a.button-prev.button.button-gray(
-                            href="#"
-                            title="{{'PAGINATION.PREVIOUS' | translate}}"
-                            translate="PAGINATION.PREVIOUS"
-                        )
-                        button.button-green.submit-button(
-                            type="submit"
-                            title="{{'COMMON.CREATE' | translate}}"
-                            translate="COMMON.CREATE"
-                        )
-
-                    button.hidden(type="submit")
-
-div.progress-bar
-    div.progress-state
-        span(translate="WIZARD.PROGRESS_TEMPLATE_SELECTION")
-        span(translate="WIZARD.PROGRESS_NAME_DESCRIPTION")
-        // span Final touches
-    div.progress-bar-wrapper
-        div.bar
-
-a.close(href="#" title="{{'COMMON.CLOSE' | translate}}")
-    svg.icon.icon-delete
-        use(xlink:href="#icon-delete")
+    header
+        h1.title(translate="WIZARD.SECTION_TITLE_CREATE_PROJECT")
+        .subtitle(
+            translate="WIZARD.CREATE_PROJECT_TEXT"
+            role="presentation"
+        )
+    section.template-option
+        .template-selector-title
+            legend(translate="WIZARD.CHOOSE_TEMPLATE")
+            // UX issue
+            //- a.more-info(
+            //-     href=""
+            //-     title="{{ 'WIZARD.CHOOSE_TEMPLATE_TITLE' | translate }}"
+            //-     translate="WIZARD.CHOOSE_TEMPLATE_INFO"
+            //- )
+        .template-selector
+            fieldset(ng-repeat="template in templates")
+                input(
+                    type="radio"
+                    name="template"
+                    id="template-{{ template.id }}"
+                    ng-value='template.id'
+                    ng-model="data.creation_template"
+                    data-required="true"
+                )
+                label.template-label(for="template-{{ template.id }}")
+                    svg.icon(ng-class="'icon-'+template.slug")
+                        use(xlink:href="{{'#icon-' + template.slug }}")
+                    span.template-name {{ template.name }}
+        .template-data
+            legend(translate="WIZARD.PROJECT_DETAILS")
+            fieldset
+                input(
+                    type="text"
+                    name="name"
+                    ng-model="data.name"
+                    data-required="true"
+                    placeholder="{{'COMMON.FIELDS.NAME' | translate}}"
+                    maxlength="45"
+                    aria-hidden="true"
+                )
+            fieldset
+                textarea(
+                    name="description"
+                    ng-model="data.description"
+                    data-required="true"
+                    ng-attr-placeholder="{{'COMMON.FIELDS.DESCRIPTION' | translate}}"
+                )
+        .template-privacity
+            fieldset
+                input(
+                    type="radio"
+                    name="is_private"
+                    id="template-public"
+                    data-required="true"
+                    aria-hidden="true"
+                    ng-value="false"
+                    ng-model="data.is_private"
+                    required
+                    ng-disabled="!canCreatePublicProjects.valid"
+                    ng-checked="canCreatePublicProjects.valid"
+                )
+                label.template-privacity(for="template-public")
+                    svg.icon.icon-discover
+                        use(xlink:href="#icon-discover")
+                    span(translate="WIZARD.PUBLIC_PROJECT")
+            fieldset
+                input(
+                    type="radio"
+                    name="is_private"
+                    id="template-private"
+                    data-required="true"
+                    ng-value="true"
+                    ng-model="data.is_private"
+                    aria-hidden="true"
+                    required
+                    ng-disabled="!canCreatePrivateProjects.valid"
+                    ng-checked="!canCreatePublicProjects.valid"
+                )
+                label.template-privacity(for="template-private")
+                    svg.icon.icon-lock
+                        use(xlink:href="#icon-lock")
+                    span(translate="WIZARD.PRIVATE_PROJECT")
+        
+        tg-create-project-restriction
+        
+        button.button-green.submit-button(
+            translate="WIZARD.CREATE_PROJECT"
+            title="{{'WIZARD.CREATE_PROJECT' | translate}}"
+            ng-click=""
+        )
diff --git a/app/partials/project/wizard-restrictions.jade b/app/partials/project/wizard-restrictions.jade
new file mode 100644
index 00000000..798bf1fd
--- /dev/null
+++ b/app/partials/project/wizard-restrictions.jade
@@ -0,0 +1,9 @@
+div.create-warning(ng-if="!canCreatePrivateProjects.valid && canCreatePrivateProjects.reason == 'max_private_projects'")
+    svg.icon.icon-exclamation
+        use(xlink:href="#icon-exclamation")
+    span {{ 'WIZARD.MAX_PRIVATE_PROJECTS' | translate }}
+    
+div.create-warning(ng-if="!canCreatePublicProjects.valid && canCreatePublicProjects.reason == 'max_public_projects'")
+    svg.icon.icon-exclamation
+        use(xlink:href="#icon-exclamation")
+    span {{ 'WIZARD.MAX_PUBLIC_PROJECTS' | translate }}
diff --git a/app/styles/modules/common/wizard.scss b/app/styles/modules/common/wizard.scss
index 494c9048..81a1b6c0 100644
--- a/app/styles/modules/common/wizard.scss
+++ b/app/styles/modules/common/wizard.scss
@@ -1,73 +1,109 @@
 .wizard-create-project {
     @extend %lightbox;
-    @extend %background-taiga;
-    background-size: cover;
-    color: $white;
-    text-align: center;
-    form {
-        width: 500px;
-    }
-    .title {
-        width: 100%;
-    }
-    h1,
-    p {
-        color: $white;
-    }
-    h1 {
-        line-height: 1.5rem;
-    }
-    p {
-        @extend %small;
-        opacity: .8;
-    }
-    input,
-    textarea,
-    select {
-        background: rgba($white, .7);
-        @include placeholder {
-            color: $grayer;
-        }
-    }
     .close {
-        color: $white;
-        &:hover {
-            color: $red-light;
+        @include svg-size(2rem);
+    }
+    form {
+        width: 700px;
+    }
+    header {
+        margin-bottom: 3rem;
+        .title {
+            margin-bottom: 0;
+        }
+        .subtitle {
+            @extend %small;
+            color: $gray-light;
+            text-align: center;
         }
     }
-    .wizard-step {
-        animation: formSlide .4s ease-in-out;
-        animation-direction: alternate-reverse;
-        display: none;
-        &.active {
-            animation: formSlide .4s ease-in-out;
-            &.create-step2,
-            &.create-step3,
-            &.create-step1 {
-                display: block;
-            }
-        }
+    .more-info {
+        @extend %small;
+        color: $primary;
     }
-    .wizard-action {
-        div {
-            display: flex;
+    .template-selector-title {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 1rem;
+    }
+    .template-selector {
+        display: flex;
+        margin-bottom: 1rem;
+        input {
+            display: none;
         }
-        a {
-            color: $white;
-            display: inline-block;
-            flex-basis: 40%;
-            flex-grow: 1;
+        fieldset {
             &:first-child {
                 margin-right: .5rem;
             }
         }
     }
-    .create-step1 {
-        .template-inner {
-            display: flex;
+    input {
+        &:checked+label {
+            background: $primary-light;
+            color: $white;
+            transition: background .2s ease-in;
+            &:hover {
+                background: $primary-light;
+            }
         }
+        +label {
+            background: rgba($whitish, .7);
+            cursor: pointer;
+            display: block;
+            padding: 2rem 1rem;
+            text-align: center;
+            transition: background .2s ease-in;
+            &:hover {
+                background: rgba($primary-light, .3);
+                transition: background .2s ease-in;
+            }
+            .icon {
+                @include svg-size(1.4rem);
+                fill: currentColor;
+                margin-right: 1rem;
+                vertical-align: text-top;
+            }
+            .template-name {
+                @extend %large;
+                text-transform: uppercase;
+            }
+        }
+    }
+    input[disabled]+label {
+        background: lighten($whitish, 5%);
+        box-shadow: none;
+        color: lighten($gray-light, 20%);
+        cursor: not-allowed;
+        opacity: .65;
+        &:hover {
+            background: lighten($whitish, 5%);
+            color: lighten($gray-light, 20%);
+        }
+    }
+    .template-data {
+        legend {
+            display: block;
+            margin-bottom: .5rem;
+        }
+        input,
+        textarea {
+            background: none;
+            border: 1px solid $whitish;
+            color: $gray-light;
+            @include placeholder {
+                color: darken($whitish, 20%);
+            }
+        }
+        textarea {
+            height: 7rem;
+            min-height: 7rem;
+        }
+    }
+    .template-privacity {
+        display: flex;
         fieldset {
-            flex-grow: 1;
+            margin-bottom: 0;
             &:first-child {
                 margin-right: .5rem;
             }
@@ -75,105 +111,37 @@
         input {
             display: none;
         }
-        input:checked {
-            +label {
-                background: rgba($primary-light, .7);
-                transition: background .3s ease-in;
-            }
+        label {
+            display: block;
+            text-align: center;
+            text-transform: uppercase;
+
         }
         input+label {
-            background: rgba($whitish, .7);
-            cursor: pointer;
-            display: block;
-            margin-bottom: 1rem;
             padding: 1rem;
-            text-align: center;
-            transition: background .3s ease-in;
-            &:hover {
-                background: rgba($primary, .7);
-                transition: background .3s ease-in;
-            }
-            .icon {
-                @include svg-size(3rem);
-                fill: currentColor;
-            }
         }
-        h2 {
-            color: $white;
-            margin: 0;
-            margin-top: .5rem;
-            text-transform: uppercase;
-        }
-        p {
-            text-align: center;
+        svg {
+            @include svg-size(.7rem);
         }
     }
-    .progress-bar {
-        bottom: 0;
-        height: .5rem;
-        left: 0;
-        position: absolute;
-        width: 100%;
-    }
-    .step1 {
-        .bar {
-            transition: width .6s ease-in-out;
-            width: 25%;
+    .create-warning {
+        @extend %small;
+        padding: 1rem;
+        text-align: center;
+        .icon-exclamation {
+            fill: $red-light;
+            margin-right: .5rem;
+            vertical-align: middle;
         }
-        .progress-state {
-            span:nth-child(1) {
-                color: rgba($white, 1);
-                transition: color .3s ease-in-out;
-                transition-delay: .6s;
-            }
-        }
-    }
-    .step2 {
-        .bar {
-            transition: width .6s ease-in-out;
-            // width: 50%;
-            width: 75%;
-        }
-        .progress-state {
-            span:nth-child(1),
-            span:nth-child(2) {
-                color: rgba($white, 1);
-                transition: color .3s ease-in-out;
-                transition-delay: .6s;
-            }
-        }
-    }
-
-    .progress-state {
-        position: absolute;
-        width: 100%;
-        span {
-            color: rgba($white, .5);
+        a {
+            color: $primary;
             display: inline-block;
-            margin-left: -100px;
-            position: absolute;
-            text-align: center;
-            top: -2rem;
-            transition: all 1s ease-in;
-            width: 200px;
-            &:nth-child(1) {
-                left: 25%;
-            }
-            &:nth-child(2) {
-                left: 75%;
-            }
+            margin-left: .25rem;
         }
     }
-    .progress-bar-wrapper {
-        background: rgba($white, .3);
-        height: .5rem;
-    }
-    .bar {
-        background: rgba($primary-light, .9);
-        height: .5rem;
-        left: 0;
-        position: absolute;
-        top: 0;
-        width: 0;
+    .button-green {
+        display: block;
+        margin: 1rem 5rem;
+        width: calc(100% - 10rem);
     }
 }
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
index 2a25e0c5..79330287 100644
--- a/app/svg/sprite.svg
+++ b/app/svg/sprite.svg
@@ -413,10 +413,10 @@
                 fill="#9dce0a"
                 d="M512.053 24.761l-130.433 173.609-213.936-30.392 30.427 214.125-173.349 130.201 173.349 130.2-30.427 214.123 214.747-30.506 130.064 173.118 129.997-173.027 214.355 30.451-30.588-215.258 172.981-129.922-172.497-129.561 30.458-214.345-214.912 30.53-130.235-173.346z"></path>
         </symbol>
-        <symbol id="icon-team-question" viewBox="0 0 1024 1024">
-            <title>team-question</title>
+        <symbol id="icon-exclamation" viewBox="0 0 1024 1024">
+            <title>Exclamation</title>
             <path
-                d="M165 91.5c-33 0-60 28.7-60 64 0 35.2 27 64 60 64s60-28.8 60-64c0-35.3-27-64-60-64zm0 16.2c24.8 0 44.8 21.3 44.8 47.8 0 26.5-20 47.8-44.8 47.8-25 0-45-21.3-45-47.8 0-26.5 20-47.8 45-47.8zm-77.8 13.5c-29.2 0-53 25.5-53 56.7 0 31 23.8 56.5 53 56.5 16 0 27.5-4.5 37.3-16.6-21.8-9.7-34-36-34-62.5 0-12 3-23.3 8.5-33-3.8-.8-7.7-1.3-11.8-1.3zM165 229.7c-53.3 0-95.8 50.8-96 112.5v8h192v-8c-.2-61.7-42.8-112.5-96-112.5zm-78.7 13.6c-3.4 0-5.8.3-5.8.3-47.2 0-78 45-78.3 99.5v7.3h52.2v-8c0-41.3 15.2-78.6 43.7-98.2-3.8-.6-8.2-.8-11.7-.7zM165 246c42 0 76.8 38.2 80.5 88h-161c3.6-49.8 38.6-88 80.5-88zM339.3 49.7C307 49.7 281 76 281 108.2c0 32.2 26 58.4 58.3 58.4s58.5-26.2 58.5-58.4c0-32.3-26.2-58.5-58.5-58.5zm0 7.3c28.3 0 51.2 23 51.2 51.2 0 28.3-23 51-51.2 51-28.3 0-51-22.7-51-51S311 57 339.2 57zm-.2 11.8c-7 0-14 1.7-20.5 5l3 7c3.5-1.6 6.5-2.7 9-3.3 2.7-.7 5.4-1 8-1 4.4 0 7.6 1 10 3 2.2 1.8 3.3 4.5 3.3 8 0 3-.6 5.4-1.8 7.4-1.2 2-4.2 5-9 9-3.3 2.8-5.7 5.6-7 8.2-1.2 2.6-1.8 6-1.8 10v2.8h6.7v-1.7c0-3.3.5-6 1.6-8 1-2 3.5-4.4 7-7.3 4.4-4 7.2-6.6 8.5-8.3 1.4-1.8 2.4-3.6 3-5.5.8-2 1-4.2 1-6.7 0-6-1.7-10.6-5.4-13.8-3.7-3.3-8.8-5-15.5-5zm-6.8 62.5V148h7.3v-16.7h-7.3z"></path>
+                d="M512 0c-282.394 0-512 229.606-512 512s229.606 512 512 512 512-229.606 512-512-229.606-512-512-512zM512 64c247.803 0 448 200.197 448 448s-200.197 448-448 448-448-200.197-448-448 200.197-448 448-448zM275.256 230.001l-45.256 45.251 236.744 236.749-236.744 236.744 45.256 45.256 236.744-236.744 236.744 236.744 45.256-45.256-236.744-236.744 236.744-236.749-45.253-45.251-236.749 236.744z"></path>
         </symbol>
         <symbol id="icon-blocked-project" viewBox="0 0 1024 1024">
             <title>Blocked Project</title>

From df16b447eef5f1d8af7d38ff7f04a3701c4078c0 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 3 Mar 2016 08:07:44 +0100
Subject: [PATCH 084/155] lightbox import restrictions errors

---
 app/coffee/modules/common/importer.coffee     | 98 +++++++++++++++++--
 app/coffee/modules/common/lightboxes.coffee   |  3 +-
 app/coffee/modules/resources/projects.coffee  |  6 +-
 app/locales/taiga/locale-en.json              | 27 ++++-
 .../dropdown-project-list.jade                | 16 +--
 .../lightbox/lightbox-import-error.jade       | 44 +++++++++
 app/styles/modules/common/lightbox.scss       | 15 +++
 app/svg/icons/block-user.svg                  | 10 ++
 app/svg/icons/multi-block-project.svg         |  5 +
 app/svg/icons/project-limit.svg               |  8 ++
 10 files changed, 212 insertions(+), 20 deletions(-)
 create mode 100644 app/partials/common/lightbox/lightbox-import-error.jade
 create mode 100644 app/svg/icons/block-user.svg
 create mode 100644 app/svg/icons/multi-block-project.svg
 create mode 100644 app/svg/icons/project-limit.svg

diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index de61ce3f..46b84007 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -25,8 +25,60 @@
 module = angular.module("taigaCommon")
 
 
-ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate) ->
+ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate, $lightboxFactory, currentUserService, $tgAuth) ->
     link = ($scope, $el, $attrs) ->
+        getRestrictionError = (result) ->
+            if result.headers
+                errorKey = ''
+
+                user = currentUserService.getUser()
+                maxMembers = 0
+
+                if result.headers.isPrivate
+                    privateError = !currentUserService.canCreatePrivateProjects().valid
+                    maxMembers = null
+
+                    if user.get('max_members_private_projects') != null && result.headers.members > user.get('max_members_private_projects')
+                        membersError = true
+                    else
+                        membersError = false
+
+                    if privateError && membersError
+                        errorKey = 'private-space-members'
+                        maxMembers = user.get('max_members_private_projects')
+                    else if privateError
+                        errorKey = 'private-space'
+                    else if membersError
+                        errorKey = 'private-members'
+                        maxMembers = user.get('max_members_private_projects')
+
+                else
+                    publicError = !currentUserService.canCreatePublicProjects().valid
+
+                    if user.get('max_members_public_projects') != null && result.headers.members > user.get('max_members_public_projects')
+                        membersError = true
+                    else
+                        membersError = false
+
+                    if publicError && membersError
+                        errorKey = 'public-space-members'
+                        maxMembers = user.get('max_members_public_projects')
+                    else if publicError
+                        errorKey = 'public-space'
+                    else if membersError
+                        errorKey = 'public-members'
+                        maxMembers = user.get('max_members_public_projects')
+
+                return {
+                    key: errorKey,
+                    values: {
+                        max_members: maxMembers,
+                        members: result.headers.members
+                    }
+                }
+            else
+                return false
+
         $el.on "click", ".import-project-button", (event) ->
             event.preventDefault()
             $el.find("input.import-file").val("")
@@ -53,19 +105,47 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate)
                     $confirm.notify("success", msg)
 
             onError = (result) ->
-                loader.stop()
-                errorMsg = $translate.instant("PROJECT.IMPORT.ERROR")
+                $tgAuth.refresh().then () ->
+                    restrictionError = getRestrictionError(result)
 
-                if result.status == 429  # TOO MANY REQUESTS
-                    errorMsg = $translate.instant("PROJECT.IMPORT.ERROR_TOO_MANY_REQUEST")
-                else if result.data?._error_message
-                    errorMsg = $translate.instant("PROJECT.IMPORT.ERROR_MESSAGE", {error_message: result.data._error_message})
-                $confirm.notify("error", errorMsg)
+                    loader.stop()
+
+                    if restrictionError
+                        $lightboxFactory.create('tg-lb-import-error', {
+                            class: 'lightbox lightbox-import-error'
+                        }, restrictionError)
+
+                    else
+                        errorMsg = $translate.instant("PROJECT.IMPORT.ERROR")
+
+                        if result.status == 429  # TOO MANY REQUESTS
+                            errorMsg = $translate.instant("PROJECT.IMPORT.ERROR_TOO_MANY_REQUEST")
+                        else if result.data?._error_message
+                            errorMsg = $translate.instant("PROJECT.IMPORT.ERROR_MESSAGE", {error_message: result.data._error_message})
+                        $confirm.notify("error", errorMsg)
 
             loader.start()
             $rs.projects.import(file, loader.update).then(onSuccess, onError)
 
     return {link: link}
 
-module.directive("tgImportProjectButton", ["$tgResources", "$tgConfirm", "$location", "$tgNavUrls", "$translate",
+module.directive("tgImportProjectButton",
+["$tgResources", "$tgConfirm", "$location", "$tgNavUrls", "$translate", "tgLightboxFactory", "tgCurrentUserService", "$tgAuth",
                                            ImportProjectButtonDirective])
+
+LbImportErrorDirective = (lightboxService) ->
+    link = (scope, el, attrs) ->
+        lightboxService.open(el)
+
+        scope.close = () ->
+            lightboxService.close(el)
+            return
+
+    return {
+        templateUrl: "common/lightbox/lightbox-import-error.html",
+        link: link
+    }
+
+LbImportErrorDirective.$inject = ["lightboxService"]
+
+module.directive("tgLbImportError", LbImportErrorDirective)
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index fe3dd88d..5db4e843 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -74,7 +74,8 @@ class LightboxService extends taiga.Service
             $el.removeAttr('style')
             $el.removeClass("open").removeClass('close')
 
-        $el.addClass('close')
+        @animationFrame.add ->
+            $el.addClass('close')
 
         if $el.hasClass("remove-on-close")
             scope = $el.data("scope")
diff --git a/app/coffee/modules/resources/projects.coffee b/app/coffee/modules/resources/projects.coffee
index a1745420..7c1a372f 100644
--- a/app/coffee/modules/resources/projects.coffee
+++ b/app/coffee/modules/resources/projects.coffee
@@ -128,7 +128,11 @@ resourceProvider = ($config, $repo, $http, $urls, $auth, $q, $translate) ->
             catch
                 response.data = {}
             response.status = evt.target.status
-
+            if evt.target.getResponseHeader('Taiga-Info-Project-Is-Private')
+                response.headers = {
+                    isPrivate: evt.target.getResponseHeader('Taiga-Info-Project-Is-Private') == 'True',
+                    members: parseInt(evt.target.getResponseHeader('Taiga-Info-Project-Memberships'))
+                }
             defered.resolve(response) if response.status in [201, 202]
             defered.reject(response)
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 608e67fa..c9b100e2 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -806,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Sorry, our Oompa Loompas are very busy right now. Please try again in a few minutes.",
             "ERROR_MESSAGE": "Our Oompa Loompas have some problems importing your dump data: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is too heavy for our Oompa Loompas, try it with a smaller than ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Your project has been imported successfuly"
+            "SYNC_SUCCESS": "Your project has been imported successfuly",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Like",
diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
index c52a9961..10374374 100644
--- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
+++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
@@ -28,11 +28,11 @@ div.navbar-dropdown.dropdown-project-list
             title="{{'PROJECT.NAVIGATION.ACTION_CREATE_PROJECT' | translate}}",
             translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT")
 
-        a.button-blackish.import-project-button(
-            href=""
-            title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}"
-            tg-import-project-button
-        )
-            svg.icon.icon-upload
-                use(xlink:href="#icon-upload")
-            input.import-file.hidden(type="file")
+        span(tg-import-project-button)
+            a.button-blackish.import-project-button(
+                href=""
+                title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}"
+            )
+                svg.icon.icon-upload
+                    use(xlink:href="#icon-upload")
+            input.import-file.hidden(type="file")
\ No newline at end of file
diff --git a/app/partials/common/lightbox/lightbox-import-error.jade b/app/partials/common/lightbox/lightbox-import-error.jade
new file mode 100644
index 00000000..a715445d
--- /dev/null
+++ b/app/partials/common/lightbox/lightbox-import-error.jade
@@ -0,0 +1,44 @@
+a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
+
+.content
+    div(ng-switch="key")
+        div(ng-switch-when="private-space")
+            img(width="80", src="/#{v}/svg/icons/project-limit.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.DESC", translate-values="{{values}}")
+
+        div(ng-switch-when="private-members")
+            img(width="80", src="/#{v}/svg/icons/block-user.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
+
+        div(ng-switch-when="private-space-members")
+            img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
+
+        div(ng-switch-when="public-space")
+            img(width="80", src="/#{v}/svg/icons/project-limit.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.DESC", translate-values="{{values}}")
+
+        div(ng-switch-when="public-members")
+            img(width="80", src="/#{v}/svg/icons/block-user.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
+
+        div(ng-switch-when="public-space-members")
+            img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
+
+            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
+            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
+
+    div.options
+        a.button-green(translate="COMMON.ACCEPT", ng-click="close()")
\ No newline at end of file
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 1a9b3379..265a5236 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -538,3 +538,18 @@
         }
     }
 }
+
+.lightbox-import-error {
+    text-align: center;
+    p {
+        a {
+            color: $primary;
+        }
+    }
+    .content {
+        width: 500px;
+    }
+    h2 {
+        margin-top: 1rem;
+    }
+}
diff --git a/app/svg/icons/block-user.svg b/app/svg/icons/block-user.svg
new file mode 100644
index 00000000..3c43c532
--- /dev/null
+++ b/app/svg/icons/block-user.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 92.8 72.7">
+  <g fill="#b8b8b8">
+    <g transform="matrix(.07344 0 0 .07096 0 0)">
+      <path d="M644 0C513.3 0 406.7 113.7 406.7 253.2c0 139.4 106.6 253 237.3 253 130.7 0 237.4-113.6 237.4-253C881.4 113.7 774.7 0 644 0zm0 64c98.3 0 177.4 84.3 177.4 189.2 0 104.8-79 189-177.4 189-98.3 0-177.3-84.2-177.3-189 0-105 79-189.2 177.3-189.2zm-307.6 53.6c-115.8 0-210 100.7-210 224 0 123.5 94.2 224.2 210 224.2 63.7 0 108.8-17.6 147.4-65.7-86-38-134.7-141.5-134.7-246.8 0-47.5 12.4-92 34-130-15-3.7-30.7-5.6-46.6-5.6zM644 547c-210.6 0-379 201-380 445v32h760v-32c-1-244-169.4-445-380-445zm-311 53.5c-13.6.2-23.3 1.2-23.3 1.2-186.4 0-308.8 178-309.6 394v28.3h206.4v-32c.7-163 60.3-310.6 173-388.2-15.5-3-33-3.5-46.5-3.3zM644 611c165.8 0 304 151.6 318.4 349H325.6C340 762.6 478.2 611 644 611z"/>
+    </g>
+    <g transform="matrix(.0194 0 0 .0194 72.92 1.373)">
+      <path d="M427.6 0c-149.5 0-271 121.6-271 271.4V391H0v633h1024V391H867.3V271.4C867.3 121.6 746 0 596.3 0H427.7zm0 64h168.8c115 0 206.8 92 206.8 207.4V391H220.7V271.5C220.7 156 312.4 64 427.7 64zM64 455.3h896V960H64V455zm416 131.5V816h64V586.7h-64z"/>
+    </g>
+  </g>
+</svg>
diff --git a/app/svg/icons/multi-block-project.svg b/app/svg/icons/multi-block-project.svg
new file mode 100644
index 00000000..bc13957a
--- /dev/null
+++ b/app/svg/icons/multi-block-project.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 207.87413 65.026039">
+  <g fill="#b8b8b8">
+    <path d="M105 14.5c-5 0-9 4-9 9.2v4h-5.4V49H125V27.6H120v-4c0-5-4-9.2-9-9.2H105zm0 2.2h5.7c3.8 0 7 3 7 7v4H98v-4c0-4 3-7 7-7zm-12.2 13h30v17H93v-17zm14 4.6V42h2v-7.7h-2zM183 0c-8.7 0-15.7 7.2-15.7 16 0 9 7 16 15.6 16 8.5 0 15.5-7 15.5-16 0-8.8-7-16-15.6-16zm0 4c6.3 0 11.5 5.4 11.5 12 0 6.7-5.2 12-11.6 12-6.6 0-11.8-5.3-11.8-12 0-6.6 5.2-12 11.7-12zm-20.3 3.5C155 7.5 149 14 149 21.7c0 7.8 6 14.2 13.7 14.2 4.2 0 7-1.2 9.7-4.2-5.7-2.5-9-9-9-15.7 0-3 1-5.8 2.3-8.2l-3-.3zM183 34.7c-14 0-25 12.8-25 28.3v2h50v-2c-.2-15.5-11.3-28.3-25-28.3zM162.4 38c-1 0-1.6.2-1.6.2-12.3 0-20.4 11.3-20.4 25V65H154v-2c.2-10.4 4-19.7 11.5-24.7l-3-.2zm20.4.8c10.8 0 20 9.6 20.8 22.2H162c1-12.6 10-22.2 21-22.2zM43 10.5v7.2H9.2v9H0V65h72.3V10.4h-25zm4.4 4.5h20.4v45.3h-9V26.8h-45V22l33.6.2z"/>
+  </g>
+</svg>
diff --git a/app/svg/icons/project-limit.svg b/app/svg/icons/project-limit.svg
new file mode 100644
index 00000000..6f0ac0d5
--- /dev/null
+++ b/app/svg/icons/project-limit.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72.3 54.4">
+ <g fill="#b8b8b8" transform="translate(0 -8.944) scale(.07058)">
+   <path d="M607.8 126.7V229h-476v127.3H0v541h1024V126.7H671.8zm64 64H960v642.6H832V358.6h-.4v-2.3h-636V293l476.2 2.5z" />
+ </g>
+ <g fill="#f5f5f5" transform="translate(14.503 21.18) scale(.0254)">
+   <path d="M427.6 0c-149.5 0-271 121.6-271 271.4V391H0v633h1024V391H867.3V271.4C867.3 121.6 746 0 596.3 0H427.7zm0 64h168.8c115 0 206.8 92 206.8 207.4V391H220.7V271.5C220.7 156 312.4 64 427.7 64zM64 455.3h896V960H64V455zm416 131.5V816h64V586.7h-64z"/>
+ </g>
+</svg>

From f30300653cce7850b4f37fe144229d76907cc8cb Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 7 Mar 2016 09:51:48 +0100
Subject: [PATCH 085/155] fix members list without project

---
 app/coffee/modules/admin/memberships.coffee | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 9dbae4fe..299c3525 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -81,10 +81,12 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             @scope.projectId = project.id
             @scope.project = project
             @scope.$emit('project:loaded', project)
+
             return project
 
     loadMembers: ->
         httpFilters = @.getUrlFilters()
+
         return @rs.memberships.list(@scope.projectId, httpFilters).then (data) =>
             @scope.memberships = _.filter(data.models, (membership) ->
                                     membership.user == null or membership.is_user_active)
@@ -95,14 +97,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             return data
 
     loadInitialData: ->
-        promise = @.loadProject()
-
-        @q.all([
-            @.loadMembers(),
-            @tgAuth.refresh()
-        ])
-
-        return promise
+        return @.loadProject().then () =>
+            return @q.all([
+                @.loadMembers(),
+                @tgAuth.refresh()
+            ])
 
     getUrlFilters: ->
         filters = _.pick(@location.search(), "page")

From ba86d707bdc4a0a0f55bafa34998c6b72408aafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 7 Mar 2016 11:55:16 +0100
Subject: [PATCH 086/155] Show correct number of members limit

---
 app/coffee/modules/admin/memberships.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 299c3525..c55a331c 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -119,7 +119,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             @.maxMembers = userData.max_members_private_projects
             @scope.canAddUsers = false
         else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
-            @.maxMembers = userData.max_members_private_projects
+            @.maxMembers = userData.max_members_public_projects
             @scope.canAddUsers = false
 
     limitUsersWarning: ->

From 5cd58d12075fa5d29cd9f2b729703f9b6c56546d Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 7 Mar 2016 14:41:07 +0100
Subject: [PATCH 087/155] loading while deleting user

---
 app/coffee/modules/user-settings/lightboxes.coffee | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/coffee/modules/user-settings/lightboxes.coffee b/app/coffee/modules/user-settings/lightboxes.coffee
index 68545809..32f32bce 100644
--- a/app/coffee/modules/user-settings/lightboxes.coffee
+++ b/app/coffee/modules/user-settings/lightboxes.coffee
@@ -33,7 +33,7 @@ module = angular.module("taigaUserSettings")
 ## Delete User Lightbox Directive
 #############################################################################
 
-DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxService) ->
+DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxService, $loading) ->
     link = ($scope, $el, $attrs) ->
         $scope.$on "deletelightbox:new", (ctx, user)->
             lightboxService.open($el)
@@ -42,15 +42,21 @@ DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxSe
             $el.off()
 
         submit = ->
+            currentLoading = $loading()
+                .target(submitButton)
+                .start()
+
             promise = $repo.remove($scope.user)
 
             promise.then (data) ->
+                currentLoading.finish()
                 lightboxService.close($el)
                 $auth.logout()
                 $location.path($navUrls.resolve("login"))
 
             # FIXME: error handling?
             promise.then null, ->
+                currentLoading.finish()
                 console.log "FAIL"
 
         $el.on "click", ".button-green", (event) ->
@@ -61,10 +67,12 @@ DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxSe
             event.preventDefault()
             submit()
 
+        submitButton = $el.find(".button-red")
+
     return {
         link: link,
         templateUrl: "user/lightbox/lightbox-delete-account.html"
     }
 
 module.directive("tgLbDeleteUser", ["$tgRepo", "$rootScope", "$tgAuth", "$tgLocation", "$tgNavUrls",
-                                    "lightboxService", DeleteUserDirective])
+                                    "lightboxService", "$tgLoading", DeleteUserDirective])

From ba67b91beb22fe32417d89e1e538c09b68d216c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 7 Mar 2016 17:23:54 +0100
Subject: [PATCH 088/155] Fix glitch for zindex in menu vs kanban

---
 app/styles/modules/common/nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 15f9db96..232dd04d 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -8,7 +8,7 @@ tg-project-menu {
     padding: 1rem 0;
     position: relative;
     text-transform: uppercase;
-    z-index: 9;
+    z-index: 99;
     .menu {
         &.menu-fixed {
             position: fixed;

From 82cf43082e4bb2d5d769bd834256908ee9438aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 8 Mar 2016 09:11:14 +0100
Subject: [PATCH 089/155] Broke large words in comments

---
 app/styles/components/wysiwyg.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/components/wysiwyg.scss b/app/styles/components/wysiwyg.scss
index 56c46839..3953a8dc 100644
--- a/app/styles/components/wysiwyg.scss
+++ b/app/styles/components/wysiwyg.scss
@@ -48,6 +48,7 @@
     }
     p {
         margin-bottom: 1rem;
+        word-wrap: break-word;
     }
     .codehilite {
         overflow: auto;

From dcd62dc098c7abc2c49ad07a473483afd07427cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 8 Feb 2016 15:02:14 +0100
Subject: [PATCH 090/155] Hide related attachments and related tasks

---
 app/coffee/modules/related-tasks.coffee       | 13 +++++++++++
 .../attachments-full.controller.coffee        | 13 +++++++++--
 .../attachments-full.controller.spec.coffee   | 23 +++++++++++++++++++
 .../attachments-full.directive.coffee         |  5 ++--
 .../attachments-full/attachments-full.jade    |  5 +++-
 .../includes/modules/related-tasks.jade       |  5 +++-
 app/partials/issue/issues-detail.jade         |  1 +
 app/partials/task/task-detail.jade            |  3 ++-
 app/partials/us/us-detail.jade                |  1 +
 app/partials/wiki/wiki.jade                   |  1 +
 10 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index 0a44213c..9095773f 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -227,6 +227,19 @@ RelatedTasksDirective = ($repo, $rs, $rootscope) ->
                 $scope.tasks = _.sortBy(tasks, 'ref')
                 return tasks
 
+        _isVisible = ->
+            if $scope.project
+                return $scope.project.my_permissions.indexOf("view_tasks") != -1
+            return false
+
+        _isEditable = ->
+            if $scope.project
+                return $scope.project.my_permissions.indexOf("modify_task") != -1
+            return false
+
+        $scope.showRelatedTasks = ->
+            return _isVisible() && ( _isEditable() ||  $scope.tasks?.length )
+
         $scope.$on "related-tasks:add", ->
             loadTasks().then ->
                 $rootscope.$broadcast("related-tasks:update")
diff --git a/app/modules/components/attachments-full/attachments-full.controller.coffee b/app/modules/components/attachments-full/attachments-full.controller.coffee
index 30055c87..400ee65f 100644
--- a/app/modules/components/attachments-full/attachments-full.controller.coffee
+++ b/app/modules/components/attachments-full/attachments-full.controller.coffee
@@ -25,10 +25,11 @@ class AttachmentsFullController
         "$tgConfirm",
         "$tgConfig",
         "$tgStorage",
-        "tgAttachmentsFullService"
+        "tgAttachmentsFullService",
+        "tgProjectService"
     ]
 
-    constructor: (@translate, @confirm, @config, @storage, @attachmentsFullService) ->
+    constructor: (@translate, @confirm, @config, @storage, @attachmentsFullService, @projectService) ->
         @.mode = @storage.get('attachment-mode', 'list')
 
         @.maxFileSize = @config.get("maxUploadFileSize", null)
@@ -85,4 +86,12 @@ class AttachmentsFullController
     updateAttachment: (toUpdateAttachment) ->
         @attachmentsFullService.updateAttachment(toUpdateAttachment, @.type)
 
+    _isEditable: ->
+        if @projectService.project
+            return @projectService.hasPermission(@.editPermission)
+        return false
+
+    showAttachments: ->
+        return @._isEditable() || @attachmentsFullService.attachments.size
+
 angular.module("taigaComponents").controller("AttachmentsFull", AttachmentsFullController)
diff --git a/app/modules/components/attachments-full/attachments-full.controller.spec.coffee b/app/modules/components/attachments-full/attachments-full.controller.spec.coffee
index e45321af..6c623174 100644
--- a/app/modules/components/attachments-full/attachments-full.controller.spec.coffee
+++ b/app/modules/components/attachments-full/attachments-full.controller.spec.coffee
@@ -53,6 +53,14 @@ describe "AttachmentsController", ->
 
         $provide.value("tgAttachmentsFullService", mocks.attachmentsFullService)
 
+    _mockProjectService = ->
+        mocks.projectService = {
+            project: sinon.stub()
+            hasPermission: sinon.stub()
+        }
+
+        $provide.value("tgProjectService", mocks.projectService)
+
     _mocks = ->
         module (_$provide_) ->
             $provide = _$provide_
@@ -62,6 +70,7 @@ describe "AttachmentsController", ->
             _mockConfig()
             _mockStorage()
             _mockAttachmetsFullService()
+            _mockProjectService()
 
             return null
 
@@ -213,3 +222,17 @@ describe "AttachmentsController", ->
         ctrl.updateAttachment(file, 5)
 
         expect(mocks.attachmentsFullService.updateAttachment).to.have.been.calledWith(file, 'us')
+
+    it "if attachments editable", () ->
+        mocks.projectService.project = true
+        ctrl = $controller("AttachmentsFull")
+
+        ctrl._isEditable()
+
+        expect(mocks.projectService.hasPermission).has.been.called
+
+    it "if attachments are not editable", () ->
+        mocks.projectService.project = false
+        ctrl = $controller("AttachmentsFull")
+
+        expect(ctrl._isEditable()).to.be.false
diff --git a/app/modules/components/attachments-full/attachments-full.directive.coffee b/app/modules/components/attachments-full/attachments-full.directive.coffee
index 5200feb5..e710daaa 100644
--- a/app/modules/components/attachments-full/attachments-full.directive.coffee
+++ b/app/modules/components/attachments-full/attachments-full.directive.coffee
@@ -28,8 +28,9 @@ AttachmentsFullDirective = () ->
         scope: {},
         bindToController: {
             type: "@",
-            objId: "="
-            projectId: "="
+            objId: "=",
+            projectId: "=",
+            editPermission: "@"
         },
         controller: "AttachmentsFull",
         controllerAs: "vm",
diff --git a/app/modules/components/attachments-full/attachments-full.jade b/app/modules/components/attachments-full/attachments-full.jade
index 98a9710d..1e4e58aa 100644
--- a/app/modules/components/attachments-full/attachments-full.jade
+++ b/app/modules/components/attachments-full/attachments-full.jade
@@ -1,4 +1,7 @@
-section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
+section.attachments(
+    tg-attachments-drop="vm.addAttachments(files, false)"
+    ng-show="vm.showAttachments()"
+)
     .attachments-header
         h3.attachments-title #[span.attachments-num {{vm.attachments.size}}] #[span.attachments-text(translate="ATTACHMENT.SECTION_NAME")]
         .options
diff --git a/app/partials/includes/modules/related-tasks.jade b/app/partials/includes/modules/related-tasks.jade
index 40c900b4..da0c24ba 100644
--- a/app/partials/includes/modules/related-tasks.jade
+++ b/app/partials/includes/modules/related-tasks.jade
@@ -1,4 +1,7 @@
-section.related-tasks(tg-related-tasks)
+section.related-tasks(
+    tg-related-tasks
+    ng-show="showRelatedTasks()"
+)
     .related-tasks-header
         span.related-tasks-title(translate="COMMON.RELATED_TASKS")
         div(tg-related-task-create-button)
diff --git a/app/partials/issue/issues-detail.jade b/app/partials/issue/issues-detail.jade
index 30b2d69d..5a2b5a44 100644
--- a/app/partials/issue/issues-detail.jade
+++ b/app/partials/issue/issues-detail.jade
@@ -77,6 +77,7 @@ div.wrapper(
             obj-id="issue.id"
             type="issue",
             project-id="projectId"
+            edit-permission = "modify_issue"
         )
 
         tg-history(ng-model="issue", type="issue")
diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade
index 962f1bfe..e4060314 100644
--- a/app/partials/task/task-detail.jade
+++ b/app/partials/task/task-detail.jade
@@ -92,8 +92,9 @@ div.wrapper(
 
         tg-attachments-full(
             obj-id="task.id"
-            type="task",
+            type="task"
             project-id="projectId"
+            edit-permission = "modify_task"
         )
 
         tg-history(ng-model="task", type="task")
diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade
index 58b89303..b6dcbcd0 100644
--- a/app/partials/us/us-detail.jade
+++ b/app/partials/us/us-detail.jade
@@ -89,6 +89,7 @@ div.wrapper(
             obj-id="us.id"
             type="us",
             project-id="projectId"
+            edit-permission = "modify_us"
         )
 
         tg-history(
diff --git a/app/partials/wiki/wiki.jade b/app/partials/wiki/wiki.jade
index f7f04cb0..40523910 100644
--- a/app/partials/wiki/wiki.jade
+++ b/app/partials/wiki/wiki.jade
@@ -21,6 +21,7 @@ div.wrapper(ng-controller="WikiDetailController as ctrl",
             obj-id="wiki.id"
             type="wiki_page",
             project-id="projectId"
+            edit-permission = "modify_wiki_page"
         )
 
         a.remove(href="", ng-click="ctrl.delete()", ng-if="wiki.id", title="{{'WIKI.REMOVE' | translate}}", tg-check-permission="delete_wiki_page")

From 8c14619e426a8d8285616a271bc584c7fa98947f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 8 Mar 2016 18:27:16 +0100
Subject: [PATCH 091/155] [i18n] Update locales

---
 app/locales/taiga/locale-ca.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-de.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-es.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-fi.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-fr.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-it.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-nl.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-pl.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-pt-br.json   | 77 ++++++++++++++++++++++-----
 app/locales/taiga/locale-ru.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-sv.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-tr.json      | 73 ++++++++++++++++++++-----
 app/locales/taiga/locale-zh-hant.json | 73 ++++++++++++++++++++-----
 13 files changed, 795 insertions(+), 158 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index c7a5c57f..2e96a1a6 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Un poc saturat per una tasca? Fes-ho saber als teus companys clicant a Iocaina quan edites la tasca. Es possible ser inmune a aquesta (fictícia) poció mortal consumint xicotetes dòsis poc a poc, així com es possible millorar amb xicotets nous desafiaments!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Aquest valor pareix invàlid.",
@@ -407,7 +408,9 @@
             "TITLE": "Gestió de Membres",
             "PAGE_TITLE": "Afiliacions - {{projectName}}",
             "ADD_BUTTON": "+ Nou membre",
-            "ADD_BUTTON_TITLE": "Afegir nou membre"
+            "ADD_BUTTON_TITLE": "Afegir nou membre",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -429,6 +432,10 @@
             "DISABLE": "Desactiva",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Organitza les històries d'usuari per a mantindre una vista organitzada i prioritzada del treball.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organitza els projectes de un mode sencill amb aquest tauler",
             "ISSUES": "Incidències",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Afegix, modifica o borra contingut en col3laboració amb altres. Aquest es el lloc correcte per a la teua documentació.",
             "MEETUP": "Trobar-se",
-            "MEETUP_DESCRIPTION": "Tria el teu sistema de videonconferéncia. Inclosos els desenvolupadors necessitan contacte cara a cara",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Selecciona un sistema de videconferència",
-            "SALT_CHAT_ROOM": "Pots afegir un code salt a la sala de xat",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Detalls de projecte",
             "PROJECT_NAME": "Nom del projecte",
             "PROJECT_SLUG": "Slug de projecte",
-            "NUMBER_SPRINTS": "Nombre d'sprints (0 per a quantitat indetermindad)",
-            "NUMBER_US_POINTS": "Nombre de punts d'històries (0 per a una quantitat indeterminada)",
             "TAGS": "Etiquetes",
             "DESCRIPTION": "Descripció",
             "RECRUITING": "Este projecte busca col·laboracions?",
@@ -463,7 +468,11 @@
             "DELETE": "Esborra aquest projecte",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{un fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{un seguidor} other{# seguidors}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{un membre} other{# membres}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "punts<br/> projecte",
             "DEFINED": "punts<br/> definits",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Canvi de contrasenya",
             "DASHBOARD_TITLE": "Tauler",
             "DISCOVER_TITLE": "Discover trending projects",
+            "NEW_ITEM": "New",
             "DISCOVER": "Descobreix",
             "ACTION_REORDER": "Arrossega els elements per endreçar"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Ho sentim, els Oompa Loompas estàn molt ocupats ara mateix. Intenta-ho de nou en uns moments.",
             "ERROR_MESSAGE": "Els Oompa Loompas tenen problemes important les teues dades: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) es massa gran per als nostres Oompa Loompas, prova amb algun inferior a ({{maxFileSize}})",
-            "SYNC_SUCCESS": "El teu projecte s'ha importat correctament"
+            "SYNC_SUCCESS": "El teu projecte s'ha importat correctament",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "M'agrada",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Esborrar compte de Taiga",
             "CONFIRM": "Segur que vols borrar el teu compte de Taiga? ",
             "SUBTITLE": "Te trobarem a faltar! :-(",
-            "NEWSLETTER_LABEL_TEXT": "No vull rebre més el vostre butlletí de notícies"
+            "NEWSLETTER_LABEL_TEXT": "No vull rebre més el vostre butlletí de notícies",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Esborrar projecte",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Tria una plantilla",
-        "CHOOSE_TEMPLATE_TEXT": "Quina plantilla encaixa millor al teu projecte?",
         "SECTION_TITLE_CREATE_PROJECT": "Crear projecte",
         "CREATE_PROJECT_TEXT": "Nou projecte. Qué il·lusió!",
-        "PROGRESS_TEMPLATE_SELECTION": "Selecció de plantilla",
-        "PROGRESS_NAME_DESCRIPTION": "Nom i descripció"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index 3f825ef0..48bbf81f 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Fühlen Sie sich von einer Aufgabe etwas erdrückt? Stellen Sie sicher, dass andere davon erfahren, indem Sie auf Locaine klicken, wenn Sie eine Aufgabe ändern. Es ist möglich, gegen dieses (fiktive) tödliche Gift immun zu werden, indem man kleine Mengen über einen Zeitraum hinweg einnimmt. Genauso, wie es möglich ist, besser in dem zu werden, was man tut, indem man gelegentlich zusätzliche Herausforderungen annimmt!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Dieser Wert scheint ungültig zu sein.",
@@ -407,7 +408,9 @@
             "TITLE": "Mitglieder verwalten",
             "PAGE_TITLE": "Mitgliedschaften - {{projectName}}",
             "ADD_BUTTON": "+ Neues Mitglied",
-            "ADD_BUTTON_TITLE": "Neues Mitglied hinzufügen"
+            "ADD_BUTTON_TITLE": "Neues Mitglied hinzufügen",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportieren",
@@ -429,6 +432,10 @@
             "DISABLE": "Deaktivieren",
             "BACKLOG": "Auftragsliste",
             "BACKLOG_DESCRIPTION": "Verwalten Sie Ihre User-Stories, um einen organisierten Überblick der anstehenden und priorisierten Aufgaben zu erhalten.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisieren Sie Ihr Projekt auf übersichtliche Art.",
             "ISSUES": "Tickets",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Fügen Sie Inhalte hinzu, ändern oder löschen Sie sie in Zusammenarbeit mit anderen. Dies ist der richtige Ort für Ihre Projektdokumentation.",
             "MEETUP": "Zusammentreffen",
-            "MEETUP_DESCRIPTION": "Wählen Sie Ihr Videokonferenzsystem. Auch Entwickler brauchen Kontakt von Angesicht zu Angesicht.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Wählen Sie ein Videokonferenzsystem",
-            "SALT_CHAT_ROOM": "Wenn Sie möchten, können Sie einen Salt Code zum Namen des Chatrooms hinzufügen",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "Erscheint in",
             "TALKY_CHAT_ROOM": "Gesprächig",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Projekt Details",
             "PROJECT_NAME": "Projektname",
             "PROJECT_SLUG": "Projekt Slug",
-            "NUMBER_SPRINTS": "Anzahl von Sprints (0 für unbegrenzte Anzahl)",
-            "NUMBER_US_POINTS": "Anzahl an US Points (0 für unbegrenzte Anzahl)",
             "TAGS": "Schlagwörter",
             "DESCRIPTION": "Beschreibung",
             "RECRUITING": "Is this project looking for people?",
@@ -463,7 +468,11 @@
             "DELETE": "Dieses Projekt löschen",
             "LOGO_HELP": "Das Bild wird auf 80x80px skaliert.",
             "CHANGE_LOGO": "Logo ändern",
-            "ACTION_USE_DEFAULT_LOGO": "Nutze Standardbild"
+            "ACTION_USE_DEFAULT_LOGO": "Nutze Standardbild",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Berichte",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{ein Fan} andere{# Fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{ein Beobachter} andere{# Beobachter}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} andere{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "Projekt<br/> Punkte",
             "DEFINED": "definierte<br/> Punkte",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Passwort ändern",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Entdecke aktuelle Projekte",
+            "NEW_ITEM": "New",
             "DISCOVER": "Entdecken",
             "ACTION_REORDER": "Benutzen Sie Drag & Drop zum neuen Ordnen"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Entschuldigung, unsere Helferlein sind derzeit sehr beschäftigt. Bitte versuchen Sie es in ein paar Minuten erneut.",
             "ERROR_MESSAGE": "Unsere Helferlein haben Probleme beim Importieren Ihrer Datei: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) ist zu schwierig für unsere Helferlein, versuchen Sie es bitte mit einer kleineren Datei als ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Ihr Projekt wurde erfolgreich importiert"
+            "SYNC_SUCCESS": "Ihr Projekt wurde erfolgreich importiert",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Gefällt mir",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Dein Taiga Benutzerkonto löschen",
             "CONFIRM": "Sind Sie sicher, dass Sie Ihr Taiga Benutzerkonto löschen wollen?",
             "SUBTITLE": "Wir werden Sie vermissen! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Ich möchte keinen Newsletter mehr erhalten"
+            "NEWSLETTER_LABEL_TEXT": "Ich möchte keinen Newsletter mehr erhalten",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Projekt löschen",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Wählen Sie ein Template",
-        "CHOOSE_TEMPLATE_TEXT": "Welches Template würde besser zu Ihrem Projekt passen?",
         "SECTION_TITLE_CREATE_PROJECT": "Projekt erstellen",
         "CREATE_PROJECT_TEXT": "Frisch und sauber. Wie aufregend!",
-        "PROGRESS_TEMPLATE_SELECTION": "Template Auswahl",
-        "PROGRESS_NAME_DESCRIPTION": "Name und Beschreibung"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index 68a68e9e..62a0f1da 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "¿Te sientes fuera de tu zona de confort en una tarea? Asegúrate de que los demás están al tanto de ello, marca el check de la Iocaína al editar una tarea. Igual eu era posible llegar a ser inmune a este veneno mortal a base de consumir pequeñas dosis a lo largo del tiempo, es posible conseguir mejor en lo que estás haciendo si afrontas de vez en cuando esta clase de retos!",
         "CLIENT_REQUIREMENT": "Requerimiento de cliente es un nuevo requisito que no se esperaba y es necesario que forme parte del proyecto.",
         "TEAM_REQUIREMENT": "Requerimiento del equipo es un nuevo requisito que debe existir en el proyecto pero que no conllevará ningún coste para el cliente.",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece inválido.",
@@ -407,7 +408,9 @@
             "TITLE": "Administrar miembros",
             "PAGE_TITLE": "Miembros - {{projectName}}",
             "ADD_BUTTON": "+ Nuevo miembro",
-            "ADD_BUTTON_TITLE": "Añadir un nuevo miembro"
+            "ADD_BUTTON_TITLE": "Añadir un nuevo miembro",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -429,6 +432,10 @@
             "DISABLE": "Desactivado",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gestiona tus historias de usuario para mantener una vista organizada y priorizada de los próximos trabajos que deberás afrontar. ",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organiza tus proyectos de una manera flexible con este panel.",
             "ISSUES": "Peticiones",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Añade, modifica o borra contenido en colaboración con otros miembros. Este es el lugar adecuado para la documentación de tu proyecto.",
             "MEETUP": "Meet Up",
-            "MEETUP_DESCRIPTION": "Elige tu sistema de videoconferencia. Incluso los desarrolladores necesitan el contacto cara a cara.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Elige un sistema de videoconferencia",
-            "SALT_CHAT_ROOM": "Puedes añadirle un código salt al nombre del chat room",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Info del proyecto",
             "PROJECT_NAME": "Nombre del proyecto",
             "PROJECT_SLUG": "Slug de proyecto",
-            "NUMBER_SPRINTS": "Número de sprints (0 para cantidad indeterminada)",
-            "NUMBER_US_POINTS": "Número de puntos de historias de usuario (0 para indeterminado)",
             "TAGS": "Etiquetas",
             "DESCRIPTION": "Descripción",
             "RECRUITING": "¿Este proyecto está buscando a gente?",
@@ -463,7 +468,11 @@
             "DELETE": "Eliminar este proyecto",
             "LOGO_HELP": "La imagen se escalará a 80x80px.",
             "CHANGE_LOGO": "Cambia el logo",
-            "ACTION_USE_DEFAULT_LOGO": "Usar imagen por defecto"
+            "ACTION_USE_DEFAULT_LOGO": "Usar imagen por defecto",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{un fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{un observador} other{# observadores}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{un miembro} other{# miembros}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "puntos<br/> proyecto",
             "DEFINED": "puntos<br/> definidos",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Cambiar contraseña",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Descubre los proyectos más relevantes",
+            "NEW_ITEM": "New",
             "DISCOVER": "Descubrir",
             "ACTION_REORDER": "Arrastrar y soltar para reordenar"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Lo sentimos, nuestros Oompa Loompas están muy ocupados en este momento. Por favor inténtalo nuevamente en unos minutos.",
             "ERROR_MESSAGE": "Nuestros Oompa Loompas tienen algunos problemas importando tus datos: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "El fichero '{{fileName}}' ({{fileSize}}) es demasiado pesado para nuestros Oompa Loompas, prueba con uno de menos de ({{maxFileSize}}).",
-            "SYNC_SUCCESS": "Tu proyecto se ha importado con éxito."
+            "SYNC_SUCCESS": "Tu proyecto se ha importado con éxito.",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Me gusta",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Eliminar cuenta de Taiga",
             "CONFIRM": "¿Está seguro que deseas eliminar tu cuenta de Taiga?",
             "SUBTITLE": "¡Te extrañaremos! :-(",
-            "NEWSLETTER_LABEL_TEXT": "No quiero recibir la newsletter nunca más."
+            "NEWSLETTER_LABEL_TEXT": "No quiero recibir la newsletter nunca más.",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Borrar proyecto",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Elija una plantilla",
-        "CHOOSE_TEMPLATE_TEXT": "¿Que plantilla se ajusta mejor con tu proyecto?",
         "SECTION_TITLE_CREATE_PROJECT": "Crear Proyecto",
         "CREATE_PROJECT_TEXT": "Fresco y claro. ¡Es emocionante!",
-        "PROGRESS_TEMPLATE_SELECTION": "Selección de plantilla",
-        "PROGRESS_NAME_DESCRIPTION": "Nombre y descripción"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index 14c70bea..e6f4818d 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Jos tehtävä ahdistaa, merkitse se myrkylliseksi. Ajan mittaa pieninä annoksina saattaa kastokykysi myrkkyä vastaan parantua.",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Tämä arvo vaikuttaa virheelliseltä.",
@@ -407,7 +408,9 @@
             "TITLE": "Hallinnoi jäseniä",
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ Uusi jäsen",
-            "ADD_BUTTON_TITLE": "Lisää jäsen"
+            "ADD_BUTTON_TITLE": "Lisää jäsen",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Vie",
@@ -429,6 +432,10 @@
             "DISABLE": "Passivoi",
             "BACKLOG": "Odottavat",
             "BACKLOG_DESCRIPTION": "Hallinnoi käyttäjätarinoita: järjestele ja priorisoi työtä.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Järjestä projektisi tehokkaasti tällä taululla.",
             "ISSUES": "Pyynnöt",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Lisää, muokkaa tai poista sisältöä yhteistyössä muiden kanssa. Tämä on oikea paikka projektin dokumentaatiolle.",
             "MEETUP": "Tapaa",
-            "MEETUP_DESCRIPTION": "Valitse videoneuvottelu- järjestelmä. Jopa kehittäjät tarvitsevat katsekontaktia.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Valitse videoconferenssi-järjestelmä",
-            "SALT_CHAT_ROOM": "Voit halutessasi lisätä suolaan chat-huoneen nimeen",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Projektin tiedot",
             "PROJECT_NAME": "Projektin nimi",
             "PROJECT_SLUG": "Projektin hukka-aika",
-            "NUMBER_SPRINTS": "Number of sprints (0 for an undetermined quantity)",
-            "NUMBER_US_POINTS": "Number of US points (0 for an undetermined quantity)",
             "TAGS": "Avainsanat",
             "DESCRIPTION": "Kuvaus",
             "RECRUITING": "Is this project looking for people?",
@@ -463,7 +468,11 @@
             "DELETE": "Poista tämä projekti",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Raportit",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "projekti<br/> pisteet",
             "DEFINED": "määritely<br/> pistettä",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Muuta salasanaa",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Discover trending projects",
+            "NEW_ITEM": "New",
             "DISCOVER": "Discover",
             "ACTION_REORDER": "Drag & drop to reorder"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Oompa Loompas ovat kiireisiä juuri nyt. Yritä hetken päästä uudelleen.",
             "ERROR_MESSAGE": "Oompa Loompas eivät pysty lukemaan tiedostoasi: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) on liian iso Oompa Loompaseille, kokeile pienemmällä kuin ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Projektisi on tuotu sisään onnistuneesti"
+            "SYNC_SUCCESS": "Projektisi on tuotu sisään onnistuneesti",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Like",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Poista Taiga-tunnus",
             "CONFIRM": "Haluatko varmasti poistaa Taiga-tunnuksesi?",
             "SUBTITLE": "Tulemme kaipaamaan sinua! :-(",
-            "NEWSLETTER_LABEL_TEXT": "En halua uutiskirjettä enää"
+            "NEWSLETTER_LABEL_TEXT": "En halua uutiskirjettä enää",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Poista projekti",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Valitse pohja",
-        "CHOOSE_TEMPLATE_TEXT": "Mikä pohja sopii paremmin projektillesi?",
         "SECTION_TITLE_CREATE_PROJECT": "Luo projekti",
         "CREATE_PROJECT_TEXT": "Täysin koskematon. Jännittävää!",
-        "PROGRESS_TEMPLATE_SELECTION": "Pohjan valinta",
-        "PROGRESS_NAME_DESCRIPTION": "Nimi ja kuvaus"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index ef7e4def..f4b58c69 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Vous vous sentez un peu submergé(e) par une tâche ? Soyez certains d'en informer les autres en cliquant sur Iocaine lors de la modification de la tâche. Il est possible de s'immuniser contre ce poison (fictif) en consommant de petites quantités en heures supplémentaires, tout comme il est possible de s'améliorer en acceptant parfois de nouveaux défis !",
         "CLIENT_REQUIREMENT": "Un besoin client est un nouveau besoin qui n'était pas prévu et qu'il est nécessaire d'intégrer au projet",
         "TEAM_REQUIREMENT": "Un besoin projet est un besoin qui est nécessaire au projet mais qui ne doit avoir aucun impact pour le client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Cette valeur semble être invalide.",
@@ -407,7 +408,9 @@
             "TITLE": "Gérer les membres",
             "PAGE_TITLE": "Membres - {{projectName}}",
             "ADD_BUTTON": "+ Nouveau membre",
-            "ADD_BUTTON_TITLE": "Ajouter un membre"
+            "ADD_BUTTON_TITLE": "Ajouter un membre",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exporter",
@@ -429,6 +432,10 @@
             "DISABLE": "Désactiver",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gérez votre récits utilisateur pour garder une vue organisée des travaux à venir et priorisés.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisez votre projet de manière agile avec ce tableau.",
             "ISSUES": "Tickets",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Ajoutez, modifiez, ou supprimez du contenu en collaboration avec d'autres. C'est le bon endroit pour la documentation de votre projet.",
             "MEETUP": "Meet Up",
-            "MEETUP_DESCRIPTION": "Choisissez votre système de vidéoconférence. Même les développeurs ont besoin de contact en face à face.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Choisissez un système de vidéoconférence",
-            "SALT_CHAT_ROOM": "Si vous le souhaitez vous pouvez ajouter un code de salage au nom du salon de discussion",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Détails du projet",
             "PROJECT_NAME": "Nom du projet",
             "PROJECT_SLUG": "Label du projet",
-            "NUMBER_SPRINTS": "Nombre de sprints (0 pour non déterminé)",
-            "NUMBER_US_POINTS": "Nombre de points de RU (0 pour non déterminé)",
             "TAGS": "Mots-clés",
             "DESCRIPTION": "Description",
             "RECRUITING": "Est-ce que ce projet recherche des membres ?",
@@ -463,7 +468,11 @@
             "DELETE": "Supprimer ce projet",
             "LOGO_HELP": "L'image va être agrandie à 80x80px",
             "CHANGE_LOGO": "Changer le logo",
-            "ACTION_USE_DEFAULT_LOGO": "Utiliser l'image par défaut "
+            "ACTION_USE_DEFAULT_LOGO": "Utiliser l'image par défaut ",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Rapports",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{un fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{un observateur} other{# observateurs}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{un membre} other{# membres}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "points<br/> projet",
             "DEFINED": "points<br/> définis",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Modifier le mot de passe",
             "DASHBOARD_TITLE": "Tableau de bord",
             "DISCOVER_TITLE": "Découvrir les projets populaires",
+            "NEW_ITEM": "New",
             "DISCOVER": "Découvrir",
             "ACTION_REORDER": "Glisser-déposer pour réorganiser"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Nous sommes désolés, nos Oompa Loompas sont très occupés en ce moment. Veuillez réessayer dans quelques minutes.",
             "ERROR_MESSAGE": "Nos Oompa Loompas ont des problèmes pour importer vos données de vidage : {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) est un peu trop lourd pour nos Oompa Loompas, réessayez avec un fichier d'une taille inférieure à ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Votre projet a été importé avec succès"
+            "SYNC_SUCCESS": "Votre projet a été importé avec succès",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "J'aime",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Supprimer le compte Taiga",
             "CONFIRM": "Etes-vous sûr de vouloir supprimer votre compte Taiga ?",
             "SUBTITLE": "Vous allez nous manquer ! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Je ne veux plus recevoir votre bulletin d'information"
+            "NEWSLETTER_LABEL_TEXT": "Je ne veux plus recevoir votre bulletin d'information",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Supprimer le projet",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Choisissez un template",
-        "CHOOSE_TEMPLATE_TEXT": "Quel template conviendrait le mieux à votre projet ?",
         "SECTION_TITLE_CREATE_PROJECT": "Créer un projet",
         "CREATE_PROJECT_TEXT": "Tout beau, tout nouveau !",
-        "PROGRESS_TEMPLATE_SELECTION": "Choix du modèle",
-        "PROGRESS_NAME_DESCRIPTION": "Nom et description"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index 7f530ec7..67887a44 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Sei stremato? Assicurati che gli altri lo sappiano cliccando su 'aspirina' quando stai lavorando su un compito che ti affatica. Ma non demordere, ricordati: si può migliorare solo se di tanto in tanto si accettano sfide extra!",
         "CLIENT_REQUIREMENT": "Requisito del Cliente è un nuovo requisito che non era stato previsto ed ora è stato richiesto come requisito del progetto",
         "TEAM_REQUIREMENT": "Requisito del Team è un requisito che deve esistere nel progetto ma non deve avere costi per il cliente",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Questo valore non è valido.",
@@ -407,7 +408,9 @@
             "TITLE": "Gestisci membri",
             "PAGE_TITLE": "Webhooks - {{projectName}}",
             "ADD_BUTTON": "Nuovo Membro",
-            "ADD_BUTTON_TITLE": "Aggiungi un nuovo membro"
+            "ADD_BUTTON_TITLE": "Aggiungi un nuovo membro",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Esporta",
@@ -429,6 +432,10 @@
             "DISABLE": "Disabilita",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Amministra le storie degli utenti per mantenere una visione organizzata dei lavori in arrivo e di quelli ad alta priorità ",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organizza in modo semplice il tuo progetto con questa board",
             "ISSUES": "problemi",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Aggiungi, modifica o elimina i contenuti in collaborazione con gli altri. E' il posto giusto per la documentazione del tuo progetto",
             "MEETUP": "Incontro",
-            "MEETUP_DESCRIPTION": "Scegli il tuo sistema di videoconferenza. Anche gli sviluppatori hanno bisogno di qualche contatto faccia a faccia. ",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Seleziona un sistema di videoconferenza",
-            "SALT_CHAT_ROOM": "Se preferisci puoi aggiungere un valore sale al nome della chat room",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Dettagli progetto",
             "PROJECT_NAME": "Nome progetto",
             "PROJECT_SLUG": "Progetto lumaca",
-            "NUMBER_SPRINTS": "Numero di sprint (0 come quantità indeterminata)",
-            "NUMBER_US_POINTS": "Numero di punti delle storie utente (0 come quantità indeterminata)",
             "TAGS": "Tag",
             "DESCRIPTION": "Descrizione",
             "RECRUITING": "Il progetto cerca persone?",
@@ -463,7 +468,11 @@
             "DELETE": "Elimina questo progetto",
             "LOGO_HELP": "L'immagine sarà scalata a 80x80px.",
             "CHANGE_LOGO": "Cambia Logo",
-            "ACTION_USE_DEFAULT_LOGO": "Usa l'immagine di default"
+            "ACTION_USE_DEFAULT_LOGO": "Usa l'immagine di default",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Rapporti",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{un follower} other{# followers}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{un osservatore} other{# osservatori}} ",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{un membro} other{# membri}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "progetto<br/> punti",
             "DEFINED": "Definiti <br/> punti",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Cambia password",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Scopri i progetti più seguiti",
+            "NEW_ITEM": "New",
             "DISCOVER": "Scopri",
             "ACTION_REORDER": "Usa drag & drop per riordinare"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Scusaci, i nostri Oompa Loompa sono di nuovo occupati. Riprova di nuovo in qualche minuto.",
             "ERROR_MESSAGE": "I nostri Oompa Loompa hanno qualche problema ad importare il dump dei tuoi dati: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) è troppo pesante per i nostri Oompa Loompa; falli contenti, prova con una dimensione minore di ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Il tuo progetto è stato importato con successo"
+            "SYNC_SUCCESS": "Il tuo progetto è stato importato con successo",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Mi piace",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Elimina Account Taiga",
             "CONFIRM": "Sei sicuro di voler eliminare il tuo account Taiga?",
             "SUBTITLE": "Ci mancherai! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Non voglio più ricevere le vostre newsletter"
+            "NEWSLETTER_LABEL_TEXT": "Non voglio più ricevere le vostre newsletter",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Elimina progetto",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Scegli il tema",
-        "CHOOSE_TEMPLATE_TEXT": "Quale template si adatta meglio al tuo progetto?",
         "SECTION_TITLE_CREATE_PROJECT": "Crea Progetto",
         "CREATE_PROJECT_TEXT": "Nuovo di zecca. Vai così!",
-        "PROGRESS_TEMPLATE_SELECTION": "Selezione del template",
-        "PROGRESS_NAME_DESCRIPTION": "Nome e descrizione"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index f209e87b..69ae1a0b 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Voel je je wat overweldigd door een taak? Zorg ervoor dat anderen dit weten door op Iocaine te klikken bij het wijzigen van een taak. Je kan stapsgewijs immuun worden tegen dit (fictioneel) dodelijk gif door kleine dosissen op te nemen. Net zoals je beter kan worden in wat je doet door af en toe een extra uitdaging aan te gaan!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Deze waarde lijkt ongeldig te zijn",
@@ -407,7 +408,9 @@
             "TITLE": "Gebruikers beheren",
             "PAGE_TITLE": "Lidmaatschappen - {{projectName}}",
             "ADD_BUTTON": "+ Nieuwe gebruiker",
-            "ADD_BUTTON_TITLE": "Nieuwe gebruiker toevoegen"
+            "ADD_BUTTON_TITLE": "Nieuwe gebruiker toevoegen",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
@@ -429,6 +432,10 @@
             "DISABLE": "Uitschakelen",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Organiseer je user stories om een duidelijk overzicht van aankomend en geprioritiseerd werk te behouden.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organiseer je project volgens het lean principe met dit bord.",
             "ISSUES": "Issues",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki\n",
             "WIKI_DESCRIPTION": "Voeg toe, wijzig of verwijder inhoud in samenwerking met anderen. Dit is the juiste plaats voor je project documentatie.",
             "MEETUP": "Meet Up",
-            "MEETUP_DESCRIPTION": "Kies je videoconference systeem. Zelfs programmeurs hebben face-to-face contact nodig.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Kies een videoconference systeem",
-            "SALT_CHAT_ROOM": "Als je wil kan je een salt code aan de naam van de chatroom toevoegen",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Project details",
             "PROJECT_NAME": "Naam project",
             "PROJECT_SLUG": "Project Slug",
-            "NUMBER_SPRINTS": "Aantal sprinten (0 voor een onbepaalde hoeveelheid)",
-            "NUMBER_US_POINTS": "Aantal US punten (0 voor een onbepaalde hoeveelheid)",
             "TAGS": "Tags",
             "DESCRIPTION": "Beschrijving",
             "RECRUITING": "Is this project looking for people?",
@@ -463,7 +468,11 @@
             "DELETE": "Verwijder dit project",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Rapporten",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "project<br/> punten",
             "DEFINED": "gedefinieerde<br/> punten",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Wachtwoord wijzigen",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Ontdek trending projecten",
+            "NEW_ITEM": "New",
             "DISCOVER": "Ontdek",
             "ACTION_REORDER": "Sleep om de volgorde te veranderen"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Sorry, onze Oempa-Loempa's zijn op het moment erg druk. Probeer het nog eens over een paar minuten.",
             "ERROR_MESSAGE": "Onze Oempa-Loempa's hebben wat problemen met het importeren van je dump: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is te zwaar voor onze Oempa-Loempa's, probeer het met een bestand kleiner dan ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Je project werd met succes geïmporteerd"
+            "SYNC_SUCCESS": "Je project werd met succes geïmporteerd",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Vind ik leuk",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Taiga account verwijderen",
             "CONFIRM": "Weet je zeker dat je je Taiga account wilt verwijderen?",
             "SUBTITLE": "We gaan je missen! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Ik wil de nieuwsbrief niet meer ontvangen"
+            "NEWSLETTER_LABEL_TEXT": "Ik wil de nieuwsbrief niet meer ontvangen",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Verwijder project",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Kies een template",
-        "CHOOSE_TEMPLATE_TEXT": "Welk template zou beter bij je project passen?",
         "SECTION_TITLE_CREATE_PROJECT": "Project aanmaken",
         "CREATE_PROJECT_TEXT": "Vers en proper. Spanned!",
-        "PROGRESS_TEMPLATE_SELECTION": "Template selectie",
-        "PROGRESS_NAME_DESCRIPTION": "Naam en beschrijving"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index 0fc91a6e..fa4d8960 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Czujesz się trochę przytłoczony zadaniem? Daj znać innym klikając na ikonę Iokainy podczas edycji zadania. Jest szansa, że staniesz się odporny na tą (fikcyjną ;) ) śmiertelną truciznę biorąc małe dawki. Z pewnością jednak da Ci ona dodatkowego kopa, który pomoże w pokonaniu nowego wyzwania i staniu się lepszym w tym co robisz!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Nieprawidłowa wartość",
@@ -407,7 +408,9 @@
             "TITLE": "Zarządzaj członkami",
             "PAGE_TITLE": "Członkostwa - {{projectName}}",
             "ADD_BUTTON": "+ Nowy członek",
-            "ADD_BUTTON_TITLE": "Dodaj nowego członka"
+            "ADD_BUTTON_TITLE": "Dodaj nowego członka",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Eksport",
@@ -429,6 +432,10 @@
             "DISABLE": "Wyłącz",
             "BACKLOG": "Dziennik",
             "BACKLOG_DESCRIPTION": "Zarządzaj swoimi historyjkami użytkownika aby utrzymać zorganizowany widok i priorytety zadań",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organizuj swój projekt przy użyciu metody lean.",
             "ISSUES": "Zgłoszenia",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Dodawaj, modyfikuj lub usuwaj dane we współpracy z innymi. To jest właściwe miejsce dla Twojej dokumentacji projektowej.",
             "MEETUP": "Spotkaj się",
-            "MEETUP_DESCRIPTION": "Wybierz system wideokonferencji. Nawet programiści potrzebują kontaktu twarzą w twarz.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Wybierz system do wideokonferencji.",
-            "SALT_CHAT_ROOM": "Jeśli chcesz możesz dodać salt code do nazwy pokoju chatu.",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Szczegóły projektu",
             "PROJECT_NAME": "Nazwa projektu",
             "PROJECT_SLUG": "Szczegóły projektu",
-            "NUMBER_SPRINTS": "Number of sprints (0 for an undetermined quantity)",
-            "NUMBER_US_POINTS": "Number of US points (0 for an undetermined quantity)",
             "TAGS": "Tagi",
             "DESCRIPTION": "Opis",
             "RECRUITING": "Is this project looking for people?",
@@ -463,7 +468,11 @@
             "DELETE": "Usuń ten projekt",
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Raporty",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{one fan} other{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{one watcher} other{# watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "projekt<br/> punkty",
             "DEFINED": "zdefiniowane<br/> punkty",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Zmień hasło",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Odkryj projekty",
+            "NEW_ITEM": "New",
             "DISCOVER": "Odkryj",
             "ACTION_REORDER": "Przeciągnij i upuść żeby zmienić kolejność"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Umpa Lumpy są teraz zajęte a serwer ma zadyszkę. Spróbuj ponownie za chwilę.",
             "ERROR_MESSAGE": "Przy imporcie wystąpił następujący problem: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) plik jest za ciężki, maksymalna wartość to: ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Twój projekt zaimportował się prawidłowo!"
+            "SYNC_SUCCESS": "Twój projekt zaimportował się prawidłowo!",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Like",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Usuń konto z Taiga",
             "CONFIRM": "Czy na pewno chcesz usunąć swoje konto z Taiga?",
             "SUBTITLE": "Będziemy tęsknić! :(",
-            "NEWSLETTER_LABEL_TEXT": "Nie chcę więcej otrzymywać waszego newslettera"
+            "NEWSLETTER_LABEL_TEXT": "Nie chcę więcej otrzymywać waszego newslettera",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Usuń projekt",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Wybierz szablon",
-        "CHOOSE_TEMPLATE_TEXT": "Który szablon lepiej pasuje do Twojego projektu?",
         "SECTION_TITLE_CREATE_PROJECT": "Utwórz projekt",
         "CREATE_PROJECT_TEXT": "Nowy, zwinny! To takie ekscytujące!",
-        "PROGRESS_TEMPLATE_SELECTION": "Wybór szablonu",
-        "PROGRESS_NAME_DESCRIPTION": "Nazwa i opis"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index 3497819c..15bc02b3 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Se sentindo sobrecarregado por uma tarefa? Assegure-se de que os outros saibam disso clicando em Iocaine quando estiver editando a tarefa. É possível se tornar imune a essse veneno mortal (fictício) consumindo pequenas quantidades ao longo do tempo, assim como é possível ficar melhor no que faz, ocasionalmente, por assumir desafios extras!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece ser inválido.",
@@ -67,7 +68,7 @@
             "RANGE_CHECK": "Você deve selecionar entre %s e %s escolhas.",
             "EQUAL_TO": "Esse valor deveria ser o mesmo.",
             "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "PIKADAY": "Formato de data inválido, use DD MMM YYY (Ex.: 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -407,7 +408,9 @@
             "TITLE": "Gerenciar Membros",
             "PAGE_TITLE": "Filiados - {{projectName}}",
             "ADD_BUTTON": "+ Novo Membro",
-            "ADD_BUTTON_TITLE": "Adicionar novo membro"
+            "ADD_BUTTON_TITLE": "Adicionar novo membro",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -429,6 +432,10 @@
             "DISABLE": "Desabilitar",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gerencie suas user stories para manter uma visualização organizada de trabalhos futuros e priorizados.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organize seu projeto de um jeito \"lean\" com esse mural",
             "ISSUES": "Problemas",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Adicione, modifique ou apague conteúdo em colaboração com outras pessoas. Este é o local certo pra documentação do seu projeto.",
             "MEETUP": "Reunião",
-            "MEETUP_DESCRIPTION": "Escolha seu sistema de vídeo conferência. Até desenvolvedores precisam de contato cara a cara.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Selecione um sistema de video conferência",
-            "SALT_CHAT_ROOM": "Se você quiser, pode acrescentar um 'salt code' para o nome da sala de bate-papo",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Detalhes do projeto",
             "PROJECT_NAME": "Nome do projeto",
             "PROJECT_SLUG": "Slug do projeto",
-            "NUMBER_SPRINTS": "Número de sprints (0 para uma quantidade indeterminada)",
-            "NUMBER_US_POINTS": "Número de pontos US (0 para uma quantidade indeterminada)",
             "TAGS": "Tags",
             "DESCRIPTION": "Descrição",
             "RECRUITING": "Este projeto esta a procura de colaboradores?",
@@ -463,7 +468,11 @@
             "DELETE": "Apagar este projeto",
             "LOGO_HELP": "A imagem deve ser na escala de 80x80px.",
             "CHANGE_LOGO": "Alterar logo",
-            "ACTION_USE_DEFAULT_LOGO": "Usar imagem padrão"
+            "ACTION_USE_DEFAULT_LOGO": "Usar imagem padrão",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Relatórios",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, um{um fã} outro{# fãs}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, um{um observador} outro{#watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, um{one member} outro{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "projetos<br/> pontos",
             "DEFINED": "pontos<br/> definidos",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Alterar senha",
             "DASHBOARD_TITLE": "Painel",
             "DISCOVER_TITLE": "Descobrir projetos em destaques",
+            "NEW_ITEM": "New",
             "DISCOVER": "Descubra",
             "ACTION_REORDER": "Seguro e arraste para ordenar"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Desculpe, nossos Oompa Loompas estão muito ocupados neste instante. Tente novamente em alguns minutos.",
             "ERROR_MESSAGE": "Nossos Oompa Loompas tiveram alguns problemas ao importar seu arquivo de despejo: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) é muito pesado para nossos Oompa Loompas, tente algo menor que ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Seu projeto foi importado com sucesso"
+            "SYNC_SUCCESS": "Seu projeto foi importado com sucesso",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Curtir",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Apagar conta no Taiga",
             "CONFIRM": "Você tem certeza que quer apagar sua conta Taiga?",
             "SUBTITLE": "Nós vamos sentir sua falta! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Eu não quero receber mais os informativos"
+            "NEWSLETTER_LABEL_TEXT": "Eu não quero receber mais os informativos",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Apagar projeto",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Escolher um template",
-        "CHOOSE_TEMPLATE_TEXT": "Qual template se encaixa melhor no seu projeto?",
         "SECTION_TITLE_CREATE_PROJECT": "Criar Projeto",
         "CREATE_PROJECT_TEXT": "Novo em folha. Tão excitante!",
-        "PROGRESS_TEMPLATE_SELECTION": "Seleção de tipo de projeto",
-        "PROGRESS_NAME_DESCRIPTION": "Nome e descrição"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
@@ -1335,7 +1384,7 @@
         "HINT1_TITLE": "Você sabia que você pode importar e exportar projetos?",
         "HINT1_TEXT": "Isso permite você extrair todo o seu conteúdo de um Taiga e mover para outro.",
         "HINT2_TITLE": "Você sabia que pode criar campos personalizados?",
-        "HINT2_TEXT": "Teams can now create custom fields as a flexible means to enter specific data useful for their particular workflow.",
+        "HINT2_TEXT": "Equipes agora podem personalizar campos, um jeito flexível de inserir dados específicos para uso em seu próprio fluxo de trabalho.",
         "HINT3_TITLE": "Reorder your projects to feature those most relevant to you.",
         "HINT3_TEXT": "The 10 projects are listed in the direct access bar at the top.",
         "HINT4_TITLE": "Você esqueceu onde está trabalhando?",
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index b3c74d25..9f23aebf 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Чувствуете, что задание берет верх над вами? Дайте другим знать об этом, нажав на \"Иокаин\", когда редактируете задание. Возможно стать неуязвимым к этому (выдуманному) смертельном яду, потребляя небольшие количества время от времени, так же как возможно стать лучше в том, что вы делаете, временами беря на себя дополнительные препятствия!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Кажется, это значение некорректно.",
@@ -407,7 +408,9 @@
             "TITLE": "Управление участниками",
             "PAGE_TITLE": "Участие - {{projectName}}",
             "ADD_BUTTON": "+ Новый участник",
-            "ADD_BUTTON_TITLE": "Добавить нового участника"
+            "ADD_BUTTON_TITLE": "Добавить нового участника",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Экспорт",
@@ -429,6 +432,10 @@
             "DISABLE": "Выключить",
             "BACKLOG": "Список задач",
             "BACKLOG_DESCRIPTION": "Управляйте пользовательскими историями, чтобы поддерживать организованное видение важных и приоритетных задач.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Организуйте эффективную работу с проектом с помощью этой панели",
             "ISSUES": "Запросы",
@@ -436,9 +443,9 @@
             "WIKI": "Вики",
             "WIKI_DESCRIPTION": "Добавляйте, изменяйте или удаляйте контент совместно с остальными. Это самое правильное место для документации вашего проекта.",
             "MEETUP": "Созвониться",
-            "MEETUP_DESCRIPTION": "Выберите вашу систему для видеоконференций. Даже разработчикам нужны митинги \"лицом к лицу\"",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Выберите систему видеоконференций",
-            "SALT_CHAT_ROOM": "Если хотите, можете добавить \"соль\" к имени чат-комнаты",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Детали проекта",
             "PROJECT_NAME": "Название проекта",
             "PROJECT_SLUG": "Ссылочное имя проекта",
-            "NUMBER_SPRINTS": "Количество спринтов (0 - неопределенное количество)",
-            "NUMBER_US_POINTS": "Количество очков ПИ (0 - неопределенное количество)",
             "TAGS": "Тэги",
             "DESCRIPTION": "Описание",
             "RECRUITING": "Этот проект ищет людей?",
@@ -463,7 +468,11 @@
             "DELETE": "Удалить проект",
             "LOGO_HELP": "Изображение будет отмасштабировано до 80x80px.",
             "CHANGE_LOGO": "Change logo",
-            "ACTION_USE_DEFAULT_LOGO": "Использовать картинку по умолчанию"
+            "ACTION_USE_DEFAULT_LOGO": "Использовать картинку по умолчанию",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Отчеты",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{один фанат} other{# фаната (-ов)}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{один наблюдатель} other{# наблюдателя (-ей)}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "проекта<br/> очки",
             "DEFINED": "заданные<br/> очки",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Изменить пароль",
             "DASHBOARD_TITLE": "Рабочий стол",
             "DISCOVER_TITLE": "Найти проекты в тренде",
+            "NEW_ITEM": "New",
             "DISCOVER": "Найти",
             "ACTION_REORDER": "Можно перетаскивать мышкой"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Извините, Oompa Loompas очень загружен сейчас. Повторите через несколько минут.",
             "ERROR_MESSAGE": "У Oompa Loompas возникли проблемы при импорте резервной копии: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) это слишком много для наших Умпа-Лумп, попробуйте еще раз с размером меньшим, чем ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Импорт проекта выполнен успешно"
+            "SYNC_SUCCESS": "Импорт проекта выполнен успешно",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Мне нравится",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Удалить аккаунт",
             "CONFIRM": "Вы уверены, что хотите удалить ваш аккаунт?",
             "SUBTITLE": "Мы будем скучать по вам! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Я больше не хочу получать вашу новостную рассылку"
+            "NEWSLETTER_LABEL_TEXT": "Я больше не хочу получать вашу новостную рассылку",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Удалить проект",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Выберете шаблон",
-        "CHOOSE_TEMPLATE_TEXT": "Какой шаблон лучше всего подойдет для Вашего проекта?",
         "SECTION_TITLE_CREATE_PROJECT": "Создать проект",
         "CREATE_PROJECT_TEXT": "Свежий и чистый! Так здóрово!",
-        "PROGRESS_TEMPLATE_SELECTION": "Выбор шаблона",
-        "PROGRESS_NAME_DESCRIPTION": "Название и описание"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Вики - {{projectName}}",
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index 1174a848..f20e5557 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Känner du dig lite bortkommen med en uppgift? Försäkra dig om att andra känner till uppgiften när du klickar på Iocaine-knappen när du ändrar uppgiften. Det är möjligt att bli immun till det här (påhittade) dödliga giftet om du tar små mängder över tid - och du kan även så småningom om bli bättre på vad du gör när du då och då tar på dig större utmaningar!",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Det här värdet är felaktigt. ",
@@ -407,7 +408,9 @@
             "TITLE": "Hantera medlemmar",
             "PAGE_TITLE": "Medlemskap - {{projectName}}",
             "ADD_BUTTON": "+ Ny medlem",
-            "ADD_BUTTON_TITLE": "Lägg till ny medlem"
+            "ADD_BUTTON_TITLE": "Lägg till ny medlem",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportera",
@@ -429,6 +432,10 @@
             "DISABLE": "Avvaktivera",
             "BACKLOG": "Inkorg",
             "BACKLOG_DESCRIPTION": "Hantera dina användarhistorier för att organisera visningar av kommande och prioriterade jobb. ",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisera dina projekt med Lean med den här tavlan.  ",
             "ISSUES": "Frågor",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Lägg till, modifiera eller ta bort innehåll i samarbetet med andra. Det här är rätt plats för ditt projektdokumentation. ",
             "MEETUP": "Möt upp",
-            "MEETUP_DESCRIPTION": "Välj ditt videokonferenssystem. Även utvecklare behöver mötas ansikte mot ansikte.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Välj videokonferenssystem",
-            "SALT_CHAT_ROOM": "Om du önskar det kan du lägga till några tillfälliga tecken till chat-rummets namn. ",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "Dyker upp i ",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Projektdetaljer",
             "PROJECT_NAME": "Projektnamn",
             "PROJECT_SLUG": "Projektslugg",
-            "NUMBER_SPRINTS": "Antal sprintar (0 för en obestämd kvantitet)",
-            "NUMBER_US_POINTS": "Antal US-poäng (0 för ett obestämd antal)",
             "TAGS": "Etiketter",
             "DESCRIPTION": "Beskrivning",
             "RECRUITING": "Is this project looking for people?",
@@ -463,7 +468,11 @@
             "DELETE": "Ta bort projekt",
             "LOGO_HELP": "Bilden kommer skalas till 80x80px.",
             "CHANGE_LOGO": "Ändra logga",
-            "ACTION_USE_DEFAULT_LOGO": "Use default image"
+            "ACTION_USE_DEFAULT_LOGO": "Use default image",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Rapporter",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{one fan} andra{# fans}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, en{one watcher} andra{# watchers}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "projekt<br/> poäng",
             "DEFINED": "definierad<br/> poäng",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Byt lösenord",
             "DASHBOARD_TITLE": "Instrumentpanel",
             "DISCOVER_TITLE": "Upptäck nya rörliga projekt",
+            "NEW_ITEM": "New",
             "DISCOVER": "Upptäck",
             "ACTION_REORDER": "Dra & släpp för att sortera"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Beklagar. Våra oompa loompier är mycket upptagna. Vänligen försök på nytt om några minuter. ",
             "ERROR_MESSAGE": "Våra Oompa Loompier har lite problem med att importera dina hämtningsdata: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) är för tungt för våra Oompa Loompier. Försök med något mindre än ({{maxFileSize}})",
-            "SYNC_SUCCESS": "Ditt projekt är korrekt importerad"
+            "SYNC_SUCCESS": "Ditt projekt är korrekt importerad",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Gillar",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Ta bort konto",
             "CONFIRM": "Är du säker på att du vill radera kontot?",
             "SUBTITLE": "Vi kommer att sakna dig!",
-            "NEWSLETTER_LABEL_TEXT": "Jag vill inte motta flera nyhetsbrev"
+            "NEWSLETTER_LABEL_TEXT": "Jag vill inte motta flera nyhetsbrev",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Ta bort projekt",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Välj en mall",
-        "CHOOSE_TEMPLATE_TEXT": "Vilken mall skulle passa bättre i det här projektet? ",
         "SECTION_TITLE_CREATE_PROJECT": "Skapa projekt",
         "CREATE_PROJECT_TEXT": "Fräscht och rent. Så trevligt!",
-        "PROGRESS_TEMPLATE_SELECTION": "Urval mallar",
-        "PROGRESS_NAME_DESCRIPTION": "Namn och beskrivning"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index c5a03a7a..a56d4c14 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "Bir görev size ağır geldi ve bunaldınız mı? Diğerlerinin bu durumdan haberi olması için bir görevi düzenlerken baldıran zehrinin üzerine tıklayın.  Nasıl ki zaman zaman ekstra meydan okumalarla bir işte gittikce iyi olmanız mümkünse, zaman içerisinde küçük dozlar alarak bu ölümcül zehre de bağışıklık kazanabilmek mümkün!",
         "CLIENT_REQUIREMENT": "Müşteri gereksinimi, daha önceden belli olmayan ama projeye dahil olması gereken bir gereksinimdir",
         "TEAM_REQUIREMENT": "Takım gereksinimi, müsteriyi ilgilendirmeyen, ama projede yer alması zorunlu olan bir gereksinimdir.",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Bu değer geçersiz gözüküyor",
@@ -407,7 +408,9 @@
             "TITLE": "Üyeleri yönet",
             "PAGE_TITLE": "Üyelikler - {{projectName}}",
             "ADD_BUTTON": "+ Yeni üye",
-            "ADD_BUTTON_TITLE": "Yeni üye ekle"
+            "ADD_BUTTON_TITLE": "Yeni üye ekle",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "Dışarı aktar",
@@ -429,6 +432,10 @@
             "DISABLE": "Pasifleştir",
             "BACKLOG": "Havuz",
             "BACKLOG_DESCRIPTION": "Yeni gelen ve önceliklendirilmiş işler için düzenli bir görünüm elde etmek için kullanıcı hikayelerinizi yönetin.",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Bu pano ile projenizi güzel bir şekilde düzenleyin.",
             "ISSUES": "Sorunlar",
@@ -436,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Diğerleriyle işbirliği yaparak içerik ekleyin, düzenleyin ve silin. Burası projenizin dokümantasyonu için doğru yer.",
             "MEETUP": "Toplantı",
-            "MEETUP_DESCRIPTION": "Video konferans sisteminizi seçin. Yazılımcılar bile yüz yüze görüşmeye ihtiyaç duyarlar.",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Bir video konferans sistemi seç",
-            "SALT_CHAT_ROOM": "Eğer isterseniz sohbet odası adına salt kod ekleyebilirsiniz",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "Proje detayları",
             "PROJECT_NAME": "Proje adı",
             "PROJECT_SLUG": "Proje satırı",
-            "NUMBER_SPRINTS": "Koşu sayısı (belirsiz bir miktar için 0)",
-            "NUMBER_US_POINTS": "KH puanları sayısı (belirlenmemiş miktarlar için 0)",
             "TAGS": "Etiketler",
             "DESCRIPTION": "Tanım",
             "RECRUITING": "Bu proje insan arıyor mu?",
@@ -463,7 +468,11 @@
             "DELETE": "Bu projeyi sil",
             "LOGO_HELP": "Resim 80×80 piksel boyutuna ölçeklenecek. ",
             "CHANGE_LOGO": "Logoyu değiştir",
-            "ACTION_USE_DEFAULT_LOGO": "Varsayılan resmi kullan"
+            "ACTION_USE_DEFAULT_LOGO": "Varsayılan resmi kullan",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Raporlar",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{bir meraklı} other{# meraklı}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{bir takipçi} other{# takipçi}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{bir üye} other{# üye}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "proje<br/> puanlar",
             "DEFINED": "tanımlı<br/> puanlar",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "Parolayı değiştir",
             "DASHBOARD_TITLE": "Pano",
             "DISCOVER_TITLE": "Trend projeleri keşfet",
+            "NEW_ITEM": "New",
             "DISCOVER": "Keşfet",
             "ACTION_REORDER": "Yeniden sıralamak için sürükleyin ve bırakın"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "Üzgünüm, bizim honki ponkiler şu anda çok meşgul. Lütfen birkaç dakika içinde yeniden deneyin.",
             "ERROR_MESSAGE": "Honki ponkilerimiz döküm dosyanızı içeri aktarırken birkaç problem yaşadı: {{error_message}}",
             "ERROR_MAX_SIZE_EXCEEDED": "({{fileSize}}) boyutundaki '{{fileName}}' dosya honki ponkilerimiz için oldukça ağır geldi, ({{maxFileSize}}) boyutundan daha küçük bir şeylerle deneyin",
-            "SYNC_SUCCESS": "Projeniz başarıyla içe aktarıldı"
+            "SYNC_SUCCESS": "Projeniz başarıyla içe aktarıldı",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "Beğen",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "Taiga Hesabını Sil",
             "CONFIRM": "Taiga hesabınızı silmek istediğinizden emin misiniz?",
             "SUBTITLE": "Sizi özleyeceğiz! :-(",
-            "NEWSLETTER_LABEL_TEXT": "Bundan böyle bülteninizi almak istemiyorum."
+            "NEWSLETTER_LABEL_TEXT": "Bundan böyle bülteninizi almak istemiyorum.",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "Proje Sil",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "Bir şablon seç",
-        "CHOOSE_TEMPLATE_TEXT": "Hangi şablon sizin projeniz için daha uygun?",
         "SECTION_TITLE_CREATE_PROJECT": "Proje Oluştur",
         "CREATE_PROJECT_TEXT": "Taze ve temiz. Heycan verici!",
-        "PROGRESS_TEMPLATE_SELECTION": "Şablon seçimi",
-        "PROGRESS_NAME_DESCRIPTION": "İsim ve tanım"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index 76956fc1..e0fa2f59 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -41,6 +41,7 @@
         "IOCAINE_TEXT": "感到任務的不堪負荷？確認其它人在編輯任務時知道此狀況，可以點選Iocaine。它可能會成為免疫的致命狀況，只要長期小量消耗，但如果你只是偶而挑戰它可有助表現。",
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
+        "OWNER": "Project Owner",
         "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "該數值似乎為無效",
@@ -407,7 +408,9 @@
             "TITLE": "管理成員",
             "PAGE_TITLE": "成員資格 - {{projectName}}",
             "ADD_BUTTON": "+ 新成員",
-            "ADD_BUTTON_TITLE": "增加新成員"
+            "ADD_BUTTON_TITLE": "增加新成員",
+            "LIMIT_USERS_WARNING": "Why can't I add more members",
+            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
         },
         "PROJECT_EXPORT": {
             "TITLE": "匯出",
@@ -429,6 +432,10 @@
             "DISABLE": "停用",
             "BACKLOG": "待辦任務優先表",
             "BACKLOG_DESCRIPTION": "管理你的 User Story 讓接下來的及優先的工作能被有條理地檢視 ",
+            "NUMBER_SPRINTS": "Expected number of sprints",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS": "Expected total of story points",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
             "KANBAN": "Kanban(看板)",
             "KANBAN_DESCRIPTION": "在此看板上組織你的專案",
             "ISSUES": "問題 ",
@@ -436,9 +443,9 @@
             "WIKI": "維基",
             "WIKI_DESCRIPTION": "新增,修正或是刪除與他人合作的內容。這裏正是專案文件記錄區",
             "MEETUP": "符合",
-            "MEETUP_DESCRIPTION": "選擇你的視訊系統。有些開發者需要面對面接觸",
+            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "選擇一個視訊會議系統　",
-            "SALT_CHAT_ROOM": "你可以把聊天室名稱加上salt code亂數密碼　",
+            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -450,8 +457,6 @@
             "PROJECT_DETAILS": "專案細節",
             "PROJECT_NAME": "專案名稱",
             "PROJECT_SLUG": "專案代稱",
-            "NUMBER_SPRINTS": "衝刺任務數目(0為未決定數量)",
-            "NUMBER_US_POINTS": "使用者故事點數數目 (0 為未決定數目)",
             "TAGS": "標籤",
             "DESCRIPTION": "描述",
             "RECRUITING": "這個專案是否在徵人",
@@ -463,7 +468,11 @@
             "DELETE": "刪除此專案",
             "LOGO_HELP": "此圖片將被裁成80x80px.<br>",
             "CHANGE_LOGO": "更改圖標",
-            "ACTION_USE_DEFAULT_LOGO": "使用設預圖片"
+            "ACTION_USE_DEFAULT_LOGO": "使用設預圖片",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
+            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -731,6 +740,11 @@
         "FANS_COUNTER_TITLE": "{total, plural, one{一個粉絲} other{# 粉絲}}",
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{一個觀注者} other{# 觀注者}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{one member} other{# members}}",
+        "BLOCKED_PROJECT": {
+            "BLOCKED": "Blocked project",
+            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+        },
         "STATS": {
             "PROJECT": "專案<br/> 點數",
             "DEFINED": "已定義<br/> 點數",
@@ -777,6 +791,7 @@
             "CHANGE_PASSWORD": "更換密碼 ",
             "DASHBOARD_TITLE": "控制台",
             "DISCOVER_TITLE": "發現流行專案",
+            "NEW_ITEM": "New",
             "DISCOVER": "發現",
             "ACTION_REORDER": "拖移 & 丟到來記錄"
         },
@@ -791,7 +806,32 @@
             "ERROR_TOO_MANY_REQUEST": "抱歉系統繁忙中，請稍後再試試　",
             "ERROR_MESSAGE": "我們的系統無法滙入你的資料",
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) 超過系統容量上限, 請重傳小一點的檔案 ({{maxFileSize}})",
-            "SYNC_SUCCESS": "你的專案已成功滙入"
+            "SYNC_SUCCESS": "你的專案已成功滙入",
+            "PROJECT_RESTRICTIONS": {
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PRIVATE_PROJECTS_SPACE": {
+                    "TITLE": "You don't have space for another private project",
+                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                },
+                "PUBLIC_PROJECTS_SPACE": {
+                    "TITLE": "You don't' have space for another public project",
+                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                },
+                "PRIVATE_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                },
+                "PUBLIC_PROJECTS_MEMBERS": {
+                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                },
+                "PRIVATE_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "DESC": "The project that you want to import is private and has {{members}} users."
+                },
+                "PUBLIC_PROJECTS_SPACE_MEMBERS": {
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                }
+            }
         },
         "LIKE_BUTTON": {
             "LIKE": "喜歡",
@@ -820,7 +860,10 @@
             "SECTION_NAME": "刪除Taiga帳戶",
             "CONFIRM": "你確定要刪除Taiga帳戶嗎？",
             "SUBTITLE": "我們會想念你:-(",
-            "NEWSLETTER_LABEL_TEXT": "不願再收到電子月報"
+            "NEWSLETTER_LABEL_TEXT": "不願再收到電子月報",
+            "CANCEL": "Back to settings",
+            "ACCEPT": "Delete account",
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
             "TITLE": "刪除專案",
@@ -1304,12 +1347,18 @@
         }
     },
     "WIZARD": {
-        "SECTION_TITLE_CHOOSE_TEMPLATE": "選擇外觀 ",
-        "CHOOSE_TEMPLATE_TEXT": "哪一個樣版最適合你的專案",
         "SECTION_TITLE_CREATE_PROJECT": "創建專案",
         "CREATE_PROJECT_TEXT": "新鮮與乾淨，太好了",
-        "PROGRESS_TEMPLATE_SELECTION": "外觀選擇",
-        "PROGRESS_NAME_DESCRIPTION": "名稱與描述"
+        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
+        "CHOOSE_TEMPLATE_INFO": "More info",
+        "PROJECT_DETAILS": "Project Details",
+        "PUBLIC_PROJECT": "Public Project",
+        "PRIVATE_PROJECT": "Private Project",
+        "CREATE_PROJECT": "Create project",
+        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
+        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - 維基 - {{projectName}}",

From 2f6cfa0d2a47910ea66d28c71bccbc700fd98d86 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 14 Mar 2016 08:15:33 +0100
Subject: [PATCH 092/155] add drop attachemnts in wiki

---
 app/partials/wiki/wiki.jade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/partials/wiki/wiki.jade b/app/partials/wiki/wiki.jade
index 40523910..1b30f29f 100644
--- a/app/partials/wiki/wiki.jade
+++ b/app/partials/wiki/wiki.jade
@@ -14,7 +14,11 @@ div.wrapper(ng-controller="WikiDetailController as ctrl",
 
         div.summary.wiki-summary(tg-wiki-summary, ng-model="wiki", ng-if="wiki.id")
         h2.wiki-title(ng-bind='wikiTitle')
-        section.wiki-content(tg-editable-wiki-content, ng-model="wiki")
+        section.wiki-content(
+            tg-editable-wysiwyg,
+            tg-editable-wiki-content,
+            ng-model="wiki"
+        )
 
         tg-attachments-full(
             ng-if="wiki.id"

From e7e869235d41734851516324c1bf875b04504d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 14 Mar 2016 08:54:20 +0100
Subject: [PATCH 093/155] Lightbox delete account style fixes

---
 app/locales/taiga/locale-en.json                        | 1 -
 app/partials/user/lightbox/lightbox-delete-account.jade | 2 --
 app/styles/modules/common/lightbox.scss                 | 4 ----
 3 files changed, 7 deletions(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index c9b100e2..1ad37423 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -859,7 +859,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Delete Taiga Account",
             "CONFIRM": "Are you sure you want to delete your Taiga account?",
-            "SUBTITLE": "We're going to miss you! :-(",
             "NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
diff --git a/app/partials/user/lightbox/lightbox-delete-account.jade b/app/partials/user/lightbox/lightbox-delete-account.jade
index b59670cb..087e25b3 100644
--- a/app/partials/user/lightbox/lightbox-delete-account.jade
+++ b/app/partials/user/lightbox/lightbox-delete-account.jade
@@ -3,8 +3,6 @@ a.close(href="", title="{{'close' | translate}}")
         use(xlink:href="#icon-close")
 form
     h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.CONFIRM")
-    p
-        span.subtitle(translate="LIGHTBOX.DELETE_ACCOUNT.SUBTITLE")
 
     p(ng-bind-html="'LIGHTBOX.DELETE_ACCOUNT.BLOCK_PROJECT' | translate")
     div.options
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 265a5236..13a4b314 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -339,10 +339,6 @@
         line-height: 2rem;
         text-align: center;
     }
-    .subtitle {
-        @extend %large;
-        @extend %title;
-    }
     .newsletter {
         margin: 1rem 0;
         text-align: center;

From 8e0a10266c4e6ebb25b2225cdf15e70a819efd9d Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 14 Mar 2016 12:55:33 +0100
Subject: [PATCH 094/155] prevent preview wysiswyg duplication

---
 app/coffee/modules/common/wisiwyg.coffee | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/coffee/modules/common/wisiwyg.coffee b/app/coffee/modules/common/wisiwyg.coffee
index 98871836..e6fe3b0c 100644
--- a/app/coffee/modules/common/wisiwyg.coffee
+++ b/app/coffee/modules/common/wisiwyg.coffee
@@ -73,10 +73,16 @@ MarkitupDirective = ($rootscope, $rs, $selectedText, $template, $compile, $trans
             closePreviewMode()
 
         cancelablePromise = null
+        previewInProgress = false
 
         preview = ->
+            return if previewInProgress
+
+            previewInProgress = true
+
             markdownDomNode = element.parents(".markdown")
             markItUpDomNode = element.parents(".markItUp")
+
             $rs.mdrender.render($scope.projectId, $model.$modelValue).then (data) ->
                 html = previewTemplate({data: data.data})
                 html = $compile(html)($scope)
@@ -84,6 +90,8 @@ MarkitupDirective = ($rootscope, $rs, $selectedText, $template, $compile, $trans
                 markdownDomNode.append(html)
                 markItUpDomNode.hide()
 
+                previewInProgress = false
+
                 markdown = element.closest(".markdown")
 
                 markdown.on "mouseup.preview", ".preview", (event) ->

From cc6c8ae094ce4fd44223ff0db1e29f63bea3f383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 16 Mar 2016 11:40:40 +0100
Subject: [PATCH 095/155] Change max_members_*_projects to
 max_memberships_*_projects

---
 app/coffee/modules/admin/memberships.coffee   |  4 +--
 app/coffee/modules/common/importer.coffee     | 12 +++----
 .../services/current-user.service.coffee      | 16 +++++-----
 .../services/current-user.service.spec.coffee | 32 +++++++++----------
 .../admin/admin-project-restrictions.jade     |  4 +--
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index c55a331c..d91f625c 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -116,10 +116,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         userData = @currentUserService.getUser().toJS()
 
         if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false
-            @.maxMembers = userData.max_members_private_projects
+            @.maxMembers = userData.max_memberships_private_projects
             @scope.canAddUsers = false
         else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
-            @.maxMembers = userData.max_members_public_projects
+            @.maxMembers = userData.max_memberships_public_projects
             @scope.canAddUsers = false
 
     limitUsersWarning: ->
diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index 46b84007..34fd5585 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -38,36 +38,36 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                     privateError = !currentUserService.canCreatePrivateProjects().valid
                     maxMembers = null
 
-                    if user.get('max_members_private_projects') != null && result.headers.members > user.get('max_members_private_projects')
+                    if user.get('max_memberships_private_projects') != null && result.headers.members > user.get('max_memberships_private_projects')
                         membersError = true
                     else
                         membersError = false
 
                     if privateError && membersError
                         errorKey = 'private-space-members'
-                        maxMembers = user.get('max_members_private_projects')
+                        maxMembers = user.get('max_memberships_private_projects')
                     else if privateError
                         errorKey = 'private-space'
                     else if membersError
                         errorKey = 'private-members'
-                        maxMembers = user.get('max_members_private_projects')
+                        maxMembers = user.get('max_memberships_private_projects')
 
                 else
                     publicError = !currentUserService.canCreatePublicProjects().valid
 
-                    if user.get('max_members_public_projects') != null && result.headers.members > user.get('max_members_public_projects')
+                    if user.get('max_memberships_public_projects') != null && result.headers.members > user.get('max_memberships_public_projects')
                         membersError = true
                     else
                         membersError = false
 
                     if publicError && membersError
                         errorKey = 'public-space-members'
-                        maxMembers = user.get('max_members_public_projects')
+                        maxMembers = user.get('max_memberships_public_projects')
                     else if publicError
                         errorKey = 'public-space'
                     else if membersError
                         errorKey = 'public-members'
-                        maxMembers = user.get('max_members_public_projects')
+                        maxMembers = user.get('max_memberships_public_projects')
 
                 return {
                     key: errorKey,
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index cfc5ad4b..eaa86b00 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -122,8 +122,8 @@ class CurrentUserService
         project = @.projects.get('all').find (project) -> project.get('id') == projectId
         user = @.getUser()
 
-        if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects')
-            return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
+        if user.get('max_memberships_private_projects') != null && project.get('members').size >= user.get('max_memberships_private_projects')
+            return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
 
         return {valid: true}
 
@@ -131,8 +131,8 @@ class CurrentUserService
         project = @.projects.get('all').find (project) -> project.get('id') == projectId
         user = @.getUser()
 
-        if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects')
-            return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
+        if user.get('max_memberships_public_projects') != null && project.get('members').size >= user.get('max_memberships_public_projects')
+            return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
 
         return {valid: true}
 
@@ -148,8 +148,8 @@ class CurrentUserService
 
         user = @.getUser()
 
-        if user.get('max_members_private_projects') != null && project.get('members').size > user.get('max_members_private_projects')
-            return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
+        if user.get('max_memberships_private_projects') != null && project.get('members').size > user.get('max_memberships_private_projects')
+            return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
 
         return {valid: true}
 
@@ -164,8 +164,8 @@ class CurrentUserService
 
         user = @.getUser()
 
-        if user.get('max_members_public_projects') != null && project.get('members').size > user.get('max_members_public_projects')
-            return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
+        if user.get('max_memberships_public_projects') != null && project.get('members').size > user.get('max_memberships_public_projects')
+            return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
 
         return {valid: true}
 
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index 9747924b..8e04980a 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -208,7 +208,7 @@ describe "tgCurrentUserService", ->
         user = Immutable.fromJS({
             id: 1,
             name: "fake1",
-            max_members_private_projects: 2
+            max_memberships_private_projects: 2
         })
 
         projects = Immutable.fromJS({
@@ -227,7 +227,7 @@ describe "tgCurrentUserService", ->
 
         expect(result).to.be.eql({
             valid: false,
-            reason: 'max_members_private_projects',
+            reason: 'max_memberships_private_projects',
             type: 'private_project'
         })
 
@@ -235,7 +235,7 @@ describe "tgCurrentUserService", ->
         user = Immutable.fromJS({
             id: 1,
             name: "fake1",
-            max_members_private_projects: 7
+            max_memberships_private_projects: 7
         })
 
         currentUserService._user = user
@@ -261,7 +261,7 @@ describe "tgCurrentUserService", ->
         user = Immutable.fromJS({
             id: 1,
             name: "fake1",
-            max_members_public_projects: 2
+            max_memberships_public_projects: 2
         })
 
         projects = Immutable.fromJS({
@@ -280,7 +280,7 @@ describe "tgCurrentUserService", ->
 
         expect(result).to.be.eql({
             valid: false,
-            reason: 'max_members_public_projects',
+            reason: 'max_memberships_public_projects',
             type: 'public_project'
         })
 
@@ -288,7 +288,7 @@ describe "tgCurrentUserService", ->
         user = Immutable.fromJS({
             id: 1,
             name: "fake1",
-            max_members_public_projects: 7
+            max_memberships_public_projects: 7
         })
 
         projects = Immutable.fromJS({
@@ -334,7 +334,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_private_projects: 10,
             total_private_projects: 1,
-            max_members_private_projects: 20
+            max_memberships_private_projects: 20
         })
 
         currentUserService._user = user
@@ -351,7 +351,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_private_projects: 10,
             total_private_projects: 1,
-            max_members_public_projects: 2
+            max_memberships_public_projects: 2
         })
 
         currentUserService._user = user
@@ -371,7 +371,7 @@ describe "tgCurrentUserService", ->
 
         expect(result).to.be.eql({
             valid: false,
-            reason: 'max_members_public_projects',
+            reason: 'max_memberships_public_projects',
             type: 'public_project'
         })
 
@@ -381,7 +381,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_private_projects: 10,
             total_private_projects: 1,
-            max_members_public_projects: 20
+            max_memberships_public_projects: 20
         })
 
         currentUserService._user = user
@@ -409,7 +409,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_private_projects: 10,
             total_private_projects: 100,
-            max_members_public_projects: 2
+            max_memberships_public_projects: 2
         })
 
         currentUserService._user = user
@@ -455,7 +455,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_public_projects: 10,
             total_public_projects: 1,
-            max_members_public_projects: 20
+            max_memberships_public_projects: 20
         })
 
         currentUserService._user = user
@@ -472,7 +472,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_public_projects: 10,
             total_public_projects: 1,
-            max_members_private_projects: 2
+            max_memberships_private_projects: 2
         })
 
         currentUserService._user = user
@@ -492,7 +492,7 @@ describe "tgCurrentUserService", ->
 
         expect(result).to.be.eql({
             valid: false,
-            reason: 'max_members_private_projects',
+            reason: 'max_memberships_private_projects',
             type: 'private_project'
         })
 
@@ -502,7 +502,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_public_projects: 10,
             total_public_projects: 1,
-            max_members_private_projects: 20
+            max_memberships_private_projects: 20
         })
 
         currentUserService._user = user
@@ -530,7 +530,7 @@ describe "tgCurrentUserService", ->
             name: "fake1",
             max_public_projects: 10,
             total_public_projects: 1,
-            max_members_private_projects: 20
+            max_memberships_private_projects: 20
         })
 
         currentUserService._user = user
diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade
index 12a481bf..e0b80b45 100644
--- a/app/partials/admin/admin-project-restrictions.jade
+++ b/app/partials/admin/admin-project-restrictions.jade
@@ -2,10 +2,10 @@ fieldset(ng-if="!canBePrivateProject.valid")
     p
       span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
 
-      span(ng-if="canBePrivateProject.reason == 'max_members_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
+      span(ng-if="canBePrivateProject.reason == 'max_memberships_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
 
 fieldset(ng-if="!canBePublicProject.valid")
     p
       span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
 
-      span(ng-if="canBePublicProject.reason == 'max_members_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
+      span(ng-if="canBePublicProject.reason == 'max_memberships_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}

From 2798fd117a8dcdcd3e035ee60b2673b798334e0a Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 16 Mar 2016 11:45:45 +0100
Subject: [PATCH 096/155] Refactoring project restrictions: max memberships and
 max private/public projects

---
 app/coffee/modules/admin/memberships.coffee   |  14 +-
 .../modules/admin/project-profile.coffee      |   8 +-
 .../services/current-user.service.coffee      |  51 ----
 .../services/current-user.service.spec.coffee | 278 ------------------
 app/modules/services/project.service.coffee   |   1 +
 app/partials/admin/admin-project-profile.jade |   9 +-
 .../admin/admin-project-restrictions.jade     |  15 +-
 7 files changed, 15 insertions(+), 361 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index d91f625c..f5a30619 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -48,12 +48,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         "$tgAnalytics",
         "tgAppMetaService",
         "$translate",
-        "tgCurrentUserService",
         "$tgAuth"
     ]
 
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls, @analytics,
-                  @appMetaService, @translate, @currentUserService, @tgAuth) ->
+                  @appMetaService, @translate, @tgAuth) ->
         bindMethods(@)
 
         @scope.project = {}
@@ -112,15 +111,8 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         @rootscope.$broadcast("membersform:new")
 
     _checkUsersLimit: ->
-        @scope.canAddUsers = true
-        userData = @currentUserService.getUser().toJS()
-
-        if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false
-            @.maxMembers = userData.max_memberships_private_projects
-            @scope.canAddUsers = false
-        else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
-            @.maxMembers = userData.max_memberships_public_projects
-            @scope.canAddUsers = false
+        @scope.canAddUsers = @.project.get('total_memberships') > @.project.get('max_memberships')
+        @.maxMembers = @.project.get('max_memberships')
 
     limitUsersWarning: ->
         title = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING")
diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 144970de..2d385c6e 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -69,11 +69,6 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
             description = @scope.project.description
             @appMetaService.setAll(title, description)
 
-            @scope.canBePrivateProject = @.currentUserService.canBePrivateProject(@scope.project.id)
-            @scope.canBePublicProject = @.currentUserService.canBePublicProject(@scope.project.id)
-
-            @scope.isPrivateProject = @scope.project.is_private
-
         promise.then null, @.onInitialDataError.bind(@)
 
         @scope.$on "project:loaded", =>
@@ -534,8 +529,7 @@ module.directive('tgProjectLogoModel', ['$parse', ProjectLogoModelDirective])
 AdminProjectRestrictionsDirective = () ->
     return {
         scope: {
-            "canBePrivateProject": "=",
-            "canBePublicProject": "="
+            "project": "="
         },
         templateUrl: "admin/admin-project-restrictions.html"
     }
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index eaa86b00..57b0db0f 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -118,57 +118,6 @@ class CurrentUserService
 
         return @.projects
 
-    canAddMoreMembersInPrivateProjects: (projectId) ->
-        project = @.projects.get('all').find (project) -> project.get('id') == projectId
-        user = @.getUser()
-
-        if user.get('max_memberships_private_projects') != null && project.get('members').size >= user.get('max_memberships_private_projects')
-            return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
-
-        return {valid: true}
-
-    canAddMoreMembersInPublicProjects: (projectId) ->
-        project = @.projects.get('all').find (project) -> project.get('id') == projectId
-        user = @.getUser()
-
-        if user.get('max_memberships_public_projects') != null && project.get('members').size >= user.get('max_memberships_public_projects')
-            return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
-
-        return {valid: true}
-
-
-    canBePrivateProject: (projectId) ->
-        project = @.projects.get('all').find (project) -> project.get('id') == projectId
-
-        return {valid: true} if project.get('is_private')
-
-        result = @.canCreatePrivateProjects()
-
-        return result if !result.valid
-
-        user = @.getUser()
-
-        if user.get('max_memberships_private_projects') != null && project.get('members').size > user.get('max_memberships_private_projects')
-            return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
-
-        return {valid: true}
-
-    canBePublicProject: (projectId) ->
-        project = @.projects.get('all').find (project) -> project.get('id') == projectId
-
-        return {valid: true} if !project.get('is_private')
-
-        result = @.canCreatePublicProjects()
-
-        return result if !result.valid
-
-        user = @.getUser()
-
-        if user.get('max_memberships_public_projects') != null && project.get('members').size > user.get('max_memberships_public_projects')
-            return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
-
-        return {valid: true}
-
     canCreatePrivateProjects: () ->
         user = @.getUser()
 
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index 8e04980a..36646f48 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -204,112 +204,6 @@ describe "tgCurrentUserService", ->
 
             done()
 
-    it "the user can't add more members in private projects", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_memberships_private_projects: 2
-        })
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._user = user
-        currentUserService._projects = projects
-
-        result = currentUserService.canAddMoreMembersInPrivateProjects(2)
-
-        expect(result).to.be.eql({
-            valid: false,
-            reason: 'max_memberships_private_projects',
-            type: 'private_project'
-        })
-
-    it "the user can add more members in private projects", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_memberships_private_projects: 7
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canAddMoreMembersInPrivateProjects(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
-
-    it "the user can't add more members in public projects", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_memberships_public_projects: 2
-        })
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._user = user
-        currentUserService._projects = projects
-
-        result = currentUserService.canAddMoreMembersInPublicProjects(2)
-
-        expect(result).to.be.eql({
-            valid: false,
-            reason: 'max_memberships_public_projects',
-            type: 'public_project'
-        })
-
-    it "the user can add more members in public projects", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_memberships_public_projects: 7
-        })
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._user = user
-        currentUserService._projects = projects
-
-        result = currentUserService.canAddMoreMembersInPublicProjects(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
-
-
     it "the user can't create private projects if they reach the maximum number of private projects", () ->
         user = Immutable.fromJS({
             id: 1,
@@ -345,92 +239,6 @@ describe "tgCurrentUserService", ->
             valid: true
         })
 
-    it "the user can't convert a private project to a public project if they reach the maximum number of members", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_private_projects: 10,
-            total_private_projects: 1,
-            max_memberships_public_projects: 2
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePublicProject(2)
-
-        expect(result).to.be.eql({
-            valid: false,
-            reason: 'max_memberships_public_projects',
-            type: 'public_project'
-        })
-
-    it "the user can convert private projects to a public project", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_private_projects: 10,
-            total_private_projects: 1,
-            max_memberships_public_projects: 20
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePublicProject(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
-
-    it "the user can convert public projects to a public project if it is already public", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_private_projects: 10,
-            total_private_projects: 100,
-            max_memberships_public_projects: 2
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePublicProject(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
-
     it "the user can't create public projects if they reach the maximum number of private projects", () ->
         user = Immutable.fromJS({
             id: 1,
@@ -465,89 +273,3 @@ describe "tgCurrentUserService", ->
         expect(result).to.be.eql({
             valid: true
         })
-
-    it "the user can't convert a public projects to a private project if they reach the maximum number of members", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_public_projects: 10,
-            total_public_projects: 1,
-            max_memberships_private_projects: 2
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePrivateProject(2)
-
-        expect(result).to.be.eql({
-            valid: false,
-            reason: 'max_memberships_private_projects',
-            type: 'private_project'
-        })
-
-    it "the user can convert public projects to a private project", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_public_projects: 10,
-            total_public_projects: 1,
-            max_memberships_private_projects: 20
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePrivateProject(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
-
-    it "the user can convert private project to a private project if it is already private", () ->
-        user = Immutable.fromJS({
-            id: 1,
-            name: "fake1",
-            max_public_projects: 10,
-            total_public_projects: 1,
-            max_memberships_private_projects: 20
-        })
-
-        currentUserService._user = user
-
-        projects = Immutable.fromJS({
-            all: [
-                {id: 1, name: "fake1"},
-                {id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
-                {id: 3, name: "fake3"},
-                {id: 4, name: "fake4"}
-            ]
-        })
-
-        currentUserService._projects = projects
-
-        result = currentUserService.canBePrivateProject(2)
-
-        expect(result).to.be.eql({
-            valid: true
-        })
diff --git a/app/modules/services/project.service.coffee b/app/modules/services/project.service.coffee
index ca118352..c09a8749 100644
--- a/app/modules/services/project.service.coffee
+++ b/app/modules/services/project.service.coffee
@@ -74,5 +74,6 @@ class ProjectService
         pslug = @.project.get('slug')
 
         return @projectsService.getProjectBySlug(pslug).then (project) => @.setProject(project)
+        
 
 angular.module("taigaCommon").service("tgProjectService", ProjectService)
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 229739af..b188bb57 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -102,16 +102,13 @@ div.wrapper(
                             placeholder="{{ 'ADMIN.PROJECT_PROFILE.RECRUITING_PLACEHOLDER' | translate }}"
                         )
 
-                tg-admin-project-restrictions(
-                    can-be-private-project="canBePrivateProject"
-                    can-be-public-project="canBePublicProject"
-                )
+                tg-admin-project-restrictions(project="project")
 
                 fieldset
                     .project-privacy-settings
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="!canBePublicProject.valid"
+                                ng-disabled="project.is_private && !project.can_is_private_be_updated"
                                 type="radio"
                                 id="private-project"
                                 name="privacy-project"
@@ -122,7 +119,7 @@ div.wrapper(
 
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="!canBePrivateProject.valid"
+                                ng-disabled="!project.is_private && !project.can_is_private_be_updated"
                                 type="radio"
                                 id="public-project"
                                 name="privacy-project"
diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade
index e0b80b45..c56b08a1 100644
--- a/app/partials/admin/admin-project-restrictions.jade
+++ b/app/partials/admin/admin-project-restrictions.jade
@@ -1,11 +1,10 @@
-fieldset(ng-if="!canBePrivateProject.valid")
-    p
-      span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
+fieldset(ng-if="!project.can_is_private_be_updated")
+    p(ng-if="!project.is_private")
+      span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
 
-      span(ng-if="canBePrivateProject.reason == 'max_memberships_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
+      span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
 
-fieldset(ng-if="!canBePublicProject.valid")
-    p
-      span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
+    p(ng-if="project.is_private")
+      span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
 
-      span(ng-if="canBePublicProject.reason == 'max_memberships_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
+      span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}

From 1807d97ba08a6ddfe197ee027980972daac2cc3b Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 17 Mar 2016 12:21:29 +0100
Subject: [PATCH 097/155] Refactoring project restrictions switch

---
 app/modules/services/project.service.coffee        |  2 +-
 app/partials/admin/admin-project-profile.jade      |  4 ++--
 app/partials/admin/admin-project-restrictions.jade | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/modules/services/project.service.coffee b/app/modules/services/project.service.coffee
index c09a8749..a6640ac5 100644
--- a/app/modules/services/project.service.coffee
+++ b/app/modules/services/project.service.coffee
@@ -74,6 +74,6 @@ class ProjectService
         pslug = @.project.get('slug')
 
         return @projectsService.getProjectBySlug(pslug).then (project) => @.setProject(project)
-        
+
 
 angular.module("taigaCommon").service("tgProjectService", ProjectService)
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index b188bb57..300f287a 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -108,7 +108,7 @@ div.wrapper(
                     .project-privacy-settings
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="project.is_private && !project.can_is_private_be_updated"
+                                ng-disabled="project.is_private && !project.is_private_extra_data.can_be_updated"
                                 type="radio"
                                 id="private-project"
                                 name="privacy-project"
@@ -119,7 +119,7 @@ div.wrapper(
 
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="!project.is_private && !project.can_is_private_be_updated"
+                                ng-disabled="!project.is_private && !project.is_private_extra_data.can_be_updated"
                                 type="radio"
                                 id="public-project"
                                 name="privacy-project"
diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade
index c56b08a1..22a5e835 100644
--- a/app/partials/admin/admin-project-restrictions.jade
+++ b/app/partials/admin/admin-project-restrictions.jade
@@ -1,10 +1,8 @@
-fieldset(ng-if="!project.can_is_private_be_updated")
-    p(ng-if="!project.is_private")
-      span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
+fieldset(ng-if="!project.is_private_extra_data.can_be_updated" ng-switch="project.is_private_extra_data.reason")
+      span(ng-switch-when="max-private-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
 
-      span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
+      span(ng-switch-when="max-private-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
 
-    p(ng-if="project.is_private")
-      span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
+      span(ng-switch-when="max-public-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
 
-      span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
+      span(ng-switch-when="max-public-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}

From ac8b2ae538890040618064f88265ada894e4f680 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 18 Mar 2016 07:54:02 +0100
Subject: [PATCH 098/155] rename member to memberships importer

---
 app/coffee/modules/common/importer.coffee    | 16 ++++++++--------
 app/coffee/modules/resources/projects.coffee |  2 +-
 app/locales/taiga/locale-en.json             | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index 34fd5585..27610446 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -32,25 +32,25 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                 errorKey = ''
 
                 user = currentUserService.getUser()
-                maxMembers = 0
+                maxMemberships = 0
 
                 if result.headers.isPrivate
                     privateError = !currentUserService.canCreatePrivateProjects().valid
-                    maxMembers = null
+                    maxMemberships = null
 
-                    if user.get('max_memberships_private_projects') != null && result.headers.members > user.get('max_memberships_private_projects')
+                    if user.get('max_memberships_private_projects') != null && result.headers.memberships > user.get('max_memberships_private_projects')
                         membersError = true
                     else
                         membersError = false
 
                     if privateError && membersError
                         errorKey = 'private-space-members'
-                        maxMembers = user.get('max_memberships_private_projects')
+                        maxMemberships = user.get('max_memberships_private_projects')
                     else if privateError
                         errorKey = 'private-space'
                     else if membersError
                         errorKey = 'private-members'
-                        maxMembers = user.get('max_memberships_private_projects')
+                        maxMemberships = user.get('max_memberships_private_projects')
 
                 else
                     publicError = !currentUserService.canCreatePublicProjects().valid
@@ -62,17 +62,17 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
 
                     if publicError && membersError
                         errorKey = 'public-space-members'
-                        maxMembers = user.get('max_memberships_public_projects')
+                        maxMemberships = user.get('max_memberships_public_projects')
                     else if publicError
                         errorKey = 'public-space'
                     else if membersError
                         errorKey = 'public-members'
-                        maxMembers = user.get('max_memberships_public_projects')
+                        maxMemberships = user.get('max_memberships_public_projects')
 
                 return {
                     key: errorKey,
                     values: {
-                        max_members: maxMembers,
+                        max_memberships: maxMemberships,
                         members: result.headers.members
                     }
                 }
diff --git a/app/coffee/modules/resources/projects.coffee b/app/coffee/modules/resources/projects.coffee
index 7c1a372f..b4822b05 100644
--- a/app/coffee/modules/resources/projects.coffee
+++ b/app/coffee/modules/resources/projects.coffee
@@ -131,7 +131,7 @@ resourceProvider = ($config, $repo, $http, $urls, $auth, $q, $translate) ->
             if evt.target.getResponseHeader('Taiga-Info-Project-Is-Private')
                 response.headers = {
                     isPrivate: evt.target.getResponseHeader('Taiga-Info-Project-Is-Private') == 'True',
-                    members: parseInt(evt.target.getResponseHeader('Taiga-Info-Project-Memberships'))
+                    memberships: parseInt(evt.target.getResponseHeader('Taiga-Info-Project-Memberships'))
                 }
             defered.resolve(response) if response.status in [201, 202]
             defered.reject(response)
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 1ad37423..06645a6b 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -808,7 +808,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is too heavy for our Oompa Loompas, try it with a smaller than ({{maxFileSize}})",
             "SYNC_SUCCESS": "Your project has been imported successfuly",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +818,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }

From c16a6231e13505ef8dab64374c1816d79ac6e2ea Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Fri, 18 Mar 2016 11:14:46 +0100
Subject: [PATCH 099/155] Hidding info in project edition when necessary

---
 app/partials/admin/admin-project-profile.jade      |  4 ++--
 app/partials/admin/admin-project-restrictions.jade | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 300f287a..b85cec4f 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -108,7 +108,7 @@ div.wrapper(
                     .project-privacy-settings
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="project.is_private && !project.is_private_extra_data.can_be_updated"
+                                ng-disabled="project.is_private && !project.is_private_extra_info.can_be_updated"
                                 type="radio"
                                 id="private-project"
                                 name="privacy-project"
@@ -119,7 +119,7 @@ div.wrapper(
 
                         div.privacy-option
                             input.privacy-project(
-                                ng-disabled="!project.is_private && !project.is_private_extra_data.can_be_updated"
+                                ng-disabled="!project.is_private && !project.is_private_extra_info.can_be_updated"
                                 type="radio"
                                 id="public-project"
                                 name="privacy-project"
diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade
index 22a5e835..f0895c9f 100644
--- a/app/partials/admin/admin-project-restrictions.jade
+++ b/app/partials/admin/admin-project-restrictions.jade
@@ -1,8 +1,8 @@
-fieldset(ng-if="!project.is_private_extra_data.can_be_updated" ng-switch="project.is_private_extra_data.reason")
-      span(ng-switch-when="max-private-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
+fieldset(ng-if="!project.is_private_extra_info.can_be_updated && project.i_am_owner" ng-switch="project.is_private_extra_info.reason")
+    span(ng-switch-when="max_private_projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
 
-      span(ng-switch-when="max-private-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
+    span(ng-switch-when="max_private_projects_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
 
-      span(ng-switch-when="max-public-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
+    span(ng-switch-when="max_public_projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
 
-      span(ng-switch-when="max-public-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
+    span(ng-switch-when="max_public_projects_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}

From 16b660c9c7a64ad5d2a3cdb1b4c9030ed5a395d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 9 Mar 2016 17:13:49 +0100
Subject: [PATCH 100/155] Add close buttons and minor jade style refactor

---
 .../lightbox/lightbox-import-error.jade       | 109 +++++++++++++-----
 app/styles/modules/common/lightbox.scss       |  13 ++-
 app/svg/icons/project-limit.svg               |  12 +-
 3 files changed, 95 insertions(+), 39 deletions(-)

diff --git a/app/partials/common/lightbox/lightbox-import-error.jade b/app/partials/common/lightbox/lightbox-import-error.jade
index a715445d..36273ea6 100644
--- a/app/partials/common/lightbox/lightbox-import-error.jade
+++ b/app/partials/common/lightbox/lightbox-import-error.jade
@@ -1,44 +1,97 @@
-a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
+a.close(
+    href=""
+    title="{{'COMMON.CLOSE' | translate}}"
+)
     svg.icon.icon-close
         use(xlink:href="#icon-close")
 
-.content
-    div(ng-switch="key")
-        div(ng-switch-when="private-space")
-            img(width="80", src="/#{v}/svg/icons/project-limit.svg")
+.content(ng-switch="key")
+    .private-space(ng-switch-when="private-space")
+        img(
+            src="/#{v}/svg/icons/project-limit.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.DESC"
+            translate-values="{{values}}"
+        )
 
-        div(ng-switch-when="private-members")
-            img(width="80", src="/#{v}/svg/icons/block-user.svg")
+    div(ng-switch-when="private-members")
+        img(
+            src="/#{v}/svg/icons/block-user.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_MEMBERS.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC"
+            translate-values="{{values}}"
+        )
 
-        div(ng-switch-when="private-space-members")
-            img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
+    div(ng-switch-when="private-space-members")
+        img(
+            src="/#{v}/svg/icons/multi-block-project.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.DESC"
+            translate-values="{{values}}"
+        )
 
-        div(ng-switch-when="public-space")
-            img(width="80", src="/#{v}/svg/icons/project-limit.svg")
+    div(ng-switch-when="public-space")
+        img(
+            src="/#{v}/svg/icons/project-limit.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.DESC"
+            translate-values="{{values}}"
+        )
 
-        div(ng-switch-when="public-members")
-            img(width="80", src="/#{v}/svg/icons/block-user.svg")
+    div(ng-switch-when="public-members")
+        img(
+            src="/#{v}/svg/icons/block-user.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_MEMBERS.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC"
+            translate-values="{{values}}"
+        )
 
-        div(ng-switch-when="public-space-members")
-            img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
+    div(ng-switch-when="public-space-members")
+        img(
+            src="/#{v}/svg/icons/multi-block-project.svg"
+        )
 
-            h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
-            p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
+        h2.title(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.TITLE"
+            translate-values="{{values}}"
+        )
+        p.description(
+            translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.DESC"
+            translate-values="{{values}}"
+        )
 
     div.options
-        a.button-green(translate="COMMON.ACCEPT", ng-click="close()")
\ No newline at end of file
+        a.button-green(
+            translate="COMMON.ACCEPT"
+            ng-click="close()"
+        )
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 13a4b314..994ce2a4 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -537,15 +537,18 @@
 
 .lightbox-import-error {
     text-align: center;
-    p {
-        a {
-            color: $primary;
-        }
-    }
     .content {
         width: 500px;
     }
     h2 {
         margin-top: 1rem;
     }
+    .description {
+        a {
+            color: $primary;
+        }
+    }
+    img {
+        height: 5rem;
+    }
 }
diff --git a/app/svg/icons/project-limit.svg b/app/svg/icons/project-limit.svg
index 6f0ac0d5..7c25bdff 100644
--- a/app/svg/icons/project-limit.svg
+++ b/app/svg/icons/project-limit.svg
@@ -1,8 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72.3 54.4">
- <g fill="#b8b8b8" transform="translate(0 -8.944) scale(.07058)">
-   <path d="M607.8 126.7V229h-476v127.3H0v541h1024V126.7H671.8zm64 64H960v642.6H832V358.6h-.4v-2.3h-636V293l476.2 2.5z" />
- </g>
- <g fill="#f5f5f5" transform="translate(14.503 21.18) scale(.0254)">
-   <path d="M427.6 0c-149.5 0-271 121.6-271 271.4V391H0v633h1024V391H867.3V271.4C867.3 121.6 746 0 596.3 0H427.7zm0 64h168.8c115 0 206.8 92 206.8 207.4V391H220.7V271.5C220.7 156 312.4 64 427.7 64zM64 455.3h896V960H64V455zm416 131.5V816h64V586.7h-64z"/>
- </g>
+    <g fill="#b8b8b8" transform="translate(0 -8.944) scale(.07058)">
+        <path d="M607.8 126.7V229h-476v127.3H0v541h1024V126.7H671.8zm64 64H960v642.6H832V358.6h-.4v-2.3h-636V293l476.2 2.5z"/>
+    </g>
+    <g fill="#f5f5f5" transform="translate(14.503 21.18) scale(.0254)">
+        <path d="M427.6 0c-149.5 0-271 121.6-271 271.4V391H0v633h1024V391H867.3V271.4C867.3 121.6 746 0 596.3 0H427.7zm0 64h168.8c115 0 206.8 92 206.8 207.4V391H220.7V271.5C220.7 156 312.4 64 427.7 64zM64 455.3h896V960H64V455zm416 131.5V816h64V586.7h-64z"/>
+    </g>
 </svg>

From b0be8e3013a8b846e4404586cff1d53416878640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 9 Mar 2016 10:56:55 +0100
Subject: [PATCH 101/155] Refactor SVG icon

---
 app/modules/profile/profile-favs/items/project.jade |  9 +++------
 app/modules/projects/listing/projects-listing.jade  |  9 +++------
 app/modules/projects/project/project.jade           | 10 ++++------
 app/styles/components/list-items.scss               |  2 +-
 app/styles/components/private.scss                  |  8 +-------
 app/styles/dependencies/mixins/project-card.scss    |  2 +-
 app/styles/modules/home-project.scss                |  3 +++
 7 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade
index 99f58d66..7e4521be 100644
--- a/app/modules/profile/profile-favs/items/project.jade
+++ b/app/modules/profile/profile-favs/items/project.jade
@@ -18,12 +18,9 @@
                         tg-nav="project:project=vm.item.get('slug')"
                         title="{{ ::vm.item.get('name') }}"
                     ) {{ ::vm.item.get('name') }}
-                    span.private(
-                        ng-if="::vm.item.get('project_is_private')"
-                        title="{{'PROJECT.PRIVATE' | translate}}"
-                    )
-                        svg.icon.icon-lock
-                            use(xlink:href="#icon-lock")
+                    svg.icon.icon-lock.private(ng-if="::vm.item.get('project_is_private')")
+                        use(xlink:href="#icon-lock")
+                            title {{'PROJECT.PRIVATE' | translate}}"
                     svg.icon.icon-blocked-project(ng-if="vm.item.get('project_blocked_code')")
                         use(xlink:href="#icon-blocked-project")
                             title(translate="PROJECT.BLOCKED_PROJECT.BLOCKED")
diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade
index 65414a43..be8ad939 100644
--- a/app/modules/projects/listing/projects-listing.jade
+++ b/app/modules/projects/listing/projects-listing.jade
@@ -44,12 +44,9 @@
                                         tg-nav="project:project=project.get('slug')"
                                         title="{{ ::project.get('name') }}"
                                     ) {{project.get('name')}}
-                                    span.private(
-                                        ng-if="project.get('is_private')"
-                                        title="{{'PROJECT.PRIVATE' | translate}}"
-                                    )
-                                        svg.icon.icon-lock
-                                            use(xlink:href="#icon-lock")
+                                    svg.icon.icon-lock.private(ng-if="project.get('is_private')")
+                                        use(xlink:href="#icon-lock")
+                                            title {{'PROJECT.PRIVATE' | translate}}"
                                     
                                     svg.icon.icon-badge(ng-if="project.get('i_am_owner')")
                                         use(xlink:href="#icon-badge")
diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade
index 89a52c87..44c479ee 100644
--- a/app/modules/projects/project/project.jade
+++ b/app/modules/projects/project/project.jade
@@ -16,12 +16,10 @@ div.wrapper
                     .intro-title
                         h1
                             span.project-name {{::vm.project.get("name")}}
-                        span.private(
-                            ng-if="::vm.project.get('is_private')"
-                            title="{{'PROJECT.PRIVATE' | translate}}"
-                        )
-                            svg.icon.icon-lock
-                                use(xlink:href="#icon-lock")
+                                
+                        svg.icon.icon-lock.private(ng-if="::vm.project.get('is_private')")
+                            use(xlink:href="#icon-lock")
+                                title {{'PROJECT.PRIVATE' | translate}}"
 
                     div.track-buttons-container(ng-if="vm.user")
                         tg-like-project-button(project="vm.project")
diff --git a/app/styles/components/list-items.scss b/app/styles/components/list-items.scss
index 547c4294..12ebdb93 100644
--- a/app/styles/components/list-items.scss
+++ b/app/styles/components/list-items.scss
@@ -45,7 +45,7 @@
         @extend %large;
     }
     .icon-blocked-project {
-        @include svg-size();
+        @include svg-size(.75rem);
     }
     .list-itemtype-project-data-wrapper {
         display: flex;
diff --git a/app/styles/components/private.scss b/app/styles/components/private.scss
index 9758e999..8a40e013 100644
--- a/app/styles/components/private.scss
+++ b/app/styles/components/private.scss
@@ -1,10 +1,4 @@
 .private {
-    display: inline-block;
+    fill: $gray-light;
     margin-left: .5rem;
-    width: .5rem;
-    svg {
-        @include svg-size(.5rem);
-        fill: $gray-light;
-        transition: fill .3s linear;
-    }
 }
diff --git a/app/styles/dependencies/mixins/project-card.scss b/app/styles/dependencies/mixins/project-card.scss
index 1c6e6365..efd82701 100644
--- a/app/styles/dependencies/mixins/project-card.scss
+++ b/app/styles/dependencies/mixins/project-card.scss
@@ -25,7 +25,7 @@
         display: flex;
         margin-top: auto;
         svg {
-            @include svg-size(.8rem);
+            @include svg-size(.75rem);
             fill: currentColor;
             margin-right: .25rem;
         }
diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss
index 70c5d1eb..3f06f949 100644
--- a/app/styles/modules/home-project.scss
+++ b/app/styles/modules/home-project.scss
@@ -30,6 +30,9 @@
         margin-bottom: 0;
         vertical-align: middle;
     }
+    .private {
+        @include svg-size(1.1rem);
+    }
     .like-watch-container {
         margin-left: auto;
     }

From dc008d7757ff5ddf56c0211188cad21b4e0df144 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 14 Mar 2016 12:55:33 +0100
Subject: [PATCH 102/155] team leave project

---
 app/coffee/modules/common/lightboxes.coffee   | 12 ++++++++
 app/coffee/modules/team/main.coffee           | 28 +++++++++++++++----
 app/locales/taiga/locale-en.json              | 11 ++++++++
 .../lightbox-leave-project-warning.jade       | 19 +++++++++++++
 .../includes/modules/team/team-table.jade     |  2 +-
 .../team/team-member-current-user.jade        |  2 +-
 app/styles/modules/common/lightbox.scss       | 13 +++++++++
 7 files changed, 79 insertions(+), 8 deletions(-)
 create mode 100644 app/partials/common/lightbox/lightbox-leave-project-warning.jade

diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 5db4e843..00a1c86e 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -697,3 +697,15 @@ AttachmentPreviewLightboxDirective = (lightboxService, $template, $compile) ->
     }
 
 module.directive("tgLbAttachmentPreview", ["lightboxService", "$tgTemplate", "$compile", AttachmentPreviewLightboxDirective])
+
+LightboxLeaveProjectWarningDirective = (lightboxService, $template, $compile) ->
+    link = ($scope, $el, attrs) ->
+        lightboxService.open($el)
+
+    return {
+        templateUrl: 'common/lightbox/lightbox-leave-project-warning.html',
+        link: link,
+        scope: true
+    }
+
+module.directive("tgLightboxLeaveProjectWarning", ["lightboxService", LightboxLeaveProjectWarningDirective])
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index b74006f4..68e3858d 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -184,7 +184,7 @@ TeamMemberCurrentUserDirective = () ->
     return {
         templateUrl: "team/team-member-current-user.html"
         scope: {
-            projectId: "=projectid",
+            project: "=project",
             currentUser: "=currentuser",
             stats: "=",
             issuesEnabled: "=issuesenabled",
@@ -225,14 +225,14 @@ module.directive("tgTeamMembers", TeamMembersDirective)
 ## Leave project Directive
 #############################################################################
 
-LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate) ->
+LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate, lightboxFactory, currentUserService) ->
     link = ($scope, $el, $attrs) ->
-        $scope.leave = () ->
+        leaveConfirm = () ->
             leave_project_text = $translate.instant("TEAM.ACTION_LEAVE_PROJECT")
             confirm_leave_project_text = $translate.instant("TEAM.CONFIRM_LEAVE_PROJECT")
 
             $confirm.ask(leave_project_text, confirm_leave_project_text).then (response) =>
-                promise = $rs.projects.leave($attrs.projectid)
+                promise = $rs.projects.leave($scope.project.id)
 
                 promise.then =>
                     response.finish()
@@ -243,13 +243,29 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate)
                     response.finish()
                     $confirm.notify('error', response.data._error_message)
 
+        $scope.leave = () ->
+            if $scope.project.owner.id == $scope.user.id
+                currentUser = currentUserService.getUser()
+
+                lightboxFactory.create("tg-lightbox-leave-project-warning", {
+                    class: "lightbox lightbox-leave-project-warning"
+                }, {
+                    currentUser: true,
+                    project: $scope.project
+                })
+            else
+                leaveConfirm()
+
     return {
-        scope: {},
+        scope: {
+            user: "=",
+            project: "="
+        },
         templateUrl: "team/leave-project.html",
         link: link
     }
 
-module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate",
+module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate", "tgLightboxFactory", "tgCurrentUserService",
                                     LeaveProjectDirective])
 
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 06645a6b..8bd9721b 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -919,6 +919,17 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Type an Email"
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
         }
     },
     "US": {
diff --git a/app/partials/common/lightbox/lightbox-leave-project-warning.jade b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
new file mode 100644
index 00000000..06ce8158
--- /dev/null
+++ b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
@@ -0,0 +1,19 @@
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
+div.content
+    svg.icon.icon-exclamation
+        use(xlink:href="#icon-exclamation")
+
+    h2.title {{'LIGHTBOX.LEAVE_PROJECT_WARNING.TITLE' | translate}}
+
+    div(ng-if="currentUser")
+        p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.DESC' | translate}}
+
+        a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
+            span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.BUTTON")
+
+    div(ng-if="!currentUser")
+        p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.DESC' | translate}}
+
+        a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
+            span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.BUTTON")
\ No newline at end of file
diff --git a/app/partials/includes/modules/team/team-table.jade b/app/partials/includes/modules/team/team-table.jade
index 0f9ac475..b8500578 100644
--- a/app/partials/includes/modules/team/team-table.jade
+++ b/app/partials/includes/modules/team/team-table.jade
@@ -31,7 +31,7 @@ section.table-team.basic-table
         tg-team-current-user
         stats="stats"
         currentuser="currentUser"
-        projectid="projectId"
+        project="project"
         issuesEnabled="issuesEnabled"
         tasksenabled="tasksEnabled"
         wikienabled="wikiEnabled"
diff --git a/app/partials/team/team-member-current-user.jade b/app/partials/team/team-member-current-user.jade
index 623c936c..1c425a44 100644
--- a/app/partials/team/team-member-current-user.jade
+++ b/app/partials/team/team-member-current-user.jade
@@ -12,7 +12,7 @@
 
                 .position(tg-bo-bind="currentUser.role_name")
 
-                div(tg-leave-project="", projectid="{{projectId}}")
+                div(tg-leave-project="", project="project", user="currentUser")
 
     .member-stats(
         tg-team-member-stats
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 994ce2a4..a3b0d9ac 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -552,3 +552,16 @@
         height: 5rem;
     }
 }
+
+.lightbox-leave-project-warning {
+    text-align: center;
+    .icon {
+        fill: $gray-light;
+        height: 3rem;
+        margin-bottom: 1rem;
+        width: 3rem;
+    }
+    .content {
+        width: 500px;
+    }
+}

From 5b2547b859aff7054e3073875c01e3801abee0cd Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 15 Mar 2016 10:35:15 +0100
Subject: [PATCH 103/155] delete member warning if they're owner

---
 app/coffee/modules/admin/memberships.coffee | 24 ++++++++++++++++-----
 app/coffee/modules/team/main.coffee         |  6 ++----
 e2e/helpers/admin-memberships.js            | 20 +++++++++++++++++
 e2e/suites/admin/members.e2e.js             | 21 +++++++++++++++++-
 e2e/utils/lightbox.js                       | 10 +++++++++
 5 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index f5a30619..e36d8f92 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -366,7 +366,7 @@ module.directive("tgMembershipsRowRoleSelector", ["$log", "$tgRepo", "$tgConfirm
 ## Member Actions Directive
 #############################################################################
 
-MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate) ->
+MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate, currentUserService, lightboxFactory) ->
     activedTemplate = """
     <div class="active"
          translate="ADMIN.MEMBERSHIP.STATUS_ACTIVE">
@@ -421,9 +421,7 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
 
             $rs.memberships.resendInvitation($scope.member.id).then(onSuccess, onError)
 
-        $el.on "click", ".delete", (event) ->
-            event.preventDefault()
-
+        leaveConfirm = () ->
             title = $translate.instant("ADMIN.MEMBERSHIP.DELETE_MEMBER")
             defaultMsg = $translate.instant("ADMIN.MEMBERSHIP.DEFAULT_DELETE_MESSAGE", {email: member.email})
             message = if member.user then member.full_name else defaultMsg
@@ -448,6 +446,22 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
 
                 $repo.remove(member).then(onSuccess, onError)
 
+        $el.on "click", ".delete", (event) ->
+            event.preventDefault()
+
+            if $scope.project.owner.id == member.user
+                currentUser = currentUserService.getUser()
+                isCurrentUser = currentUser.get('id') == member.user
+
+                lightboxFactory.create("tg-lightbox-leave-project-warning", {
+                    class: "lightbox lightbox-leave-project-warning"
+                }, {
+                    currentUser: isCurrentUser,
+                    project: $scope.project
+                })
+            else
+                leaveConfirm()
+
         $scope.$on "$destroy", ->
             $el.off()
 
@@ -455,4 +469,4 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
 
 
 module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile",
-                                             "$translate", MembershipsRowActionsDirective])
+                                             "$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective])
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 68e3858d..40b08514 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -225,7 +225,7 @@ module.directive("tgTeamMembers", TeamMembersDirective)
 ## Leave project Directive
 #############################################################################
 
-LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate, lightboxFactory, currentUserService) ->
+LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate, lightboxFactory) ->
     link = ($scope, $el, $attrs) ->
         leaveConfirm = () ->
             leave_project_text = $translate.instant("TEAM.ACTION_LEAVE_PROJECT")
@@ -245,8 +245,6 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
 
         $scope.leave = () ->
             if $scope.project.owner.id == $scope.user.id
-                currentUser = currentUserService.getUser()
-
                 lightboxFactory.create("tg-lightbox-leave-project-warning", {
                     class: "lightbox lightbox-leave-project-warning"
                 }, {
@@ -265,7 +263,7 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
         link: link
     }
 
-module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate", "tgLightboxFactory", "tgCurrentUserService",
+module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate", "tgLightboxFactory",
                                     LeaveProjectDirective])
 
 
diff --git a/e2e/helpers/admin-memberships.js b/e2e/helpers/admin-memberships.js
index 5fbe7c34..cb420c35 100644
--- a/e2e/helpers/admin-memberships.js
+++ b/e2e/helpers/admin-memberships.js
@@ -35,10 +35,30 @@ helper.getNewMemberLightbox = function() {
     return obj;
 };
 
+helper.leavingProjectWarningLb = function() {
+    return $('div[tg-lightbox-leave-project-warning]');
+};
+
+helper.isLeaveProjectWarningOpen = function() {
+    return helper.leavingProjectWarningLb().isPresent();
+};
+
 helper.getMembers = function() {
     return $$('.admin-membership-table .row');
 };
 
+helper.getOwner = function() {
+    return helper.getMembers().filter(async (member) => {
+        return !!await member.$$('.icon-badge').count();
+    }).first();
+};
+
+helper.excludeOwner = function(members) {
+    return members.filter(async (member) => {
+        return !await member.$$('.icon-badge').count();
+    });
+};
+
 helper.isActive = function(elm) {
     return utils.common.hasClass(elm, 'active');
 };
diff --git a/e2e/suites/admin/members.e2e.js b/e2e/suites/admin/members.e2e.js
index 9a024a12..02de904b 100644
--- a/e2e/suites/admin/members.e2e.js
+++ b/e2e/suites/admin/members.e2e.js
@@ -78,7 +78,7 @@ describe('admin - members', function() {
     it('delete member', async function() {
         let initMembersCount = await adminMembershipsHelper.getMembers().count();
 
-        let member = adminMembershipsHelper.getMembers().last();
+        let member = adminMembershipsHelper.excludeOwner(adminMembershipsHelper.getMembers()).last();
 
         adminMembershipsHelper.delete(member);
 
@@ -89,6 +89,25 @@ describe('admin - members', function() {
         let membersCount = await adminMembershipsHelper.getMembers().count();
 
         expect(membersCount).to.be.equal(initMembersCount - 1);
+
+        await utils.notifications.success.close();
+    });
+
+    it('trying to delete owner', async function() {
+        let member = await adminMembershipsHelper.getOwner();
+
+        adminMembershipsHelper.delete(member);
+
+        utils.common.takeScreenshot('memberships', 'delete-owner-lb');
+
+        let isLeaveProjectWarningOpen = await adminMembershipsHelper.isLeaveProjectWarningOpen();
+
+        expect(isLeaveProjectWarningOpen).to.be.equal(true);
+
+        let lb = adminMembershipsHelper.leavingProjectWarningLb();
+
+        await utils.lightbox.exit(lb);
+        await utils.lightbox.close(lb);
     });
 
     it('change role', async function() {
diff --git a/e2e/utils/lightbox.js b/e2e/utils/lightbox.js
index 0108b023..b4504568 100644
--- a/e2e/utils/lightbox.js
+++ b/e2e/utils/lightbox.js
@@ -3,6 +3,16 @@ var common = require('./common');
 var lightbox = module.exports;
 var transition = 300;
 
+lightbox.exit = function(el) {
+    var deferred = protractor.promise.defer();
+
+    if (typeof el === 'string' || el instanceof String) {
+        el = $(el);
+    }
+
+    el.$('.icon-close').click();
+};
+
 lightbox.open = async function(el) {
     var deferred = protractor.promise.defer();
 

From b91ffc8be31b262cd4fb04bea3ca3e15a73d76bb Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 15 Mar 2016 12:04:18 +0100
Subject: [PATCH 104/155] e2e - leaving project owner warning in team

---
 e2e/helpers/create-project-helper.js |  6 +++---
 e2e/helpers/team-helper.js           |  8 ++++++++
 e2e/suites/team.e2e.js               | 25 +++++++++++++++++++++++++
 e2e/utils/nav.js                     |  9 +++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/e2e/helpers/create-project-helper.js b/e2e/helpers/create-project-helper.js
index c87f5fac..8323b73d 100644
--- a/e2e/helpers/create-project-helper.js
+++ b/e2e/helpers/create-project-helper.js
@@ -23,13 +23,13 @@ helper.createProjectLightbox = function() {
             await browser.sleep(1000);
         },
         submit: function() {
-            return $('.wizard-step.active .button-green').click();
+            return $('div[tg-lb-create-project]  .button-green').click();
         },
         name: function() {
-            return $$('.create-step2 input').get(0);
+            return $$('div[tg-lb-create-project] input[type="text"]').get(0);
         },
         description: function() {
-            return $$('.create-step2 textarea');
+            return $('div[tg-lb-create-project] textarea');
         },
         errors: function() {
             return $$('.checksley-error-list li');
diff --git a/e2e/helpers/team-helper.js b/e2e/helpers/team-helper.js
index 3517cf7e..d5aa011c 100644
--- a/e2e/helpers/team-helper.js
+++ b/e2e/helpers/team-helper.js
@@ -53,3 +53,11 @@ helper.filters = function() {
 
   return obj;
 };
+
+helper.leavingProjectWarningLb = function() {
+    return $('div[tg-lightbox-leave-project-warning]');
+};
+
+helper.isLeaveProjectWarningOpen = function() {
+    return helper.leavingProjectWarningLb().isPresent();
+};
diff --git a/e2e/suites/team.e2e.js b/e2e/suites/team.e2e.js
index 64e12039..da7f33b3 100644
--- a/e2e/suites/team.e2e.js
+++ b/e2e/suites/team.e2e.js
@@ -20,6 +20,31 @@ describe('leaving project', function(){
     });
 });
 
+describe('leaving project owner', function(){
+    before(async function(){
+        await utils.common.createProject();
+        await utils.nav
+            .init()
+            .team()
+            .go();
+    });
+
+    it('leave project', async function(){
+        teamHelper.team().leave();
+
+        let isLeaveProjectWarningOpen = await teamHelper.isLeaveProjectWarningOpen();
+
+        await utils.common.takeScreenshot("team", "leave-project-warning");
+
+        expect(isLeaveProjectWarningOpen).to.be.equal(true);
+
+        let lb = teamHelper.leavingProjectWarningLb();
+
+        await utils.lightbox.exit(lb);
+        await utils.lightbox.close(lb);
+    });
+});
+
 describe('team', function() {
     before(async function(){
         browser.get(browser.params.glob.host + 'project/project-5/team');
diff --git a/e2e/utils/nav.js b/e2e/utils/nav.js
index 107317d3..ba663509 100644
--- a/e2e/utils/nav.js
+++ b/e2e/utils/nav.js
@@ -58,6 +58,11 @@ var actions = {
 
         await common.link(task);
 
+        return common.waitLoader();
+    },
+    team: async function() {
+        await common.link($('#nav-team a'));
+
         return common.waitLoader();
     }
 };
@@ -95,6 +100,10 @@ var nav = {
         this.actions.push(actions.task.bind(null, index));
         return this;
     },
+    team: function(index) {
+        this.actions.push(actions.team.bind(null, index));
+        return this;
+    },
     go: function() {
         let promise = this.actions[0]();
 

From 756875f36259808c6006970ccbaadc14cd5edf32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 18 Mar 2016 13:26:02 +0100
Subject: [PATCH 105/155] Improve project list hover interaction

---
 app/modules/home/projects/home-project-list.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/modules/home/projects/home-project-list.scss b/app/modules/home/projects/home-project-list.scss
index d87810e0..3a3d2f1d 100644
--- a/app/modules/home/projects/home-project-list.scss
+++ b/app/modules/home/projects/home-project-list.scss
@@ -4,10 +4,10 @@
     @include project-card;
     cursor: pointer;
     margin-bottom: 1rem;
-    transition: .2s;
-    transition-delay: .1s;
+    transition: all .2s;
     &:hover {
-        border: 1px solid $primary-light;
+        border: 1px solid rgba($primary-light, .2);
+        box-shadow: 0 0 5px $whitish;
     }
     &.blocked-project {
         border: $whitish;

From d5dcb3d2876a8abe8bfccbe91a7300e2a31b7c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 18 Mar 2016 13:43:20 +0100
Subject: [PATCH 106/155] Fix broken activity icon in discover

---
 app/modules/home/projects/home-project-list.scss | 1 +
 app/svg/sprite.svg                               | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/modules/home/projects/home-project-list.scss b/app/modules/home/projects/home-project-list.scss
index 3a3d2f1d..e5dd7028 100644
--- a/app/modules/home/projects/home-project-list.scss
+++ b/app/modules/home/projects/home-project-list.scss
@@ -13,6 +13,7 @@
         border: $whitish;
         &:hover {
             border: $whitish;
+            box-shadow: none;
         }
         .tags-container,
         .project-card-logo,
diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg
index 79330287..0a5d3ec6 100644
--- a/app/svg/sprite.svg
+++ b/app/svg/sprite.svg
@@ -126,6 +126,10 @@
                 class="path1"
                 d="M251.22 0.064c-30.088 0.602-62.344 9.4-96.52 29.422-265.28 155.402-216.202 594.775 358.106 994.278v0.236l0.205-0.123 0.205 0.123v-0.238c566.579-373.642 623.391-838.874 358.113-994.278-217.037-127.14-356.142 197.729-358.316 202.842-1.818-4.288-100.8-235.469-261.791-232.261z"></path>
         </symbol>
+        <symbol id="icon-activity" viewBox="0 0 400 400">
+            <title>activity</title>
+            <path d="M280 80l46 46-98 97-80-80L.3 293l28 27 120-120 79.8 80 126-126 46 46V80z"/>
+        </symbol>
         <symbol id="icon-question" viewBox="0 0 1024 1024">
             <title>question</title>
             <path

From 228cce471ee8b731fcd24cbf1cb68c431b2b1f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 18 Mar 2016 14:13:54 +0100
Subject: [PATCH 107/155] Fix navigation buttons on FF

---
 app/modules/navigation-bar/navigation-bar.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss
index 26f0fadf..5d0796a2 100644
--- a/app/modules/navigation-bar/navigation-bar.scss
+++ b/app/modules/navigation-bar/navigation-bar.scss
@@ -53,7 +53,7 @@ $dropdown-width: 350px;
         display: inline-block;
         transition: all .2s linear;
         svg {
-            fill: darken($primary-dark, 8%);
+            fill: rgba($primary-dark, .8);
             transition: all .2s linear;
         }
         &:hover {
@@ -85,10 +85,6 @@ $dropdown-width: 350px;
         max-height: 1.2rem;
         max-width: 1.2rem;
         width: 1.2rem;
-        path {
-            fill: $top-icon-color;
-            transition: all .2s;
-        }
     }
     .topnav-dropdown-wrapper {
         position: relative;

From b6f3a7fe6d9a4c3669d35fa24ec9543d48cf460e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 21 Mar 2016 13:17:14 +0100
Subject: [PATCH 108/155] Close add-new webhook form when is needed

---
 app/coffee/modules/admin/third-parties.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/coffee/modules/admin/third-parties.coffee b/app/coffee/modules/admin/third-parties.coffee
index 071e669c..9cc4eaf6 100644
--- a/app/coffee/modules/admin/third-parties.coffee
+++ b/app/coffee/modules/admin/third-parties.coffee
@@ -277,6 +277,10 @@ NewWebhookDirective = ($rs, $repo, $confirm, $loading) ->
             $scope.$apply ->
                 initializeNewValue()
 
+                # Close form if there some webhooks created
+                if $scope.webhooks.length >= 1
+                    formDOMNode.addClass("hidden")
+
         addWebhookDOMNode.on "click", (event) ->
             formDOMNode.removeClass("hidden")
             formDOMNode.find("input")[0].focus()

From acfacc67156c01db5aeb01310b96ad3d71792cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 14 Mar 2016 17:02:06 +0100
Subject: [PATCH 109/155] Refactor add-member lightbox and fix some error
 messages

---
 app/coffee/modules/admin/lightboxes.coffee    | 209 +++++++-----------
 app/coffee/modules/admin/memberships.coffee   |  77 +++++--
 app/locales/taiga/locale-en.json              |   8 +-
 .../admin/admin-memberships-row-checkbox.jade |   2 +-
 app/partials/admin/admin-memberships.jade     |  25 +--
 ...s-no-more=memberships-warning-message.jade |  11 +
 app/partials/admin/lightbox-add-members.jade  |  58 +++++
 .../no-more-memberships-explanation.jade      |  11 +
 .../includes/modules/lightbox-add-member.jade |  12 -
 app/styles/core/base.scss                     |   4 +-
 app/styles/modules/common/lightbox.scss       |  52 +++--
 11 files changed, 267 insertions(+), 202 deletions(-)
 create mode 100644 app/partials/admin/lightbox-add-members-no-more=memberships-warning-message.jade
 create mode 100644 app/partials/admin/lightbox-add-members.jade
 create mode 100644 app/partials/admin/no-more-memberships-explanation.jade
 delete mode 100644 app/partials/includes/modules/lightbox-add-member.jade

diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index 5a4ff7cd..8030262f 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -27,153 +27,112 @@ debounce = @.taiga.debounce
 
 module = angular.module("taigaKanban")
 
-MAX_MEMBERSHIP_FIELDSETS = 4
-
 #############################################################################
 ## Create Members Lightbox Directive
 #############################################################################
 
-CreateMembersDirective = ($rs, $rootScope, $confirm, $loading, lightboxService, $compile) ->
-    extraTextTemplate = """
-    <fieldset class="extra-text">
-        <textarea ng-attr-placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_INVITATION_TEXT' | translate}}"
-                  maxlength="255"></textarea>
-    </fieldset>
-    """
+class LightboxAddMembersController
+    @.$inject = [
+        "$scope",
+        "lightboxService",
+        "tgLoader",
+        "$tgConfirm",
+        "$tgResources",
+        "$rootScope",
+    ]
 
-    template = _.template("""
-    <div class="add-member-wrapper">
-        <fieldset>
-            <input tg-capslock type="email" placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
-                   <% if(required) { %> data-required="true" <% } %> data-type="email" />
-        </fieldset>
-        <fieldset>
-            <select <% if(required) { %> data-required="true" <% } %> data-required="true">
-                <% _.each(roleList, function(role) { %>
-                <option value="<%- role.id %>"><%- role.name %></option>
-                <% }); %>
-            </select>
-            <a class="add-fieldset" href="">
-                <svg class="icon icon-add">
-                    <use xlink:href="#icon-add">
-                </svg>
-            </a>
-        </fieldset>
-    </div>
-    """)
+    constructor: (@scope, @lightboxService, @tgLoader, @confirm, @rs, @rootScope) ->
+        @._defaultMaxInvites = 4
+        @._defaultRole = @.project.roles[0].id
+        @.form = null
+        @.submitInvites = false
+        @.canAddUsers = true
+        @.memberInvites = []
 
-    link = ($scope, $el, $attrs) ->
-        createButton = (type) ->
-            html = "<svg class='icon " + type + "'><use xlink:href='#" + type + "'></svg>";
-            return html
+        if @.project.max_memberships == null
+            @.membersLimit = @._defaultMaxInvites
+        else
+            pendingMembersCount = Math.max(@.project.max_memberships - @.project.total_memberships, 0)
+            @.membersLimit = Math.min(pendingMembersCount, @._defaultMaxInvites)
 
-        createFieldSet = (required = true)->
-            ctx = {roleList: $scope.project.roles, required: required}
-            return $compile(template(ctx))($scope)
+        @.addSingleMember()
 
-        resetForm = ->
-            $el.find("form textarea").remove()
-            $el.find("form .add-member-wrapper").remove()
+    addSingleMember: () ->
+        @.memberInvites.push({email:'', role_id: @._defaultRole})
 
-            invitations = $el.find(".add-member-forms")
-            invitations.html($compile(extraTextTemplate)($scope))
+        if @.memberInvites.length >= @.membersLimit
+            @.canAddUsers = false
+        @.showWarningMessage = (!@.canAddUsers &&
+                            @.project.total_memberships + @.memberInvites.length == @.project.max_memberships)
 
-            fieldSet = createFieldSet()
-            invitations.prepend(fieldSet)
+    removeSingleMember: (index) ->
+        @.memberInvites.splice(index, 1)
 
-        $scope.$on "membersform:new",  ->
-            resetForm()
-            lightboxService.open($el)
+        @.canAddUsers = true
+        @.showWarningMessage = @.membersLimit == 1
 
-        $scope.$on "$destroy", ->
-            $el.off()
+    submit: () ->
+        # Need to reset the form constrains
+        @.form.initializeFields()
+        @.form.reset()
+        return if not @.form.validate()
 
-        $el.on "click", ".delete-fieldset", (event) ->
-            event.preventDefault()
-            target = angular.element(event.currentTarget)
-            fieldSet = target.closest('.add-member-wrapper')
+        @.submitInvites = true
+        promise = @rs.memberships.bulkCreateMemberships(
+            @.project.id,
+            @.memberInvites,
+            @.invitationText
+        )
+        promise.then(
+            @._onSuccessInvite.bind(this),
+            @._onErrorInvite.bind(this)
+        )
 
-            fieldSet.remove()
+    _onSuccessInvite: () ->
+        @.submitInvites = false
+        @rootScope.$broadcast("membersform:new:success")
+        @lightboxService.closeAll()
+        @confirm.notify("success")
 
-            lastActionButton = $el.find(".add-member-wrapper fieldset:last > a")
-            if lastActionButton.hasClass("delete-fieldset")
-                lastActionButton.removeClass("delete-fieldset").addClass("add-fieldset")
-                svg = createButton('icon-add')
-                lastActionButton.html(svg)
+    _onErrorInvite: (response) ->
+        @.submitInvites = false
+        @.form.setErrors(response.data)
+        if response.data._error_message
+            @confirm.notify("error", response.data._error_message)
 
-        $el.on "click", ".add-fieldset", (event) ->
-            event.preventDefault()
-            target = angular.element(event.currentTarget)
-            fieldSet = target.closest('.add-member-wrapper')
+module.controller("LbAddMembersController", LightboxAddMembersController)
 
-            target.removeClass("add-fieldset").addClass("delete-fieldset")
-            svg = createButton('icon-trash')
-            target.html(svg)
 
-            newFieldSet = createFieldSet(false)
-            fieldSet.after(newFieldSet)
 
-            $scope.$digest() # To compile newFieldSet and translate text
+LightboxAddMembersDirective = (lightboxService) ->
+    link = (scope, el, attrs, ctrl) ->
+        lightboxService.open(el)
+        ctrl.form = el.find("form").checksley()
 
-            if $el.find(".add-member-wrapper").length == MAX_MEMBERSHIP_FIELDSETS
-                $el.find(".add-member-wrapper fieldset:last > a")
-                    .removeClass("add-fieldset").addClass("delete-fieldset")
-                svg = createButton('icon-trash')
-                $el.find(".add-member-wrapper fieldset:last > a").html(svg)
+    return {
+        scope: {},
+        bindToController: {
+            project: '=',
+        },
+        controller: 'LbAddMembersController',
+        controllerAs: 'vm',
+        templateUrl: 'admin/lightbox-add-members.html',
+        link: link
+    }
 
-        submit = debounce 2000, (event) =>
-            event.preventDefault()
+module.directive("tgLbAddMembers", ["lightboxService", LightboxAddMembersDirective])
 
-            currentLoading = $loading()
-                .target(submitButton)
-                .start()
 
-            onSuccess = (data) ->
-                currentLoading.finish()
-                lightboxService.close($el)
-                $confirm.notify("success")
-                $rootScope.$broadcast("membersform:new:success")
+#############################################################################
+## Warning message directive
+#############################################################################
 
-            onError = (data) ->
-                currentLoading.finish()
-                lightboxService.close($el)
-                $confirm.notify("error")
-                $rootScope.$broadcast("membersform:new:error")
+LightboxAddMembersWarningMessageDirective = () ->
+    return {
+          templateUrl: "admin/lightbox-add-members-no-more=memberships-warning-message.html"
+          scope: {
+              project: "="
+          }
+    }
 
-            form = $el.find("form").checksley()
-
-            #checksley find new fields
-            form.destroy()
-            form.initialize()
-            if not form.validate()
-                return
-
-            memberWrappers = $el.find("form .add-member-wrapper")
-            memberWrappers = _.filter memberWrappers, (mw) ->
-                angular.element(mw).find("input").hasClass('checksley-ok')
-
-            invitations = _.map memberWrappers, (mw) ->
-                memberWrapper = angular.element(mw)
-                email =  memberWrapper.find("input")
-                role = memberWrapper.find("select")
-
-                return {
-                    email: email.val()
-                    role_id: role.val()
-                }
-
-            if invitations.length
-                invitation_extra_text = $el.find("form textarea").val()
-
-                promise = $rs.memberships.bulkCreateMemberships($scope.project.id,
-                                                      invitations, invitation_extra_text)
-                promise.then(onSuccess, onError)
-
-        submitButton = $el.find(".submit-button")
-
-        $el.on "submit", "form", submit
-
-    return {link: link}
-
-module.directive("tgLbCreateMembers", ["$tgResources", "$rootScope", "$tgConfirm", "$tgLoading",
-                                       "lightboxService", "$compile", CreateMembersDirective])
+module.directive("tgLightboxAddMembersWarningMessage", [LightboxAddMembersWarningMessageDirective])
diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index e36d8f92..be2a7ad9 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -49,10 +49,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         "tgAppMetaService",
         "$translate",
         "$tgAuth"
+        "tgLightboxFactory"
     ]
 
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls, @analytics,
-                  @appMetaService, @translate, @tgAuth) ->
+                  @appMetaService, @translate, @auth, @lightboxFactory) ->
         bindMethods(@)
 
         @scope.project = {}
@@ -64,7 +65,6 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
            title = @translate.instant("ADMIN.MEMBERSHIPS.PAGE_TITLE", {projectName:  @scope.project.name})
            description = @scope.project.description
            @appMetaService.setAll(title, description)
-           @._checkUsersLimit()
 
         promise.then null, @.onInitialDataError.bind(@)
 
@@ -79,8 +79,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
 
             @scope.projectId = project.id
             @scope.project = project
-            @scope.$emit('project:loaded', project)
 
+            @scope.canAddUsers = project.max_memberships == null || project.max_memberships > project.total_memberships
+
+            @scope.$emit('project:loaded', project)
             return project
 
     loadMembers: ->
@@ -99,7 +101,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         return @.loadProject().then () =>
             return @q.all([
                 @.loadMembers(),
-                @tgAuth.refresh()
+                @auth.refresh()
             ])
 
     getUrlFilters: ->
@@ -107,16 +109,25 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         filters.page = 1 if not filters.page
         return filters
 
+    # Actions
+
     addNewMembers:  ->
-        @rootscope.$broadcast("membersform:new")
+        @lightboxFactory.create(
+            'tg-lb-add-members',
+            {
+                "class": "lightbox lightbox-add-member",
+                "project": "project"
+            },
+            {
+                "project": @scope.project
+            }
+        )
 
-    _checkUsersLimit: ->
-        @scope.canAddUsers = @.project.get('total_memberships') > @.project.get('max_memberships')
-        @.maxMembers = @.project.get('max_memberships')
-
-    limitUsersWarning: ->
+    showLimitUsersWarningMessage: ->
         title = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING")
-        message = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE", {members: @.maxMembers})
+        message = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE", {
+            members: @scope.project.max_memberships
+        })
         icon = "/" + window._version + "/svg/icons/team-question.svg"
         @confirm.success(title, message,icon)
 
@@ -266,6 +277,18 @@ MembershipsRowAdminCheckboxDirective = ($log, $repo, $confirm, $template, $compi
     template = $template.get("admin/admin-memberships-row-checkbox.html", true)
 
     link = ($scope, $el, $attrs) ->
+        $scope.$on "$destroy", ->
+            $el.off()
+
+        if not $attrs.tgMembershipsRowAdminCheckbox?
+            return $log.error "MembershipsRowAdminCheckboxDirective: the directive need a member"
+
+        member = $scope.$eval($attrs.tgMembershipsRowAdminCheckbox)
+
+        if member.is_owner
+            $el.find(".js-check").remove()
+            return
+
         render = (member) ->
             ctx = {inputId: "is-admin-#{member.id}"}
 
@@ -274,15 +297,6 @@ MembershipsRowAdminCheckboxDirective = ($log, $repo, $confirm, $template, $compi
 
             $el.html(html)
 
-        if not $attrs.tgMembershipsRowAdminCheckbox?
-            return $log.error "MembershipsRowAdminCheckboxDirective: the directive need a member"
-
-        member = $scope.$eval($attrs.tgMembershipsRowAdminCheckbox)
-        html = render(member)
-
-        if member.is_admin
-            $el.find(":checkbox").prop("checked", true)
-
         $el.on "click", ":checkbox", (event) =>
             onSuccess = ->
                 $confirm.notify("success")
@@ -296,8 +310,10 @@ MembershipsRowAdminCheckboxDirective = ($log, $repo, $confirm, $template, $compi
             member.is_admin = target.prop("checked")
             $repo.save(member).then(onSuccess, onError)
 
-        $scope.$on "$destroy", ->
-            $el.off()
+        html = render(member)
+
+        if member.is_admin
+            $el.find(":checkbox").prop("checked", true)
 
     return {link: link}
 
@@ -469,4 +485,19 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
 
 
 module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile",
-                                             "$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective])
+                                             "$translate", MembershipsRowActionsDirective])
+
+
+#############################################################################
+## No more memberships explanation directive
+#############################################################################
+
+NoMoreMembershipsExplanationDirective = () ->
+    return {
+          templateUrl: "admin/no-more-memberships-explanation.html"
+          scope: {
+              project: "="
+          }
+    }
+
+module.directive("tgNoMoreMembershipsExplanation", [NoMoreMembershipsExplanationDirective])
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 8bd9721b..2283333c 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ New member",
             "ADD_BUTTON_TITLE": "Add new member",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
@@ -918,7 +918,9 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Type an Email"
+            "PLACEHOLDER_TYPE_EMAIL": "Type an Email",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
             "TITLE": "You can not leave the project without owner",
diff --git a/app/partials/admin/admin-memberships-row-checkbox.jade b/app/partials/admin/admin-memberships-row-checkbox.jade
index efa25b23..828dd28e 100644
--- a/app/partials/admin/admin-memberships-row-checkbox.jade
+++ b/app/partials/admin/admin-memberships-row-checkbox.jade
@@ -1,4 +1,4 @@
-.check
+.check.js-check
     input(type="checkbox", id!="<%- inputId %>")
     div
     span.check-text.check-yes(translate="COMMON.YES")
diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade
index b97c5451..46064518 100644
--- a/app/partials/admin/admin-memberships.jade
+++ b/app/partials/admin/admin-memberships.jade
@@ -1,35 +1,30 @@
 doctype html
 
-div.wrapper.memberships(ng-controller="MembershipsController as ctrl",
-                        ng-init="section='admin'; sectionName='ADMIN.MEMBERSHIPS.TITLE'", tg-memberships)
+div.wrapper.memberships(
+    ng-controller="MembershipsController as ctrl"
+    ng-init="section='admin'; sectionName='ADMIN.MEMBERSHIPS.TITLE'"
+    tg-memberships
+)
     tg-project-menu
 
     sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="memberships")
         include ../includes/modules/admin-menu
 
-    section.main.admin-membership
+    section.main.admin-membership.admin-common
         .header-with-actions
             header
                 include ../includes/components/mainTitle
+                tg-no-more-memberships-explanation(ng-if="canAddUsers == false", project="project")
 
             .action-buttons
-                a.limit-users-warning(
-                    ng-if="!canAddUsers"
-                    translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING"
-                    translate-values="{members: ctrl.maxMembers}"
-                    href=""
-                    ng-click="ctrl.limitUsersWarning()"
-                )
                 button.button-green(
+                    translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
                     title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
                     ng-click="ctrl.addNewMembers()"
-                    translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
-                    ng-disabled="!canAddUsers"
+                    ng-disabled="canAddUsers == false"
                 )
 
+
         include ../includes/modules/admin/admin-membership-table
 
         div.paginator.memberships-paginator
-
-    div.lightbox.lightbox-add-member(tg-lb-create-members)
-        include ../includes/modules/lightbox-add-member
diff --git a/app/partials/admin/lightbox-add-members-no-more=memberships-warning-message.jade b/app/partials/admin/lightbox-add-members-no-more=memberships-warning-message.jade
new file mode 100644
index 00000000..304e5f09
--- /dev/null
+++ b/app/partials/admin/lightbox-add-members-no-more=memberships-warning-message.jade
@@ -0,0 +1,11 @@
+p.member-limit-warning(
+    ng-if="project.i_am_owner == true"
+    translate="LIGHTBOX.CREATE_MEMBER.LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER"
+    translate-values="{maxMembers: project.max_memberships}"
+)
+
+p.member-limit-warning(
+    ng-if="project.i_am_owner == false"
+    translate="LIGHTBOX.CREATE_MEMBER.LIMIT_USERS_WARNING_MESSAGE"
+    translate-values="{maxMembers: project.max_memberships}"
+)
diff --git a/app/partials/admin/lightbox-add-members.jade b/app/partials/admin/lightbox-add-members.jade
new file mode 100644
index 00000000..2cd98ac7
--- /dev/null
+++ b/app/partials/admin/lightbox-add-members.jade
@@ -0,0 +1,58 @@
+a.close(
+    href=""
+    title="close"
+)
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
+.add-member-wrapper
+    h2.title(translate="LIGHTBOX.ADD_MEMBER.TITLE")
+    form.add-member-form(ng-submit="vm.submit()")
+        .add-single-member(ng-repeat="member in vm.memberInvites")
+            fieldset
+                input(
+                    type="email"
+                    required
+                    placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
+                    data-required="true"
+                    data-type="email"
+                    ng-model="member.email"
+                )
+            fieldset
+                select(
+                    ng-if="vm.project"
+                    ng-model="member.role_id"
+                    ng-options="role.id as role.name for role in vm.project.roles"
+                )
+            fieldset
+                a.add-fieldset.ng-animate-disabled(
+                    href=""
+                    ng-click="vm.addSingleMember()"
+                    ng-if="$last && vm.canAddUsers"
+                )
+                    svg.icon.icon-add
+                        use(xlink:href="#icon-add")
+                a.remove-fieldset.ng-animate-disabled(
+                    href=""
+                    ng-click="vm.removeSingleMember($index)"
+                    ng-if="!$last || ($last && !vm.canAddUsers && vm.membersLimit > 1)"
+                )
+                    svg.icon.icon-trash
+                        use(xlink:href="#icon-trash")
+
+        tg-lightbox-add-members-warning-message(ng-if="vm.showWarningMessage", project="vm.project")
+
+        fieldset.invitation-text
+            textarea(
+                ng-attr-placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_INVITATION_TEXT' | translate}}"
+                maxlength="255"
+                ng-model="vm.invitationText"
+            )
+
+        button.button-green.submit-button(
+            type="submit"
+            title="{{'COMMON.CREATE' | translate}}"
+            translate="COMMON.CREATE"
+            tg-loading="vm.submitInvites"
+        )
+
+    p.help-text(translate="LIGHTBOX.ADD_MEMBER.HELP_TEXT")
diff --git a/app/partials/admin/no-more-memberships-explanation.jade b/app/partials/admin/no-more-memberships-explanation.jade
new file mode 100644
index 00000000..704fa69e
--- /dev/null
+++ b/app/partials/admin/no-more-memberships-explanation.jade
@@ -0,0 +1,11 @@
+p.admin-subtitle(
+    ng-if="project.i_am_owner == true"
+    translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER"
+    translate-values="{members: project.total_memberships}"
+)
+
+p.admin-subtitle(
+    ng-if="project.i_am_owner == false"
+    translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN"
+    translate-values="{members: project.total_memberships}"
+)
diff --git a/app/partials/includes/modules/lightbox-add-member.jade b/app/partials/includes/modules/lightbox-add-member.jade
deleted file mode 100644
index 31aa886b..00000000
--- a/app/partials/includes/modules/lightbox-add-member.jade
+++ /dev/null
@@ -1,12 +0,0 @@
-a.close(href="", title="close")
-    svg.icon.icon-close
-        use(xlink:href="#icon-close")
-form
-    h2.title(translate="LIGHTBOX.ADD_MEMBER.TITLE")
-
-    //- Form is set in a directive
-    .add-member-forms
-
-    button.button-green.submit-button(type="submit", title="{{'COMMON.CREATE' | translate}}", translate="COMMON.CREATE")
-
-    p.help-text(translate="LIGHTBOX.ADD_MEMBER.HELP_TEXT")
diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss
index fdec382a..a531fad6 100644
--- a/app/styles/core/base.scss
+++ b/app/styles/core/base.scss
@@ -88,12 +88,14 @@ body {
 }
 
 .header-with-actions {
-    align-content: stretch;
     align-items: center;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
     margin-bottom: 1rem;
+    header {
+        flex: 1;
+    }
     .action-buttons {
         flex-shrink: 0;
     }
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index a3b0d9ac..f4d63c68 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -142,54 +142,62 @@
 
 .lightbox-add-member {
     .add-member-wrapper {
+        max-width: 600px;
+        width: 90%;
+    }
+    .add-single-member {
+        align-items: center;
         display: flex;
+        justify-content: space-between;
         margin-bottom: .5rem;
         &:last-child {
             margin-bottom: 0;
         }
         fieldset {
-            position: relative;
-            &:first-child {
-                flex-basis: 400px;
-                flex-grow: 3;
-            }
+            display: inline-block;
+            flex: 1;
+            margin: 0 .5rem 0 0;
             &:last-child {
-                flex-basis: 200px;
-                flex-grow: 1;
-                margin-left: .5rem;
+                flex-basis: 30px;
+                flex-grow: 0;
+                flex-shrink: 0;
             }
+            &:first-child {
+                flex-basis: 20%;
+            }
+
         }
     }
-    .extra-text {
-        margin-top: 1rem;
-    }
-    fieldset {
-        margin-bottom: 0;
-    }
-    select {
-        width: 80%;
-    }
     .icon {
+        @include svg-size(1.25rem);
         fill: $gray;
         margin-left: .5rem;
-        transition: fill .2s;
     }
     .icon-add {
         &:hover {
-            fill: $primary-light;
+            fill: $primary;
+            transition: fill .2s;
         }
     }
     .icon-trash {
+        fill: $red-light;
         &:hover {
             fill: $red;
+            transition: fill .2s;
         }
     }
-    .button {
-        margin-top: 1rem;
+    .member-limit-warning {
+        @extend %small;
+        background: $red-light;
+        color: $white;
+        margin: 1rem 0;
+        padding: 1rem 2rem;
+        text-align: center;
     }
     .help-text {
         @extend %small;
-        padding: .5rem 1rem;
+        @extend %light;
+        margin-top: 1rem;
     }
     .checksley-error-list {
         right: .5rem;

From 3cf38056ec7b0aa729a2584607b96a4d6c171e80 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 22 Mar 2016 12:48:30 +0100
Subject: [PATCH 110/155] fixing e2e tests

---
 app/coffee/modules/backlog/main.coffee   |  2 +-
 app/coffee/modules/common/confirm.coffee |  1 +
 e2e/helpers/admin-attributes-helper.js   |  4 +-
 e2e/helpers/admin-permissions.js         |  4 +-
 e2e/helpers/backlog-helper.js            |  2 +-
 e2e/helpers/common-helper.js             |  2 +-
 e2e/helpers/detail-helper.js             | 33 +++++++++----
 e2e/helpers/issues-helper.js             |  6 +--
 e2e/helpers/kanban-helper.js             |  2 +-
 e2e/helpers/taskboard-helper.js          | 12 ++---
 e2e/helpers/us-detail-helper.js          |  4 +-
 e2e/helpers/wiki-helper.js               |  2 +-
 e2e/shared/detail.js                     | 23 +++++----
 e2e/suites/admin/project/modules.e2e.js  | 20 ++++----
 e2e/suites/auth/auth.e2e.js              | 59 ++++++++++++++++--------
 e2e/suites/backlog.e2e.js                | 15 +++---
 e2e/suites/discover/discover-home.e2e.js | 12 +++--
 e2e/suites/home.e2e.js                   |  2 +-
 e2e/suites/tasks/task-detail.e2e.js      |  2 +-
 e2e/suites/tasks/taskboard.e2e.js        |  2 +-
 e2e/suites/user-profile/feedback.e2e.js  |  6 ++-
 e2e/utils/common.js                      | 23 +++++----
 22 files changed, 141 insertions(+), 97 deletions(-)

diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index ac0191dd..f56a0b9c 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -959,7 +959,7 @@ UsPointsDirective = ($tgEstimationsService, $repo, $tgTemplate) ->
             $el.find(".pop-role").popover().open(() -> $(this).remove())
 
         bindClickElements = () ->
-            $el.on "click", "a.us-points span", (event) ->
+            $el.on "click", "a.us-points", (event) ->
                 event.preventDefault()
                 event.stopPropagation()
                 us = $scope.$eval($attrs.tgBacklogUsPoints)
diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index e9e6184e..868920bc 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -167,6 +167,7 @@ class ConfirmService extends taiga.Service
         el = angular.element(".lightbox-generic-success")
 
         el.find("img").remove()
+
         detailImage = $('<img>').addClass('lb-icon').attr('src', icon)
         if detailImage
             el.find('section').prepend(detailImage)
diff --git a/e2e/helpers/admin-attributes-helper.js b/e2e/helpers/admin-attributes-helper.js
index ad02791b..00ade8b7 100644
--- a/e2e/helpers/admin-attributes-helper.js
+++ b/e2e/helpers/admin-attributes-helper.js
@@ -16,7 +16,7 @@ helper.getSection = function(item) {
             return section.$$('.ui-sortable > div');
         },
         delete: function(row) {
-            let deleteButton = row.$$('.icon-delete').first();
+            let deleteButton = row.$$('.icon-trash').first();
 
             return browser.actions()
                 .mouseMove(deleteButton)
@@ -41,7 +41,7 @@ helper.getStatusNames = function(section) {
 helper.getForm = function(form) {
     return {
         save: function() {
-            let saveButton = form.$('.icon-floppy');
+            let saveButton = form.$('.icon-save');
 
             browser.actions()
                 .mouseMove(saveButton)
diff --git a/e2e/helpers/admin-permissions.js b/e2e/helpers/admin-permissions.js
index 7a4c28d8..c21ecc13 100644
--- a/e2e/helpers/admin-permissions.js
+++ b/e2e/helpers/admin-permissions.js
@@ -16,8 +16,8 @@ helper.getRoles = function() {
 };
 
 helper.editRole = async function(roleName) {
-    let elm = $('div[tg-edit-role]');
-    let editButton = elm.$('.icon-edit');
+    let elm = $('tg-edit-role');
+    let editButton = elm.$('.edit-value');
 
     await browser.actions()
         .mouseMove(editButton)
diff --git a/e2e/helpers/backlog-helper.js b/e2e/helpers/backlog-helper.js
index 6f04d662..37b06495 100644
--- a/e2e/helpers/backlog-helper.js
+++ b/e2e/helpers/backlog-helper.js
@@ -87,7 +87,7 @@ helper.getCreateEditMilestone = function() {
             el.$('button[type="submit"]').click();
         },
         delete: function() {
-            el.$('.delete-sprint .icon-delete').click();
+            el.$('.delete-sprint').click();
         }
     };
 
diff --git a/e2e/helpers/common-helper.js b/e2e/helpers/common-helper.js
index df99bd9f..37f95d9d 100644
--- a/e2e/helpers/common-helper.js
+++ b/e2e/helpers/common-helper.js
@@ -19,7 +19,7 @@ helper.assignToLightbox = function() {
             return utils.lightbox.close(el);
         },
         close: function() {
-            el.$$('.icon-delete').first().click();
+            el.$$('.icon-close').first().click();
         },
         selectFirst: function() {
             el.$$('div[data-user-id]').first().click();
diff --git a/e2e/helpers/detail-helper.js b/e2e/helpers/detail-helper.js
index 81c16bf1..0bd06a59 100644
--- a/e2e/helpers/detail-helper.js
+++ b/e2e/helpers/detail-helper.js
@@ -294,7 +294,8 @@ helper.attachment = function() {
                 return !!count;
             }, 5000);
 
-            await el.$$('tg-attachment .editable-attachment-comment input').last().sendKeys(name);
+
+            await el.$('tg-attachment .editable-attachment-comment input').sendKeys(name);
             await browser.actions().sendKeys(protractor.Key.ENTER).perform();
             await browser.executeScript(toggleInput);
             await browser.waitForAngular();
@@ -303,7 +304,17 @@ helper.attachment = function() {
 
         renameLastAttchment: async function (name) {
             await browser.actions().mouseMove(el.$$('tg-attachment').last()).perform();
-            await el.$$('tg-attachment .attachment-settings .icon-edit').last().click();
+
+            let settingsGroup = el.$$('tg-attachment .attachment-settings').last();
+
+            await settingsGroup.$$('.settings').first().click();
+
+            await browser.wait(async () => {
+                let count = await $$('tg-attachment .editable-attachment-comment input').count();
+
+                return !!count;
+            }, 5000);
+
             await el.$$('tg-attachment .editable-attachment-comment input').last().sendKeys(name);
             await browser.actions().sendKeys(protractor.Key.ENTER).perform();
             await browser.waitForAngular();
@@ -341,7 +352,7 @@ helper.attachment = function() {
             await browser.actions().mouseMove(el.$$('tg-attachment').last()).perform();
             await el.$$('tg-attachment .attachment-settings .icon-edit').last().click();
             await el.$$('tg-attachment .editable-attachment-deprecated input').last().click();
-            await el.$$('tg-attachment .attachment-settings .editable-settings.icon-floppy').last().click();
+            await el.$$('tg-attachment .attachment-settings').last().$$('.editable-settings').first().click();
             await browser.waitForAngular();
         },
 
@@ -358,7 +369,7 @@ helper.attachment = function() {
 
             // close edit
             if(isEditable) {
-                let iconDelete = await attachment.$('.attachment-settings .icon-delete');
+                let iconDelete = await attachment.$$('.attachment-settings a').get(1);
                 await browser.actions().mouseMove(iconDelete).perform();
 
                 iconDelete.click();
@@ -366,7 +377,7 @@ helper.attachment = function() {
                 await browser.waitForAngular();
             }
 
-            let iconDelete = await attachment.$('.attachment-settings .icon-delete');
+            let iconDelete = await attachment.$$('.attachment-settings a').get(1);
             await browser.actions().mouseMove(iconDelete).perform();
 
             iconDelete.click();
@@ -377,8 +388,8 @@ helper.attachment = function() {
 
         dragLastAttchmentToFirstPosition: async function() {
             await browser.actions().mouseMove(el.$$('tg-attachment').last()).perform();
-            let lastDraggableAttachment = el.$$('tg-attachment .attachment-settings .icon-drag-v').last();
-            let destination = el.$$('tg-attachment .attachment-settings .icon-drag-v').first();
+            let lastDraggableAttachment = el.$$('tg-attachment .attachment-settings a').last();
+            let destination = el.$$('tg-attachment .attachment-settings').first();
             await utils.common.drag(lastDraggableAttachment, destination);
         },
 
@@ -415,11 +426,13 @@ helper.watchers = function() {
         },
 
         removeAllWatchers: async function() {
-            let totalWatchers = await await el.$$('.icon-delete').count();
+            let totalWatchers = await await el.$$('.js-delete-watcher').count();
+
+            if(!totalWatchers) return;
 
             let htmlChanges = htmlChanges = await utils.common.outerHtmlChanges(el);
             while (totalWatchers > 0) {
-                await el.$$('.icon-delete').first().click();
+                await el.$$('.js-delete-watcher').first().click();
                 await utils.lightbox.confirm.ok();
                 totalWatchers --;
             }
@@ -442,7 +455,7 @@ helper.watchersLightbox = function() {
             return utils.lightbox.close(el);
         },
         close: function() {
-            el.$$('.icon-delete').first().click();
+            el.$$('.icon-close').first().click();
         },
         selectFirst: async function() {
             el.$$('div[data-user-id]').first().click();
diff --git a/e2e/helpers/issues-helper.js b/e2e/helpers/issues-helper.js
index dad32765..ef66b5d0 100644
--- a/e2e/helpers/issues-helper.js
+++ b/e2e/helpers/issues-helper.js
@@ -120,12 +120,12 @@ helper.backToFilters = function() {
 };
 
 helper.removeFilters = async function() {
-    let count = await $$('.filters-applied .icon-delete').count();
+    let count = await $$('.filters-applied .single-filter.selected').count();
 
     while(count) {
-        $$('.filters-applied .icon-delete').get(0).click();
+        $$('.single-filter.selected').get(0).click();
 
-        count = await $$('.filters-applied .icon-delete').count();
+        count = await $$('.single-filter.selected').count();
     }
 };
 
diff --git a/e2e/helpers/kanban-helper.js b/e2e/helpers/kanban-helper.js
index 424415d9..3e0e343c 100644
--- a/e2e/helpers/kanban-helper.js
+++ b/e2e/helpers/kanban-helper.js
@@ -7,7 +7,7 @@ helper.getHeaderColumns = function() {
 };
 
 helper.openNewUsLb = function(column) {
-    helper.getHeaderColumns().get(column).$('.icon-plus').click();
+    helper.getHeaderColumns().get(column).$$('.option').get(4).click();
 };
 
 helper.getColumns = function() {
diff --git a/e2e/helpers/taskboard-helper.js b/e2e/helpers/taskboard-helper.js
index 6ca5c2b8..44e9971e 100644
--- a/e2e/helpers/taskboard-helper.js
+++ b/e2e/helpers/taskboard-helper.js
@@ -19,7 +19,7 @@ helper.getBoxTasks = function(row, column) {
 helper.openNewTaskLb = function(row) {
     let us = helper.usertories().get(row);
 
-    us.$('.icon-plus').click();
+    us.$('.icon-add').click();
 };
 
 helper.openBulkTaskLb = function(row) {
@@ -29,25 +29,25 @@ helper.openBulkTaskLb = function(row) {
 };
 
 helper.foldRow = function(row) {
-    let icon = $$('.icon-vfold.vfold').get(row);
+    let icon = $$('.icon-fold-row.vfold').get(row);
 
     icon.click();
 };
 
 helper.unFoldRow = function(row) {
-    let icon = $$('.icon-vunfold.vunfold').get(row);
+    let icon = $$('.icon-unfold-row.vunfold').get(row);
 
     icon.click();
 };
 
 helper.foldColumn = function(row) {
-    let icon = $$('.icon-vfold.hfold').get(row);
+    let icon = $$('.icon-fold-row.hfold').get(row);
 
     icon.click();
 };
 
 helper.unFoldColumn = function(row) {
-    let icon = $$('.icon-vunfold.hunfold').get(row);
+    let icon = $$('.icon-fold-row.hunfold').get(row);
 
     icon.click();
 };
@@ -57,7 +57,7 @@ helper.editTask = function(row, column, task) {
 };
 
 helper.toggleGraph = function() {
-    $('.large-summary svg').click();
+    $('.icon-graph').click();
 };
 
 helper.getCreateTask = function() {
diff --git a/e2e/helpers/us-detail-helper.js b/e2e/helpers/us-detail-helper.js
index ebc1ff80..9e538ab0 100644
--- a/e2e/helpers/us-detail-helper.js
+++ b/e2e/helpers/us-detail-helper.js
@@ -58,7 +58,7 @@ helper.relatedTaskForm = async function(form, name, status, assigned_to) {
     await assignToLightbox.selectFirst();
     await assignToLightbox.waitClose();
 
-    form.$('.icon-floppy').click();
+    form.$('.icon-save').click();
 };
 
 helper.createRelatedTasks = function(name, status, assigned_to) {
@@ -86,7 +86,7 @@ helper.deleteRelatedTask = function(taskIndex, name, status, assigned_to) {
 
     browser
         .actions()
-        .mouseMove(task.$('.icon-delete'))
+        .mouseMove(task.$('.icon-trash'))
         .click()
         .perform();
 
diff --git a/e2e/helpers/wiki-helper.js b/e2e/helpers/wiki-helper.js
index 829ddb23..dcbabea9 100644
--- a/e2e/helpers/wiki-helper.js
+++ b/e2e/helpers/wiki-helper.js
@@ -22,7 +22,7 @@ helper.links = function() {
         },
 
         deleteLink: async function(link){
-            link.$(".icon-delete").click();
+            link.$(".icon-trash").click();
             await utils.lightbox.confirm.ok();
             await browser.waitForAngular();
         }
diff --git a/e2e/shared/detail.js b/e2e/shared/detail.js
index 26d87fe4..a9b1a361 100644
--- a/e2e/shared/detail.js
+++ b/e2e/shared/detail.js
@@ -105,7 +105,9 @@ shared.assignedToTesting = function() {
 
         await assignedTo.clear();
 
-        expect(assignedTo.isUnassigned()).to.be.eventually.true;
+        let isUnsassigned = assignedTo.isUnassigned();
+
+        expect(isUnsassigned).to.be.equal.true;
     });
 
     it('filter', async function () {
@@ -118,19 +120,18 @@ shared.assignedToTesting = function() {
 
         let names = await assignToLightbox.getNames();
 
-        await assignToLightbox.filter(names[0]);
+        await assignToLightbox.filter(names[1]);
 
         let newNames = await assignToLightbox.getNames();
 
-        expect(newNames).to.have.length(1);
+        expect(newNames).to.have.length.below(3);
 
         assignToLightbox.selectFirst();
 
         await assignToLightbox.waitClose();
-        await notifications.success.close();
     });
 
-    it('keyboard navigatin', async function() {
+    it('keyboard navigation', async function() {
         let assignedTo = detailHelper.assignedTo();
         let assignToLightbox = commonHelper.assignToLightbox();
 
@@ -333,7 +334,6 @@ shared.watchersTesting = function() {
 
         await watchersLightboxHelper.selectFirst();
         await watchersLightboxHelper.waitClose();
-        await notifications.success.close();
     });
 
     it('keyboard navigatin', async function() {
@@ -387,13 +387,12 @@ shared.customFields = function(typeIndex) {
     it('text create', async function() {
         let customFields = customFieldsHelper.getDetailFields();
 
-        // await browser.sleep(4000);
         let count = await customFields.count();
 
         let textField = customFields.get(count - 2);
 
         textField.$('input').sendKeys('test text');
-        textField.$('.icon-floppy').click();
+        textField.$('.js-save-description').click();
 
         // debounce
         await browser.sleep(2000);
@@ -409,10 +408,10 @@ shared.customFields = function(typeIndex) {
 
         let textField = customFields.get(count - 2);
 
-        textField.$('.icon-edit').click();
+        textField.$('.js-edit-description').click();
 
         textField.$('input').sendKeys('test text edit');
-        textField.$('.icon-floppy').click();
+        textField.$('.js-save-description').click();
 
         // debounce
         await browser.sleep(2000);
@@ -429,7 +428,7 @@ shared.customFields = function(typeIndex) {
         let textField = customFields.get(count - 1);
 
         textField.$('textarea').sendKeys('test text2');
-        textField.$('.icon-floppy').click();
+        textField.$('.js-save-description').click();
 
         // debounce
         await browser.sleep(2000);
@@ -447,7 +446,7 @@ shared.customFields = function(typeIndex) {
 
         textField.$('.icon-edit').click();
         textField.$('textarea').sendKeys('test text2 edit');
-        textField.$('.icon-floppy').click();
+        textField.$('.js-save-description').click();
 
         // // debounce
         await browser.sleep(2000);
diff --git a/e2e/suites/admin/project/modules.e2e.js b/e2e/suites/admin/project/modules.e2e.js
index 42ea3c3d..bfc2976f 100644
--- a/e2e/suites/admin/project/modules.e2e.js
+++ b/e2e/suites/admin/project/modules.e2e.js
@@ -6,7 +6,7 @@ var chaiAsPromised = require('chai-as-promised');
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-describe('modules', function() {
+describe.only('modules', function() {
     before(async function(){
         browser.get(browser.params.glob.host + 'project/project-0/admin/project-profile/modules');
 
@@ -16,19 +16,17 @@ describe('modules', function() {
     });
 
     it('disable module', async function() {
-        let functionalities = $$('.functionality');
+        let functionalities = $$('.module');
 
         let functionality = functionalities.get(0);
 
-        let label = functionality.$('label');
+        let label = functionality.$('.check div');
 
         browser.actions()
             .mouseMove(label)
             .click()
             .perform();
 
-        $('button[type="submit"]').click();
-
         let active = await utils.common.hasClass(functionality, 'active');
 
         expect(utils.notifications.success.open()).to.be.eventually.equal(true);
@@ -38,19 +36,17 @@ describe('modules', function() {
     });
 
     it('enable module', async function() {
-        let functionalities = $$('.functionality');
+        let functionalities = $$('.module');
 
         let functionality = functionalities.get(0);
 
-        let label = functionality.$('label');
+        let label = functionality.$('.check div');
 
         browser.actions()
             .mouseMove(label)
             .click()
             .perform();
 
-        $('button[type="submit"]').click();
-
         let active = await utils.common.hasClass(functionality, 'active');
 
         expect(utils.notifications.success.open()).to.be.eventually.equal(true);
@@ -60,9 +56,9 @@ describe('modules', function() {
     });
 
     it('enable videoconference', async function() {
-        let functionality = $$('.functionality').get(4);
+        let functionality = $$('.module').get(4);
 
-        let label = functionality.$('label');
+        let label = functionality.$('.check div');
 
         browser.actions()
             .mouseMove(label)
@@ -77,7 +73,7 @@ describe('modules', function() {
 
         salt.sendKeys('abccceee');
 
-        $('button[type="submit"]').click();
+        functionality.$('.icon-save').click();
         expect(utils.notifications.success.open()).to.be.eventually.equal(true);
     });
 });
diff --git a/e2e/suites/auth/auth.e2e.js b/e2e/suites/auth/auth.e2e.js
index 9cac8f62..0e9dbc5f 100644
--- a/e2e/suites/auth/auth.e2e.js
+++ b/e2e/suites/auth/auth.e2e.js
@@ -7,6 +7,10 @@ chai.use(chaiAsPromised);
 var expect = chai.expect;
 
 describe('auth', function() {
+    before(async function() {
+        await utils.common.logout();
+    });
+
     it('login', async function() {
         browser.get(browser.params.glob.host + 'login');
 
@@ -32,8 +36,8 @@ describe('auth', function() {
     describe('page without perms', function() {
         let path = 'project/project-4/';
 
-        before(function() {
-            return utils.common.topMenuOption(6);
+        before(async function() {
+            await utils.common.logout();
         });
 
         it("redirect to login", async function() {
@@ -58,8 +62,8 @@ describe('auth', function() {
     describe("user", function() {
         var user = {};
 
-        before(function() {
-            utils.common.login('admin', '123123');
+        before(async function() {
+            await utils.common.logout();
         });
 
         it("logout", async function() {
@@ -96,7 +100,7 @@ describe('auth', function() {
                 expect($$('.checksley-required').count()).to.be.eventually.equal(4);
             });
 
-            it('register ok', function() {
+            it('register ok', async function() {
                 browser.get(browser.params.glob.host + 'register');
 
                 user.username = "username-" + Math.random();
@@ -111,40 +115,57 @@ describe('auth', function() {
 
                 $('.submit-button').click();
 
-                expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host);
+                await utils.common.waitLoader();
+
+                let currentUrl = await browser.getCurrentUrl();
+
+                expect(currentUrl).to.be.equal(browser.params.glob.host);
+
+                browser.get(browser.params.glob.host + '/');
+
+                await utils.common.waitLoader();
+                await utils.common.closeJoyride();
             });
         });
 
         describe("change password", function() {
-            beforeEach(async function() {
-                await utils.common.login(user.username, user.password);
+            it("error", async function() {
+                browser.get(browser.params.glob.host + 'user-settings/user-change-password');
+                await browser.waitForAngular();
 
-                return browser.get(browser.params.glob.host + 'user-settings/user-change-password');
-            });
-
-            it("error", function() {
                 $('#current-password').sendKeys('wrong');
                 $('#new-password').sendKeys('123123');
                 $('#retype-password').sendKeys('123123');
 
                 $('.submit-button').click();
 
-                expect(utils.notifications.error.open()).to.be.eventually.equal(true);
+                let open = await utils.notifications.error.open();
+                expect(open).to.be.equal(true);
             });
 
-            it("success", function() {
+            it("success", async function() {
+                browser.get(browser.params.glob.host + 'user-settings/user-change-password');
+                await browser.waitForAngular();
+
                 $('#current-password').sendKeys(user.password);
                 $('#new-password').sendKeys(user.password);
                 $('#retype-password').sendKeys(user.password);
 
                 $('.submit-button').click();
 
-                expect(utils.notifications.success.open()).to.be.eventually.equal(true);
+                let open = await utils.notifications.success.open();
+                expect(open).to.be.equal(true);
+
+                await utils.notifications.success.close();
             });
         });
 
         describe("remember password", function() {
-            beforeEach(function() {
+            before(async function() {
+                await utils.common.logout();
+            });
+
+            beforeEach(async function() {
                 browser.get(browser.params.glob.host + 'forgot-password');
             });
 
@@ -176,8 +197,8 @@ describe('auth', function() {
         });
 
         describe("accout", function() {
-            before(function() {
-                utils.common.login(user.username, user.password);
+            before(async function() {
+                await utils.common.login(user.username, user.password);
             });
 
             it("delete", async function() {
@@ -188,7 +209,7 @@ describe('auth', function() {
 
                 utils.common.takeScreenshot("auth", "delete-account");
 
-                $('.lightbox-delete-account .button-green').click();
+                $('.lightbox-delete-account .button-red').click();
 
                 let url = await browser.getCurrentUrl();
 
diff --git a/e2e/suites/backlog.e2e.js b/e2e/suites/backlog.e2e.js
index d964de6a..1fef1b0e 100644
--- a/e2e/suites/backlog.e2e.js
+++ b/e2e/suites/backlog.e2e.js
@@ -203,7 +203,7 @@ describe('backlog', function() {
         let dragableElements = backlogHelper.userStories();
 
         let dragElement = dragableElements.get(1);
-        let dragElementHandler = dragElement.$('.icon-drag-v');
+        let dragElementHandler = dragElement.$('.icon-drag');
         let draggedElementRef = await backlogHelper.getUsRef(dragElement);
 
         await utils.common.drag(dragElementHandler, dragableElements.get(0));
@@ -254,7 +254,7 @@ describe('backlog', function() {
         // the us 1 and 2 are selected on the previous test
 
         let dragElement = dragableElements.get(0);
-        let dragElementHandler = dragElement.$('.icon-drag-v');
+        let dragElementHandler = dragElement.$('.icon-drag');
 
         await utils.common.drag(dragElementHandler, sprint);
         await browser.waitForAngular();
@@ -269,7 +269,7 @@ describe('backlog', function() {
 
         let dragableElements = backlogHelper.userStories();
         let dragElement = dragableElements.get(0);
-        let dragElementHandler = dragElement.$('.icon-drag-v');
+        let dragElementHandler = dragElement.$('.icon-drag');
 
         let draggedElementRef = await backlogHelper.getUsRef(dragElement);
 
@@ -361,7 +361,7 @@ describe('backlog', function() {
 
         let usPoints = await backlogHelper.getUsPoints(0);
 
-        expect(usPoints).to.match(/\d+\s\/\s\d+/);
+        expect(usPoints).to.match(/[0-9?]+\s\/\s[0-9?]+/);
     });
 
     describe('milestones', function() {
@@ -403,7 +403,8 @@ describe('backlog', function() {
             createMilestoneLightbox.name().sendKeys(sprintName);
 
             createMilestoneLightbox.submit();
-            await browser.waitForAngular();
+
+            await createMilestoneLightbox.waitClose();
 
             let sprintTitles = await backlogHelper.getSprintsTitles();
 
@@ -605,7 +606,7 @@ describe('backlog', function() {
             await backlogHelper.setUsStatus(2, 5);
 
             let dragElement =  backlogHelper.userStories().get(2);
-            let dragElementHandler = dragElement.$('.icon-drag-v');
+            let dragElementHandler = dragElement.$('.icon-drag');
 
             let sprint = backlogHelper.sprints().last();
             await utils.common.drag(dragElementHandler, sprint);
@@ -640,7 +641,7 @@ describe('backlog', function() {
             await backlogHelper.setUsStatus(1, 0);
 
             let dragElement =  backlogHelper.userStories().get(0);
-            let dragElementHandler = dragElement.$('.icon-drag-v');
+            let dragElementHandler = dragElement.$('.icon-drag');
 
             let sprint = backlogHelper.sprints().last();
             await utils.common.drag(dragElementHandler, sprint);
diff --git a/e2e/suites/discover/discover-home.e2e.js b/e2e/suites/discover/discover-home.e2e.js
index 60387e61..2a2ebb4b 100644
--- a/e2e/suites/discover/discover-home.e2e.js
+++ b/e2e/suites/discover/discover-home.e2e.js
@@ -28,13 +28,15 @@ describe('discover', () => {
         });
 
         it('rearrange', async () => {
+            let projects = discoverHelper.likedProjects();
+            let discoverCount = await projects.count();
+
             discoverHelper.rearrangeLike(3);
 
             let filterText = await discoverHelper.getLikeFilterText();
-            let projects = discoverHelper.likedProjects();
 
             expect(filterText).to.be.equal('All time');
-            expect(await projects.count()).to.be.equal(5);
+            expect(await projects.count()).to.be.equal(discoverCount);
 
         });
     });
@@ -47,13 +49,15 @@ describe('discover', () => {
         });
 
         it('rearrange', async () => {
+            let projects = discoverHelper.activeProjects();
+            let discoverCount = await projects.count();
+
             discoverHelper.rearrangeActive(3);
 
             let filterText = await discoverHelper.getActiveFilterText();
-            let projects = discoverHelper.activeProjects();
 
             expect(filterText).to.be.equal('All time');
-            expect(await projects.count()).to.be.equal(5);
+            expect(await projects.count()).to.be.equal(discoverCount);
         });
     });
 
diff --git a/e2e/suites/home.e2e.js b/e2e/suites/home.e2e.js
index aecc8460..e0092086 100644
--- a/e2e/suites/home.e2e.js
+++ b/e2e/suites/home.e2e.js
@@ -41,7 +41,7 @@ describe('home', function() {
         });
 
         it('close create project lightbox', async function() {
-            $('div[tg-lb-create-project] .icon-delete').click();
+            $('div[tg-lb-create-project] .icon-close').click();
 
             return expect(await utils.lightbox.close('div[tg-lb-create-project]')).to.be.equal(true);
         });
diff --git a/e2e/suites/tasks/task-detail.e2e.js b/e2e/suites/tasks/task-detail.e2e.js
index 26917e1e..850cd3e1 100644
--- a/e2e/suites/tasks/task-detail.e2e.js
+++ b/e2e/suites/tasks/task-detail.e2e.js
@@ -33,7 +33,7 @@ describe('Task detail', function(){
 
     it('description edition', sharedDetail.descriptionTesting);
 
-    it('status edition', sharedDetail.bind(this, 'Ready', 'In progress'));
+    it('status edition', sharedDetail.statusTesting.bind(this, 'In progress', 'Ready for test'));
 
     describe('assigned to edition', sharedDetail.assignedToTesting);
 
diff --git a/e2e/suites/tasks/taskboard.e2e.js b/e2e/suites/tasks/taskboard.e2e.js
index 1bfa66d6..c1ba08e6 100644
--- a/e2e/suites/tasks/taskboard.e2e.js
+++ b/e2e/suites/tasks/taskboard.e2e.js
@@ -151,7 +151,7 @@ describe('taskboard', function() {
         });
     });
 
-    describe('folds', function() {
+    describe.only('folds', function() {
         it('fold row', async function() {
             taskboardHelper.foldRow(0);
 
diff --git a/e2e/suites/user-profile/feedback.e2e.js b/e2e/suites/user-profile/feedback.e2e.js
index 3e297e6f..5e719729 100644
--- a/e2e/suites/user-profile/feedback.e2e.js
+++ b/e2e/suites/user-profile/feedback.e2e.js
@@ -16,7 +16,11 @@ describe('feedback', function() {
     });
 
     it('send feedback', async function() {
-        await utils.common.topMenuOption(4);
+        let menu = utils.common.getMenu();
+        let menuOption = $('a[translate="PROJECT.NAVIGATION.FEEDBACK"]');
+
+        browser.actions().mouseMove(menu).perform();
+        browser.actions().mouseMove(menuOption).click().perform();
 
         let feedbackLightbox = $('div[tg-lb-feedback]');
 
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index f84b2b09..ae8846ec 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -368,8 +368,12 @@ common.uploadFile = async function(inputFile, filePath) {
     await browser.executeScript(toggleInput, inputFile.getWebElement());
 };
 
+common.getMenu = function() {
+    return $('div[tg-dropdown-user]');
+};
+
 common.topMenuOption = async function(option) {
-    let menu = $('div[tg-dropdown-user]');
+    let menu = common.getMenu();
     let menuOption = menu.$$('li a').get(option);
     browser.actions().mouseMove(menu).perform();
     return browser.actions().mouseMove(menuOption).click().perform();
@@ -421,12 +425,13 @@ common.uploadImagePath = function() {
     }
 };
 
-common.closeJoyride = function() {
-    browser.waitForAngular();
-    $('.introjs-skipbutton').isPresent().then((present) => {
-        if (present) {
-            $('.introjs-skipbutton').click();
-            browser.sleep(600);
-        }
-    });
+common.closeJoyride = async function() {
+    await browser.waitForAngular();
+
+    let present = await $('.introjs-skipbutton').isPresent();
+
+    if (present) {
+        $('.introjs-skipbutton').click();
+        await browser.sleep(600);
+    }
 };

From 0ea798b2f3418779603ef19969dedbc21fa03dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 22 Mar 2016 12:59:28 +0100
Subject: [PATCH 111/155] Add color to status in related tasks

---
 app/partials/task/related-task-row.jade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/partials/task/related-task-row.jade b/app/partials/task/related-task-row.jade
index 7b99c113..446b2017 100644
--- a/app/partials/task/related-task-row.jade
+++ b/app/partials/task/related-task-row.jade
@@ -29,10 +29,11 @@
     a.task-status(
         href="" 
         title="{{'TASK.TITLE_SELECT_STATUS' | translate}}"
+        ng-style="{'color': task.status_extra_info.color}"
     )
         span.task-status-bind
         <% if(perms.modify_task) { %>
-        svg.icon.icon-arrow-down
+        svg.icon.icon-arrow-down(ng-style="{'fill': task.status_extra_info.color}")
             use(xlink:href="#icon-arrow-down")
         <% } %>
 

From 2e4a63fe75eec0d498a4a36f0b11136e8e12e6ef Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Tue, 15 Mar 2016 12:23:13 +0100
Subject: [PATCH 112/155] US #49 (taiga-subscriptions): Transfer project
 ownership

---
 CHANGELOG.md                                  |   1 +
 app/coffee/app.coffee                         |  10 ++
 app/coffee/modules/admin/lightboxes.coffee    | 141 ++++++++++++++++
 app/coffee/modules/admin/memberships.coffee   |   5 +-
 .../modules/admin/project-profile.coffee      |  46 ++++++
 app/coffee/modules/common/confirm.coffee      |  15 +-
 app/coffee/modules/resources.coffee           |   5 +
 app/locales/taiga/locale-en.json              |  34 +++-
 app/modules/projects/projects.service.coffee  |  10 ++
 .../projects/projects.service.spec.coffee     |  13 ++
 ...t-own-project-explanation.directive.coffee |  25 +++
 .../cant-own-project-explanation.jade         |   3 +
 .../projects/transfer/transfer-page.jade      |   4 +
 .../transfer-project.controller.coffee        |  98 +++++++++++
 .../transfer-project.directive.coffee         |  33 ++++
 .../projects/transfer/transfer-project.jade   |  69 ++++++++
 .../projects/transfer/transfer-project.scss   |  93 +++++++++++
 .../projects-resource.service.coffee          |  36 ++++
 .../services/current-user.service.coffee      |  23 ++-
 .../services/current-user.service.spec.coffee | 154 ++++++++++++++++++
 .../admin/admin-project-change-owner.jade     |   8 +
 app/partials/admin/admin-project-profile.jade |  13 ++
 .../admin-project-request-ownership.jade      |   8 +
 .../common/lightbox/lightbox-assigned-to.jade |   2 +-
 .../lightbox/lightbox-change-owner.jade       |  72 ++++++++
 .../lightbox/lightbox-request-ownership.jade  |  14 ++
 app/styles/components/buttons.scss            |   4 +-
 .../components/notification-message.scss      |  18 +-
 app/styles/components/user-list.scss          |   4 +-
 app/styles/core/animation.scss                |  15 ++
 app/styles/core/typography.scss               |   4 +
 app/styles/dependencies/helpers.scss          |   2 +
 .../modules/admin/admin-project-profile.scss  |  38 ++++-
 app/styles/modules/common/lightbox.scss       |  36 +++-
 e2e/helpers/project-detail-helper.js          |  49 ++++++
 .../admin/project/project-detail.e2e.js       |  39 +++++
 e2e/utils/common.js                           |  47 ++++++
 e2e/utils/nav.js                              |   9 +
 38 files changed, 1179 insertions(+), 21 deletions(-)
 create mode 100644 app/modules/projects/transfer/cant-own-project-explanation.directive.coffee
 create mode 100644 app/modules/projects/transfer/cant-own-project-explanation.jade
 create mode 100644 app/modules/projects/transfer/transfer-page.jade
 create mode 100644 app/modules/projects/transfer/transfer-project.controller.coffee
 create mode 100644 app/modules/projects/transfer/transfer-project.directive.coffee
 create mode 100644 app/modules/projects/transfer/transfer-project.jade
 create mode 100644 app/modules/projects/transfer/transfer-project.scss
 create mode 100644 app/partials/admin/admin-project-change-owner.jade
 create mode 100644 app/partials/admin/admin-project-request-ownership.jade
 create mode 100644 app/partials/common/lightbox/lightbox-change-owner.jade
 create mode 100644 app/partials/common/lightbox/lightbox-request-ownership.jade

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba53a2d..9a528eec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add badge to project owners
 - Limit of user per project.
 - Redesign of the create project wizard
+- Transfer project ownership
 
 ### Misc
 - Lots of small and not so small bugfixes.
diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index d0a750f5..8d0b88de 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -333,6 +333,16 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
     $routeProvider.when("/project/:pslug/admin/contrib/:plugin",
         {templateUrl: "contrib/main.html"})
 
+    # Transfer project
+    $routeProvider.when("/project/:pslug/transfer/:token",
+        {
+            templateUrl: "projects/transfer/transfer-page.html",
+            loader: true,
+            controller: "Project",
+            controllerAs: "vm"
+        }
+    )
+
     # User settings
     $routeProvider.when("/user-settings/user-profile",
         {templateUrl: "user/user-profile.html"})
diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index 8030262f..f28aba65 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -136,3 +136,144 @@ LightboxAddMembersWarningMessageDirective = () ->
     }
 
 module.directive("tgLightboxAddMembersWarningMessage", [LightboxAddMembersWarningMessageDirective])
+
+
+#############################################################################
+## Transfer project ownership
+#############################################################################
+
+LbRequestOwnershipDirective = (lightboxService, rs, confirmService, $translate) ->
+    return {
+        link: (scope, el) ->
+            lightboxService.open(el)
+
+            scope.request = () ->
+                scope.loading = true
+
+                rs.projects.transferRequest(scope.projectId).then () ->
+                    scope.loading = false
+
+                    lightboxService.close(el)
+
+                    confirmService.notify("success", $translate.instant("ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP_SUCCESS"))
+
+        templateUrl: "common/lightbox/lightbox-request-ownership.html"
+    }
+
+module.directive('tgLbRequestOwnership', [
+    "lightboxService",
+    "tgResources",
+    "$tgConfirm",
+    "$translate",
+    LbRequestOwnershipDirective])
+
+class ChangeOwnerLightboxController
+    constructor: (@rs, @lightboxService, @confirm, @translate) ->
+        @.users = []
+        @.q = ""
+        @.commentOpen = false
+
+    limit: 3
+
+    normalizeString: (normalizedString) ->
+        normalizedString = normalizedString.replace("Á", "A").replace("Ä", "A").replace("À", "A")
+        normalizedString = normalizedString.replace("É", "E").replace("Ë", "E").replace("È", "E")
+        normalizedString = normalizedString.replace("Í", "I").replace("Ï", "I").replace("Ì", "I")
+        normalizedString = normalizedString.replace("Ó", "O").replace("Ö", "O").replace("Ò", "O")
+        normalizedString = normalizedString.replace("Ú", "U").replace("Ü", "U").replace("Ù", "U")
+        return normalizedString
+
+    filterUsers: (user) ->
+        username = user.full_name_display.toUpperCase()
+        username = @.normalizeString(username)
+        text = @.q.toUpperCase()
+        text = @.normalizeString(text)
+
+        return _.includes(username, text)
+
+    getUsers: () ->
+        if !@.users.length && !@.q.length
+            users =  @.activeUsers
+        else
+            users = @.users
+
+        users = users.slice(0, @.limit)
+        users = _.reject(users, {"selected": true})
+
+        return _.reject(users, {"id": @.currentOwnerId})
+
+    userSearch: () ->
+        @.users = @.activeUsers
+
+        @.selected = _.find(@.users, {"selected": true})
+
+        @.users = _.filter(@.users, @.filterUsers.bind(this)) if @.q
+
+    selectUser: (user) ->
+        @.activeUsers = _.map @.activeUsers, (user) ->
+            user.selected = false
+
+            return user
+
+        user.selected = true
+
+        @.userSearch()
+
+    submit: () ->
+        @.loading = true
+        @rs.projects.transferStart(@.projectId, @.selected.id, @.comment)
+            .then () =>
+                @.loading = false
+                @lightboxService.closeAll()
+
+                title = @translate.instant("ADMIN.PROJECT_PROFILE.CHANGE_OWNER_SUCCESS_TITLE")
+                desc = @translate.instant("ADMIN.PROJECT_PROFILE.CHANGE_OWNER_SUCCESS_DESC")
+
+                @confirm.success(title, desc, {
+                    type: "svg",
+                    name: "icon-speak-up"
+                })
+
+ChangeOwnerLightboxController.$inject = [
+        "tgResources",
+        "lightboxService",
+        "$tgConfirm",
+        "$translate"
+]
+
+module.controller('ChangeOwnerLightbox', ChangeOwnerLightboxController)
+
+ChangeOwnerLightboxDirective = (lightboxService, lightboxKeyboardNavigationService, $template, $compile) ->
+    link = (scope, el) ->
+        lightboxService.open(el)
+
+    return {
+        scope: true,
+        controller: "ChangeOwnerLightbox",
+        controllerAs: "vm",
+        bindToController: {
+            currentOwnerId: "=",
+            projectId: "=",
+            activeUsers: "="
+        },
+        templateUrl: "common/lightbox/lightbox-change-owner.html"
+        link:link
+    }
+
+
+module.directive("tgLbChangeOwner", ["lightboxService", "lightboxKeyboardNavigationService", "$tgTemplate", "$compile", ChangeOwnerLightboxDirective])
+
+TransferProjectStartSuccessDirective = (lightboxService) ->
+    link = (scope, el) ->
+        scope.close = () ->
+            lightboxService.close(el)
+
+        lightboxService.open(el)
+
+    return {
+        templateUrl: "common/lightbox/lightbox-transfer-project-start-success.html"
+        link:link
+    }
+
+
+module.directive("tgLbTransferProjectStartSuccess", ["lightboxService", TransferProjectStartSuccessDirective])
diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index be2a7ad9..a85ae6e2 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -129,7 +129,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             members: @scope.project.max_memberships
         })
         icon = "/" + window._version + "/svg/icons/team-question.svg"
-        @confirm.success(title, message,icon)
+        @confirm.success(title, message, {
+            name: icon,
+            type: "img"
+        })
 
 module.controller("MembershipsController", MembershipsController)
 
diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 2d385c6e..8b0d64e4 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -69,6 +69,8 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
             description = @scope.project.description
             @appMetaService.setAll(title, description)
 
+            @.fillUsersAndRoles(@scope.project.members, @scope.project.roles)
+
         promise.then null, @.onInitialDataError.bind(@)
 
         @scope.$on "project:loaded", =>
@@ -535,3 +537,47 @@ AdminProjectRestrictionsDirective = () ->
     }
 
 module.directive('tgAdminProjectRestrictions', [AdminProjectRestrictionsDirective])
+
+AdminProjectRequestOwnershipDirective = (lightboxFactory) ->
+    return {
+        link: (scope) ->
+            scope.requestOwnership = () ->
+                lightboxFactory.create("tg-lb-request-ownership", {
+                    "class": "lightbox lightbox-request-ownership"
+                }, {
+                    projectId: scope.projectId
+                })
+
+        scope: {
+            "projectId": "=",
+            "owner": "="
+        },
+        templateUrl: "admin/admin-project-request-ownership.html"
+    }
+
+module.directive('tgAdminProjectRequestOwnership', ["tgLightboxFactory", AdminProjectRequestOwnershipDirective])
+
+AdminProjectChangeOwnerDirective = (lightboxFactory) ->
+    return {
+        link: (scope) ->
+            scope.changeOwner = () ->
+                lightboxFactory.create("tg-lb-change-owner", {
+                    "class": "lightbox lightbox-select-user",
+                    "project-id": "projectId",
+                    "active-users": "activeUsers",
+                    "current-owner-id": "currentOwnerId"
+                }, {
+                    projectId: scope.projectId,
+                    activeUsers: scope.activeUsers,
+                    currentOwnerId: scope.owner.id
+                })
+
+        scope: {
+            "activeUsers": "="
+            "projectId": "="
+            "owner": "="
+        },
+        templateUrl: "admin/admin-project-change-owner.html"
+    }
+
+module.directive('tgAdminProjectChangeOwner', ["tgLightboxFactory", AdminProjectChangeOwnerDirective])
diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index 868920bc..713162d9 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -167,8 +167,20 @@ class ConfirmService extends taiga.Service
         el = angular.element(".lightbox-generic-success")
 
         el.find("img").remove()
+        el.find("svg").remove()
+
+        if icon.type == "img"
+            detailImage = $('<img>').addClass('lb-icon').attr('src', icon.name)
+        else if icon.type == "svg"
+            useSVG = document.createElementNS('http://www.w3.org/2000/svg', 'use')
+            useSVG.setAttributeNS('http://www.w3.org/1999/xlink','href', '#' + icon.name)
+
+            detailImage = document.createElementNS("http://www.w3.org/2000/svg", "svg")
+            detailImage.classList.add("icon")
+            detailImage.classList.add("lb-icon")
+            detailImage.classList.add(icon.name)
+            detailImage.appendChild(useSVG)
 
-        detailImage = $('<img>').addClass('lb-icon').attr('src', icon)
         if detailImage
             el.find('section').prepend(detailImage)
 
@@ -254,6 +266,7 @@ class ConfirmService extends taiga.Service
             body.find(selector)
                 .removeClass('active')
                 .addClass('inactive')
+                .one 'animationend', () -> $(this).removeClass('inactive')
 
             delete @.tsem
 
diff --git a/app/coffee/modules/resources.coffee b/app/coffee/modules/resources.coffee
index a4a45eb9..c32a9f56 100644
--- a/app/coffee/modules/resources.coffee
+++ b/app/coffee/modules/resources.coffee
@@ -74,6 +74,11 @@ urls = {
     "project-unlike": "/projects/%s/unlike"
     "project-watch": "/projects/%s/watch"
     "project-unwatch": "/projects/%s/unwatch"
+    "project-transfer-validate-token": "/projects/%s/transfer_validate_token"
+    "project-transfer-accept": "/projects/%s/transfer_accept"
+    "project-transfer-reject": "/projects/%s/transfer_reject"
+    "project-transfer-request": "/projects/%s/transfer_request"
+    "project-transfer-start": "/projects/%s/transfer_start"
 
     # Project Values - Choises
     "userstory-statuses": "/userstory-statuses"
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 2283333c..936d704f 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Services"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -932,6 +959,11 @@
                 "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
                 "BUTTON": "Request change project owner"
             }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
diff --git a/app/modules/projects/projects.service.coffee b/app/modules/projects/projects.service.coffee
index 5aca481e..ab3973a3 100644
--- a/app/modules/projects/projects.service.coffee
+++ b/app/modules/projects/projects.service.coffee
@@ -63,4 +63,14 @@ class ProjectsService extends taiga.Service
     bulkUpdateProjectsOrder: (sortData) ->
         return @rs.projects.bulkUpdateOrder(sortData)
 
+    transferValidateToken: (projectId, token) ->
+        return @rs.projects.transferValidateToken(projectId, token)
+
+    transferAccept: (projectId, token, reason) ->
+        return @rs.projects.transferAccept(projectId, token, reason)
+
+    transferReject: (projectId, token, reason) ->
+        return @rs.projects.transferReject(projectId, token, reason)
+
+
 angular.module("taigaProjects").service("tgProjectsService", ProjectsService)
diff --git a/app/modules/projects/projects.service.spec.coffee b/app/modules/projects/projects.service.spec.coffee
index 6b49303b..1829e8a8 100644
--- a/app/modules/projects/projects.service.spec.coffee
+++ b/app/modules/projects/projects.service.spec.coffee
@@ -163,3 +163,16 @@ describe "tgProjectsService", ->
             ])
 
             done()
+
+    it "validateTransferToken", (done) ->
+        projectId = 3
+
+        tokenValidation = Immutable.fromJS({})
+
+        mocks.resources.projects = {}
+        mocks.resources.projects.transferValidateToken = sinon.stub()
+        mocks.resources.projects.transferValidateToken.withArgs(projectId).promise().resolve(tokenValidation)
+
+        projectsService.transferValidateToken(projectId).then (projects) ->
+            expect(projects.toJS()).to.be.eql({})
+            done()
diff --git a/app/modules/projects/transfer/cant-own-project-explanation.directive.coffee b/app/modules/projects/transfer/cant-own-project-explanation.directive.coffee
new file mode 100644
index 00000000..a6ea655c
--- /dev/null
+++ b/app/modules/projects/transfer/cant-own-project-explanation.directive.coffee
@@ -0,0 +1,25 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: cant-own-project-explanation.directive.coffee
+###
+
+CantOwnProjectExplanationDirective = () ->
+    return {
+        templateUrl: "projects/transfer/cant-own-project-explanation.html"
+    }
+
+angular.module("taigaProjects").directive("tgCantOwnProjectExplanation", CantOwnProjectExplanationDirective)
diff --git a/app/modules/projects/transfer/cant-own-project-explanation.jade b/app/modules/projects/transfer/cant-own-project-explanation.jade
new file mode 100644
index 00000000..6f6be740
--- /dev/null
+++ b/app/modules/projects/transfer/cant-own-project-explanation.jade
@@ -0,0 +1,3 @@
+p(
+    translate="ADMIN.PROJECT_TRANSFER.CANT_BE_OWNED"
+)
diff --git a/app/modules/projects/transfer/transfer-page.jade b/app/modules/projects/transfer/transfer-page.jade
new file mode 100644
index 00000000..bb9dad96
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-page.jade
@@ -0,0 +1,4 @@
+tg-transfer-project.transfer-project(
+    ng-if="vm.project"
+    project = "vm.project"
+)
diff --git a/app/modules/projects/transfer/transfer-project.controller.coffee b/app/modules/projects/transfer/transfer-project.controller.coffee
new file mode 100644
index 00000000..41fbd976
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-project.controller.coffee
@@ -0,0 +1,98 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: transfer-project.directive.coffee
+###
+
+module = angular.module('taigaProjects')
+
+class TransferProject
+    @.$inject = [
+        "$routeParams",
+        "tgProjectsService"
+        "$location",
+        "$tgAuth",
+        "tgCurrentUserService",
+        "$tgNavUrls",
+        "$translate",
+        "$tgConfirm"
+    ]
+
+    constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) ->
+        @.projectId = @.project.get("id")
+        @.token = @routeParams.token
+        @._refreshUserData()
+        @.showAddComment = false
+
+    _validateToken: () ->
+        @projectService.transferValidateToken(@.projectId, @.token).error (data, status) =>
+            @location.path(@navUrls.resolve("not-found"))
+
+    _refreshUserData: () ->
+        @authService.refresh().then () =>
+            @._validateToken()
+            @._setProjectData()
+            @._checkOwnerData()
+
+    _setProjectData: () ->
+        @.canBeOwnedByUser = @currentUserService.canOwnProject(@.project)
+
+    _checkOwnerData: () ->
+        currentUser = @currentUserService.getUser()
+        if(@.project.get('is_private'))
+            @.ownerMessage = 'ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PRIVATE'
+            @.maxProjects = currentUser.get('max_private_projects')
+            if @.maxProjects == null
+                @.maxProjects = @translate.instant('ADMIN.PROJECT_TRANSFER.UNLIMITED_PROJECTS')
+            @.currentProjects = currentUser.get('total_private_projects')
+            maxMemberships = currentUser.get('max_memberships_private_projects')
+
+        else
+            @.ownerMessage = 'ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PUBLIC'
+            @.maxProjects = currentUser.get('max_public_projects')
+            if @.maxProjects == null
+                @.maxProjects = @translate.instant('ADMIN.PROJECT_TRANSFER.UNLIMITED_PROJECTS')
+            @.currentProjects = currentUser.get('total_public_projects')
+            maxMemberships = currentUser.get('max_memberships_public_projects')
+
+        @.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships
+
+    transferAccept: (token, reason) ->
+        @projectService.transferAccept(@.project.get("id"), token, reason).success () =>
+            newUrl = @navUrls.resolve("project-admin-project-profile-details", {
+                project: @.project.get("slug")
+            })
+            @location.path(newUrl)
+            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
+
+    transferReject: (token, reason) ->
+        @projectService.transferReject(@.project.get("id"), token, reason).success () =>
+            newUrl = @navUrls.resolve("project-admin-project-profile-details", {
+                project: @project.get("slug")
+            })
+            @location.path(newUrl)
+            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)
+
+    addComment: () ->
+        @.showAddComment = true
+
+    hideComment: () ->
+        @.showAddComment = false
+        @.reason = ''
+
+
+
+module.controller("TransferProjectController", TransferProject)
diff --git a/app/modules/projects/transfer/transfer-project.directive.coffee b/app/modules/projects/transfer/transfer-project.directive.coffee
new file mode 100644
index 00000000..d6b35f76
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-project.directive.coffee
@@ -0,0 +1,33 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: transfer-project.directive.coffee
+###
+
+module = angular.module('taigaProjects')
+
+TransferProjectDirective = () ->
+    return {
+        scope: {},
+        bindToController: {
+            project: "="
+        },
+        templateUrl: "projects/transfer/transfer-project.html",
+        controller: 'TransferProjectController',
+        controllerAs: 'vm'
+    }
+
+module.directive('tgTransferProject', TransferProjectDirective)
diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade
new file mode 100644
index 00000000..cc184317
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-project.jade
@@ -0,0 +1,69 @@
+.transfer-project-wrapper
+    h2.transfer-title(translate="ADMIN.PROJECT_TRANSFER.DO_YOU_ACCEPT_PROJECT_OWNERNSHIP")
+    .transfer-project-detail
+        img.transfer-project-image(
+            tg-project-logo-small-src="vm.project"
+            alt="{{vm.project.get('name')}}"
+        )
+        .transfer-project-data
+            h3.transfer-project-title {{::vm.project.get("name")}}
+            .transfer-project-statistics
+                span.transfer-project-private(ng-if="vm.project.get('is_private')")
+                    svg.icon.icon-lock
+                        use(xlink:href="#icon-lock")
+                    span(translate="ADMIN.PROJECT_TRANSFER.PRIVATE")
+                span.transfer-project-members
+                    svg.icon.icon-team
+                        use(xlink:href="#icon-team")
+                    span {{::vm.project.get("members").size}}
+
+    p(
+        translate="ADMIN.PROJECT_TRANSFER.PROPOSE_OWNERSHIP"
+        translate-values="{owner: vm.project.getIn(['owner', 'full_name_display']), project: vm.project.get('name')}"
+    )
+
+    div(ng-if="vm.canBeOwnedByUser.valid")
+    
+        p(
+            translate="{{vm.ownerMessage}}"
+            translate-values="{maxProjects: vm.maxProjects, currentProjects: vm.currentProjects}"
+        )
+
+        a.transfer-project-comment-link.ng-animate-disabled(
+            href=""
+            ng-click="vm.addComment()"
+            ng-if="!vm.showAddComment"
+            translate="ADMIN.PROJECT_TRANSFER.ADD_COMMENT_QUESTION"
+        )
+        
+        fieldset.transfer-project-comment-form(
+            ng-if="vm.showAddComment"
+            ng-class="{'open': vm.showAddComment}"
+        )
+            .transfer-project-comment-header
+                label.transfer-project-comment-label(
+                    translate="ADMIN.PROJECT_TRANSFER.ADD_COMMENT"
+                )
+                svg.icon.icon-close(ng-click="vm.hideComment()")
+                    use(xlink:href="#icon-close")
+            textarea.transfer-project-comment(
+                name="reason"
+                ng-model="vm.reason"
+            )
+
+        .transfer-project-options
+            a.button.button-gray(
+                ng-click="vm.transferReject(vm.token, vm.reason)"
+                href="#"
+                title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}"
+                translate="ADMIN.PROJECT_TRANSFER.REJECT"
+            )
+
+            a.button.button-green(
+                ng-click="vm.transferAccept(vm.token, vm.reason)"
+                href="#"
+                title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}"
+                translate="ADMIN.PROJECT_TRANSFER.ACCEPT"
+            )
+
+    div(ng-if="!vm.canBeOwnedByUser.valid", tg-cant-own-project-explanation)
diff --git a/app/modules/projects/transfer/transfer-project.scss b/app/modules/projects/transfer/transfer-project.scss
new file mode 100644
index 00000000..99921eb5
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-project.scss
@@ -0,0 +1,93 @@
+.transfer-project-wrapper {
+    max-width: 500px;
+    width: 90%;
+}
+
+.transfer-project {
+    align-items: center;
+    background: url('../images/discover.png') bottom center repeat-x;
+    display: flex;
+    justify-content: center;
+    min-height: calc(100vh - 40px);
+    .transfer-title {
+        @extend %light;
+    }
+    &-detail {
+        align-items: center;
+        border-bottom: 1px solid $whitish;
+        border-top: 1px solid $whitish;
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        margin: 1rem 0 3rem;
+        padding: 1rem 0;
+    }
+    &-image {
+        margin-right: 1rem;
+        width: 4rem;
+    }
+    &-title {
+        @extend %light;
+        @extend %larger;
+        margin-bottom: .25rem;
+    }
+    &-statistics {
+        span {
+            color: $gray-light;
+            margin-right: .5rem;
+        }
+        svg {
+            fill: $gray-light;
+            margin-right: .25rem;
+        }
+    }
+    &-private {
+        text-transform: uppercase;
+    }
+    &-comment-link {
+        color: $primary;
+        cursor: pointer;
+        display: block;
+        margin-bottom: 1rem;
+        &:hover {
+            color: $primary-light;
+        }
+    }
+    &-comment-header {
+        display: flex;
+        justify-content: space-between;
+        .icon-close {
+            cursor: pointer;
+            fill: $gray-light;
+            &:hover {
+                fill: $red-light;
+                transition: fill .2s;
+            }
+        }
+    }
+    &-comment-form {
+        &.ng-enter {
+            animation: dropdownFade .2s;
+        }
+    }
+    &-comment-label {
+        display: block;
+        margin-bottom: .5rem;
+    }
+    &-comment {
+        margin-bottom: 1rem;
+        min-height: 6rem;
+    }
+    &-options {
+        display: flex;
+        a {
+            @extend %large;
+            display: block;
+            flex: 1;
+            padding: .75rem;
+            &:first-child {
+                margin-right: .5rem;
+            }
+        }
+    }
+}
diff --git a/app/modules/resources/projects-resource.service.coffee b/app/modules/resources/projects-resource.service.coffee
index d18fc96e..226534ff 100644
--- a/app/modules/resources/projects-resource.service.coffee
+++ b/app/modules/resources/projects-resource.service.coffee
@@ -108,6 +108,42 @@ Resource = (urlsService, http, paginateResponseService) ->
         url = urlsService.resolve("project-unwatch", projectId)
         return http.post(url)
 
+    service.transferValidateToken = (projectId, token) ->
+        data = {
+            token: token
+        }
+        url = urlsService.resolve("project-transfer-validate-token", projectId)
+        return http.post(url, data)
+
+    service.transferAccept = (projectId, token, reason) ->
+        data = {
+            token: token
+            reason: reason
+        }
+        url = urlsService.resolve("project-transfer-accept", projectId)
+        return http.post(url, data)
+
+    service.transferReject = (projectId, token, reason) ->
+        data = {
+            token: token
+            reason: reason
+        }
+        url = urlsService.resolve("project-transfer-reject", projectId)
+        return http.post(url, data)
+
+    service.transferRequest = (projectId) ->
+        url = urlsService.resolve("project-transfer-request", projectId)
+        return http.post(url)
+
+    service.transferStart = (projectId, userId, reason) ->
+        data = {
+            user: userId,
+            reason: reason
+        }
+
+        url = urlsService.resolve("project-transfer-start", projectId)
+        return http.post(url, data)
+
     return () ->
         return {"projects": service}
 
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index 57b0db0f..60985801 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -120,8 +120,7 @@ class CurrentUserService
 
     canCreatePrivateProjects: () ->
         user = @.getUser()
-
-        if user.get('max_private_projects') != null && user.get('max_private_projects') <= user.get('total_private_projects')
+        if user.get('max_private_projects') != null && user.get('total_private_projects') >= user.get('max_private_projects')
             return {valid: false, reason: 'max_private_projects', type: 'private_project'}
 
         return {valid: true}
@@ -129,9 +128,27 @@ class CurrentUserService
     canCreatePublicProjects: () ->
         user = @.getUser()
 
-        if user.get('max_public_projects') != null && user.get('max_public_projects') <= user.get('total_public_projects')
+        if user.get('max_public_projects') != null && user.get('total_public_projects') >= user.get('max_public_projects')
             return {valid: false, reason: 'max_public_projects', type: 'public_project'}
 
         return {valid: true}
 
+    canOwnProject: (project) ->
+        user = @.getUser()
+        if project.get('is_private')
+            result = @.canCreatePrivateProjects()
+            return result if !result.valid
+
+            if user.get('max_memberships_private_projects') != null && project.get('total_memberships') > user.get('max_memberships_private_projects')
+                return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
+
+        else
+            result = @.canCreatePublicProjects()
+            return result if !result.valid
+
+            if user.get('max_memberships_public_projects') != null && project.get('total_memberships') > user.get('max_memberships_public_projects')
+                return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
+
+        return {valid: true}
+
 angular.module("taigaCommon").service("tgCurrentUserService", CurrentUserService)
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index 36646f48..fba99a7f 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -273,3 +273,157 @@ describe "tgCurrentUserService", ->
         expect(result).to.be.eql({
             valid: true
         })
+
+    it "the user can own public project", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 10,
+            total_public_projects: 1,
+            max_memberships_public_projects: 20
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: false
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't own public project because of max projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 1,
+            total_public_projects: 1,
+            max_memberships_public_projects: 20
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: false
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: false
+            reason: 'max_public_projects'
+            type: 'public_project'
+        })
+
+
+    it "the user can't own public project because of max memberships", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_public_projects: 5,
+            total_public_projects: 1,
+            max_memberships_public_projects: 4
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: false
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: false
+            reason: 'max_members_public_projects'
+            type: 'public_project'
+        })
+
+    it "the user can own private project", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 1,
+            max_memberships_private_projects: 20
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: true
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: true
+        })
+
+    it "the user can't own private project because of max projects", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 1,
+            total_private_projects: 1,
+            max_memberships_private_projects: 20
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: true
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: false
+            reason: 'max_private_projects'
+            type: 'private_project'
+        })
+
+
+    it "the user can't own private project because of max memberships", () ->
+        user = Immutable.fromJS({
+            id: 1,
+            name: "fake1",
+            max_private_projects: 10,
+            total_private_projects: 1,
+            max_memberships_private_projects: 4
+        })
+
+        currentUserService._user = user
+
+        project = Immutable.fromJS({
+                id: 2,
+                name: "fake2",
+                total_memberships: 5,
+                is_private: true
+        })
+
+        result = currentUserService.canOwnProject(project)
+
+        expect(result).to.be.eql({
+            valid: false
+            reason: 'max_members_private_projects'
+            type: 'private_project'
+        })
diff --git a/app/partials/admin/admin-project-change-owner.jade b/app/partials/admin/admin-project-change-owner.jade
new file mode 100644
index 00000000..25c442ab
--- /dev/null
+++ b/app/partials/admin/admin-project-change-owner.jade
@@ -0,0 +1,8 @@
+.owner-avatar
+    img(ng-src="{{::owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
+
+.owner-info
+    .owner-info-title {{ 'ADMIN.PROJECT_PROFILE.PROJECT_OWNER' | translate }}
+    .owner-name {{::owner.full_name_display}}
+
+a.request(href="", ng-click="changeOwner()") {{ 'ADMIN.PROJECT_PROFILE.CHANGE_OWNER' | translate }}
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index b85cec4f..36cf992d 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -78,6 +78,19 @@ div.wrapper(
                         ng-model="project.tags"
                     )
 
+                fieldset(ng-if="project.owner.id != user.id")
+                    tg-admin-project-request-ownership.admin-project-profile-owner-actions(
+                        owner="project.owner",
+                        project-id="project.id"
+                    )
+
+                fieldset(ng-if="project.owner.id == user.id")
+                    tg-admin-project-change-owner.admin-project-profile-owner-actions(
+                        owner="project.owner",
+                        project-id="project.id"
+                        active-users="activeUsers"
+                    )
+
                 fieldset.looking-for-people
                     .looking-for-people-selector
                         span {{ 'ADMIN.PROJECT_PROFILE.RECRUITING' | translate }}
diff --git a/app/partials/admin/admin-project-request-ownership.jade b/app/partials/admin/admin-project-request-ownership.jade
new file mode 100644
index 00000000..796f9cc3
--- /dev/null
+++ b/app/partials/admin/admin-project-request-ownership.jade
@@ -0,0 +1,8 @@
+.owner-avatar
+    img(ng-src="{{::owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
+
+.owner-info
+    .title {{ 'ADMIN.PROJECT_PROFILE.PROJECT_OWNER' | translate }}
+    .owner-name {{::owner.full_name_display}}
+
+a.request(href="", ng-click="requestOwnership()") {{ 'ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP' | translate }}
\ No newline at end of file
diff --git a/app/partials/common/lightbox/lightbox-assigned-to.jade b/app/partials/common/lightbox/lightbox-assigned-to.jade
index b3947857..d97ab443 100644
--- a/app/partials/common/lightbox/lightbox-assigned-to.jade
+++ b/app/partials/common/lightbox/lightbox-assigned-to.jade
@@ -1,6 +1,6 @@
 svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
     use(xlink:href="#icon-close")
-    
+
 div.form
     h2.title(translate="LIGHTBOX.ASSIGNED_TO.SELECT")
     fieldset
diff --git a/app/partials/common/lightbox/lightbox-change-owner.jade b/app/partials/common/lightbox/lightbox-change-owner.jade
new file mode 100644
index 00000000..8fe0a128
--- /dev/null
+++ b/app/partials/common/lightbox/lightbox-change-owner.jade
@@ -0,0 +1,72 @@
+svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    use(xlink:href="#icon-close")
+
+.form
+    h2.title(translate="LIGHTBOX.CHANGE_OWNER.TITLE")
+    fieldset
+        input(
+            type="text",
+            data-maxlength="500",
+            placeholder="{{'LIGHTBOX.ASSIGNED_TO.SEARCH' | translate}}",
+            ng-model="vm.q",
+            ng-change="vm.userSearch()"
+        )
+
+    .assigned-to-list
+        .user-list-single.is-active(ng-if="vm.selected")
+            .user-list-avatar
+                a(
+                    href="#"
+                    title="{{'COMMON.ASSIGNED_TO.TITLE' | translate}}"
+                )
+                    img(ng-src="{{vm.selected.photo}}")
+            a.user-list-name(
+                href=""
+                title="{{vm.selected.full_name_display}}"
+            ) {{vm.selected.full_name_display}}
+
+        .user-list-single.ng-animate-disabled(
+            ng-repeat="user in vm.getUsers()",
+            ng-click="vm.selectUser(user)"
+        )
+            .user-list-avatar
+                a(
+                    href="#"
+                    title="{{'COMMON.ASSIGNED_TO.TITLE' | translate}}"
+                )
+                    img(ng-src="{{user.photo}}")
+            a.user-list-name(
+                href=""
+                title="{{user.full_name_display}}"
+            ) {{user.full_name_display}}
+
+        .more-watchers(ng-if="!vm.q.length")
+            span(translate="COMMON.ASSIGNED_TO.TOO_MANY")
+
+    .add-comment
+        a(
+            href="",
+            class="ng-animate-disabled"
+            ng-if="!vm.commentOpen",
+            ng-click="vm.commentOpen = true"
+            translate="LIGHTBOX.CHANGE_OWNER.ADD_COMMENT"
+        )
+
+        fieldset(ng-if="vm.commentOpen")
+            svg.icon.icon-close(
+                ng-click="vm.commentOpen = false"
+                href="",
+                title="{{'COMMON.CLOSE' | translate}}"
+            )
+                use(xlink:href="#icon-close")
+            label(translate="LIGHTBOX.CHANGE_OWNER.ADD_COMMENT")
+            textarea(ng-model="vm.comment")
+
+    button.button-green.submit-button(
+        tg-loading="vm.loading",
+        ng-click="vm.submit()",
+        ng-disabled="!vm.selected",
+        type="submit",
+        title="{{'LIGHTBOX.CHANGE_OWNER.BUTTON' | translate}}",
+        translate="LIGHTBOX.CHANGE_OWNER.BUTTON"
+    )
diff --git a/app/partials/common/lightbox/lightbox-request-ownership.jade b/app/partials/common/lightbox/lightbox-request-ownership.jade
new file mode 100644
index 00000000..54247951
--- /dev/null
+++ b/app/partials/common/lightbox/lightbox-request-ownership.jade
@@ -0,0 +1,14 @@
+a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    svg.icon.icon-close
+        use(xlink:href="#icon-close")
+
+.content
+    h2.title(translate="ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP_CONFIRMATION_TITLE")
+    p(translate="ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP_DESC")
+
+    a.button-green(
+        href="",
+        ng-click="request()",
+        tg-loading="loading"
+    )
+        span(translate="ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP_BUTTON")
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index 1be18ede..66d0b13a 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -33,13 +33,13 @@
     }
     &.disabled,
     &[disabled] {
-        background: lighten($whitish, 10%);
+        background: $whitish;
         box-shadow: none;
         color: $gray-light;
         cursor: not-allowed;
         opacity: .65;
         &:hover {
-            background: lighten($whitish, 10%);
+            background: $whitish;
             color: $gray-light;
         }
     }
diff --git a/app/styles/components/notification-message.scss b/app/styles/components/notification-message.scss
index 4a79a15d..33585da6 100644
--- a/app/styles/components/notification-message.scss
+++ b/app/styles/components/notification-message.scss
@@ -1,15 +1,22 @@
 .notification-message-success {
     background: rgba($primary-light, .95);
     box-shadow: 0 25px 10px -15px rgba($black, .05);
-    opacity: 1;
     right: -370px;
     top: 2%;
     transition: opacity .2s ease-in;
     width: 370px;
     &.active {
-        animation: animSlide 2000ms linear both;
+        animation: animSlide 2000ms;
+        animation-fill-mode: forwards;
+        animation-iteration-count: 1;
         opacity: 1;
     }
+    &.inactive {
+        animation: animSlideOut .5s;
+        opacity: 0;
+        transform: none;
+    }
+
     p {
         margin: 0;
     }
@@ -40,8 +47,11 @@
     20% { transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -413.214, 0, 0, 1); }
     27.23% { transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -403.135, 0, 0, 1); }
     38.34% { transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -399.585, 0, 0, 1); }
-    60.56% { transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -400.01, 0, 0, 1); }
-    82.78% { opacity: 1; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -400, 0, 0, 1); }
+    100% { transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -400, 0, 0, 1); }
+}
+
+@keyframes animSlideOut {
+    0% { opacity: 1; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -400, 0, 0, 1); }
     100% { opacity: 0; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -400, 0, 0, 1); }
 }
 
diff --git a/app/styles/components/user-list.scss b/app/styles/components/user-list.scss
index 01771bc1..e39f8016 100644
--- a/app/styles/components/user-list.scss
+++ b/app/styles/components/user-list.scss
@@ -33,7 +33,7 @@
     .user-list-single {
         &:hover,
         &.selected {
-            background: lighten($primary, 58%);
+            background: rgba(lighten($primary-light, 30%), .3);
             cursor: pointer;
         }
         &:hover {
@@ -41,7 +41,7 @@
             transition-delay: .2s;
         }
         &.is-active {
-            background: lighten($primary, 55%);
+            background: rgba(lighten($primary-light, 30%), .3);
             cursor: pointer;
             margin-bottom: 1rem;
             position: relative;
diff --git a/app/styles/core/animation.scss b/app/styles/core/animation.scss
index 50bc216c..74d4cd56 100644
--- a/app/styles/core/animation.scss
+++ b/app/styles/core/animation.scss
@@ -59,6 +59,21 @@
     }
 }
 
+// Drop Down element animations
+
+@keyframes dropdownFade {
+    0% {
+        opacity: 0;
+        transform: translateY(-.25rem);
+    }
+    60% {
+        opacity: 1;
+    }
+    100% {
+        transform: translateY(0);
+    }
+}
+
 @keyframes blink {
     85% {
         opacity: 1;
diff --git a/app/styles/core/typography.scss b/app/styles/core/typography.scss
index 18b984e4..85c74703 100755
--- a/app/styles/core/typography.scss
+++ b/app/styles/core/typography.scss
@@ -96,6 +96,10 @@ em {
     font-style: italic;
 }
 
+small {
+    @extend %xsmall;
+}
+
 strong {
     font-weight: bold;
 }
diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss
index d6d4d8aa..f9080da8 100644
--- a/app/styles/dependencies/helpers.scss
+++ b/app/styles/dependencies/helpers.scss
@@ -25,6 +25,7 @@
     top: 0;
     z-index: 99910;
     .close {
+        @include svg-size(2rem);
         cursor: pointer;
         fill: $gray;
         position: absolute;
@@ -53,6 +54,7 @@
     .lb-icon {
         @include svg-size(6rem);
         display: block;
+        fill: $whitish;
         margin: 1rem auto;
     }
     .title {
diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss
index 50562431..c15a8f18 100644
--- a/app/styles/modules/admin/admin-project-profile.scss
+++ b/app/styles/modules/admin/admin-project-profile.scss
@@ -1,5 +1,4 @@
 @import '../dependencies/mixins/profile-form';
-
 .project-details {
     @include profile-form;
     .looking-for-people {
@@ -31,7 +30,6 @@
             animation-delay: .1s;
         }
     }
-
     .delete-project {
         @extend %xsmall;
         display: block;
@@ -52,9 +50,7 @@
             vertical-align: middle;
         }
     }
-
 }
-
 .project-privacy-settings {
     display: flex;
     margin-bottom: .5rem;
@@ -117,7 +113,6 @@
         }
     }
 }
-
 tg-admin-project-restrictions {
     p {
         @extend %xsmall;
@@ -147,3 +142,36 @@ tg-admin-project-restrictions {
         }
     }
 }
+.admin-project-profile-owner-actions {
+    align-items: center;
+    border-top: 1px solid $whitish;
+    display: flex;
+    justify-content: space-between;
+    padding-top: 1rem;
+    a {
+        color: $primary;
+        &:hover {
+            color: $primary-light;
+            transition: color .2s;
+        }
+    }
+    img {
+        width: 100%;
+    }
+    .owner-info {
+        flex: 1;
+        padding-left: .5rem;
+    }
+    .owner-info-title {
+        color: $gray-light;
+    }
+    .owner-name {
+        @extend %bold;
+    }
+    .owner-avatar {
+        width: 2.5rem;
+    }
+    .request {
+        flex-shrink: 0;
+    }
+}
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index f4d63c68..26bf2945 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -504,7 +504,7 @@
     .user-list-single {
         &:hover,
         &.selected {
-            background: lighten($primary, 58%);
+            background: rgba(lighten($primary-light, 30%), .3);
             cursor: pointer;
         }
         &:hover {
@@ -518,6 +518,33 @@
         padding: .5rem;
         text-align: center;
     }
+    .submit-button {
+        margin-top: 1rem;
+    }
+    .add-comment {
+        position: relative;
+        text-align: center;
+        .icon-close {
+            cursor: pointer;
+            fill: $gray;
+            position: absolute;
+            right: 0;
+            top: 0;
+            transition: fill .2s;
+            &:hover {
+                fill: $red-light;
+            }
+            svg {
+                @include svg-size(2rem);
+            }
+        }
+        textarea {
+            margin-top: 1rem;
+        }
+        a {
+            color: $primary;
+        }
+    }
 }
 
 .lb-create-edit-userstory {
@@ -573,3 +600,10 @@
         width: 500px;
     }
 }
+
+.lightbox-request-ownership {
+    text-align: center;
+    .content {
+        width: 500px;
+    }
+}
diff --git a/e2e/helpers/project-detail-helper.js b/e2e/helpers/project-detail-helper.js
index 096dab63..efc676f5 100644
--- a/e2e/helpers/project-detail-helper.js
+++ b/e2e/helpers/project-detail-helper.js
@@ -25,3 +25,52 @@ helper.editLogo = function() {
 helper.getLogoSrc = function() {
     return $('.image-container .image');
 };
+
+helper.requestOwnershipLb = function() {
+    return $('div[tg-lb-request-ownership]');
+};
+
+helper.requestOwnership = function() {
+    $('tg-admin-project-request-ownership .request').click();
+};
+
+helper.changeOwner = function() {
+    $('tg-admin-project-change-owner .request').click();
+};
+
+helper.acceptRequestOwnership = function() {
+    helper.requestOwnershipLb().$('.button-green').click();
+};
+
+helper.changeOwnerSuccessLb = function() {
+    return $('.lightbox-generic-success');
+};
+
+helper.getChangeOwnerLb = function() {
+    let el = $('div[tg-lb-change-owner]');
+
+    let obj = {
+        el: el,
+        waitOpen: function() {
+            return utils.lightbox.open(el);
+        },
+        waitClose: function() {
+            return utils.lightbox.close(el);
+        },
+        search: function(q) {
+            el.$$('input').get(0).sendKeys(q);
+        },
+        select: function(index) {
+            el.$$('.user-list-single').get(index).click();
+        },
+        addComment: function(text) {
+            el.$('.add-comment a').click();
+            el.$('textarea').sendKeys(text);
+        },
+        send: function() {
+            el.$('.submit-button').click();
+        }
+    };
+
+    return obj;
+};
diff --git a/e2e/suites/admin/project/project-detail.e2e.js b/e2e/suites/admin/project/project-detail.e2e.js
index 2ebb94a1..90e1a468 100644
--- a/e2e/suites/admin/project/project-detail.e2e.js
+++ b/e2e/suites/admin/project/project-detail.e2e.js
@@ -78,4 +78,43 @@ describe('project detail', function() {
 
         expect(src).to.contains('upload-image-test.png');
     });
+
+    it('request ownership', async function() {
+        adminHelper.requestOwnership();
+
+        await utils.lightbox.open(adminHelper.requestOwnershipLb());
+
+        expect(utils.notifications.success.open()).to.be.eventually.true;
+    });
+
+    it('change ownership', async function() {
+        await utils.common.createProject(['user5@taigaio.demo']);
+
+        await utils.nav
+            .init()
+            .admin()
+            .go();
+
+        adminHelper.changeOwner();
+
+        let lb = adminHelper.getChangeOwnerLb();
+
+        await lb.waitOpen();
+
+        lb.search('Alicia Flores');
+        lb.select(0);
+        lb.addComment('text');
+
+        utils.common.takeScreenshot('admin', 'project-transfer-lb');
+
+        lb.send();
+
+        let changeOwnerSuccessLb = adminHelper.changeOwnerSuccessLb();
+
+        await utils.lightbox.open(changeOwnerSuccessLb);
+
+        changeOwnerSuccessLb.$('.button-green').click();
+
+        await utils.lightbox.close(changeOwnerSuccessLb);
+    });
 });
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index ae8846ec..9f2efdd7 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -435,3 +435,50 @@ common.closeJoyride = async function() {
         await browser.sleep(600);
     }
 };
+
+common.createProject = async function(members = []) {
+    var createProject = require('../helpers').createProject;
+    var notifications = require('./notifications');
+
+    browser.get(browser.params.glob.host + 'projects/');
+    await common.waitLoader();
+
+    let lb = createProject.createProjectLightbox();
+
+    createProject.openWizard();
+
+    await lb.waitOpen();
+
+    lb.name().sendKeys('aaa');
+
+    lb.description().sendKeys('bbb');
+
+    await lb.submit();
+
+    await notifications.success.open();
+    await notifications.success.close();
+
+    if (members.length) {
+        var adminMembershipsHelper = require('../helpers').adminMemberships;
+
+        let url = await browser.getCurrentUrl();
+        url = url.split('/');
+        url = browser.params.glob.host + '/project/' + url[4] + '/admin/memberships';
+
+        browser.get(url);
+        await common.waitLoader();
+
+        let newMemberLightbox = adminMembershipsHelper.getNewMemberLightbox();
+        adminMembershipsHelper.openNewMemberLightbox();
+
+        await newMemberLightbox.waitOpen();
+
+        for(var i = 0; i < members.length; i++) {
+            newMemberLightbox.newEmail(members[i]);
+        }
+
+        newMemberLightbox.submit();
+
+        await newMemberLightbox.waitClose();
+    }
+};
diff --git a/e2e/utils/nav.js b/e2e/utils/nav.js
index ba663509..b5733c56 100644
--- a/e2e/utils/nav.js
+++ b/e2e/utils/nav.js
@@ -46,6 +46,11 @@ var actions = {
         browser.get(browser.params.glob.host);
         return common.waitLoader();
     },
+    admin: async function() {
+        await common.link($('#nav-admin a'));
+
+        return common.waitLoader();
+    },
     taskboard: async function(index) {
         let link = $$('.sprints .button-gray').get(index);
 
@@ -92,6 +97,10 @@ var nav = {
         this.actions.push(actions.home.bind(null));
         return this;
     },
+    admin: function() {
+        this.actions.push(actions.admin.bind(null));
+        return this;
+    },
     taskboard: function(index) {
         this.actions.push(actions.taskboard.bind(null, index));
         return this;

From bf6d74f8bf6b46a29f5bb0f8611d115e9fda8279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 22 Mar 2016 13:23:39 +0100
Subject: [PATCH 113/155] Fix errors page styles

---
 app/partials/error/permission-denied.jade | 12 +++++++++---
 app/styles/layout/not-found.scss          |  7 ++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/partials/error/permission-denied.jade b/app/partials/error/permission-denied.jade
index fa1333fc..f90e3561 100644
--- a/app/partials/error/permission-denied.jade
+++ b/app/partials/error/permission-denied.jade
@@ -2,8 +2,14 @@ doctype html
 
 div.error-main
     div.error-container
-        object.logo-svg(type="image/svg+xml", data="/svg/logo.svg")
-            img(src="/#{v}/images/logo.png", alt="TAIGA")
+        img.logo-svg(
+            ng-src="/#{v}/svg/logo.svg"
+            alt="TAIGA"
+        )
         h1.logo(translate="ERROR.PERMISSION_DENIED")
         p.error-text(translate="ERROR.PERMISSION_DENIED_TEXT")
-        a(href="/", title="", translate="COMMON.GO_HOME")
+        a(
+            href="/"
+            title=""
+            translate="COMMON.GO_HOME"
+        )
diff --git a/app/styles/layout/not-found.scss b/app/styles/layout/not-found.scss
index a7ced5bb..15f3345e 100644
--- a/app/styles/layout/not-found.scss
+++ b/app/styles/layout/not-found.scss
@@ -22,12 +22,9 @@
     }
     h1 {
         color: $white;
-        margin-bottom: 3rem;
+        margin-bottom: 1rem;
     }
     a {
-        color: $primary;
-        &:hover {
-            color: $primary-light;
-        }
+        color: $primary-light;
     }
 }

From 185b77cadd07262ff39b63c8a49ba8e81c121b79 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 23 Mar 2016 08:45:42 +0100
Subject: [PATCH 114/155] remove icon as mandatory confirm parameter

---
 app/coffee/modules/common/confirm.coffee | 25 ++++++++++++------------
 e2e/utils/notifications.js               | 14 +++++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index 713162d9..bb62cb60 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -169,20 +169,21 @@ class ConfirmService extends taiga.Service
         el.find("img").remove()
         el.find("svg").remove()
 
-        if icon.type == "img"
-            detailImage = $('<img>').addClass('lb-icon').attr('src', icon.name)
-        else if icon.type == "svg"
-            useSVG = document.createElementNS('http://www.w3.org/2000/svg', 'use')
-            useSVG.setAttributeNS('http://www.w3.org/1999/xlink','href', '#' + icon.name)
+        if icon
+            if icon.type == "img"
+                detailImage = $('<img>').addClass('lb-icon').attr('src', icon.name)
+            else if icon.type == "svg"
+                useSVG = document.createElementNS('http://www.w3.org/2000/svg', 'use')
+                useSVG.setAttributeNS('http://www.w3.org/1999/xlink','href', '#' + icon.name)
 
-            detailImage = document.createElementNS("http://www.w3.org/2000/svg", "svg")
-            detailImage.classList.add("icon")
-            detailImage.classList.add("lb-icon")
-            detailImage.classList.add(icon.name)
-            detailImage.appendChild(useSVG)
+                detailImage = document.createElementNS("http://www.w3.org/2000/svg", "svg")
+                detailImage.classList.add("icon")
+                detailImage.classList.add("lb-icon")
+                detailImage.classList.add(icon.name)
+                detailImage.appendChild(useSVG)
 
-        if detailImage
-            el.find('section').prepend(detailImage)
+            if detailImage
+                el.find('section').prepend(detailImage)
 
         # Render content
         el.find(".title").html(title) if title
diff --git a/e2e/utils/notifications.js b/e2e/utils/notifications.js
index 07719154..d5d42e10 100644
--- a/e2e/utils/notifications.js
+++ b/e2e/utils/notifications.js
@@ -77,3 +77,17 @@ notifications.errorLight.open = function() {
             });
         });
 };
+
+notifications.errorLight.close = function() {
+    var el = $('.notification-message-light-error');
+
+    return browser
+        .wait(function() {
+            return common.hasClass(el, 'inactive');
+        }, 4000)
+        .then(function(active) {
+            return browser.sleep(transition).then(function() {
+                return active;
+            });
+        });
+};

From 887041594b8ddedb1de0a4a6eb08e0af1bf980fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Mar 2016 09:54:11 +0100
Subject: [PATCH 115/155] Style fixes in kanban for themes

---
 app/themes/high-contrast/custom.scss   | 8 ++++----
 app/themes/material-design/custom.scss | 4 ++--
 app/themes/taiga/custom.scss           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/themes/high-contrast/custom.scss b/app/themes/high-contrast/custom.scss
index 758a94ce..d4527fc9 100644
--- a/app/themes/high-contrast/custom.scss
+++ b/app/themes/high-contrast/custom.scss
@@ -158,12 +158,12 @@ tg-project-menu {
 }
 
 .main-nav {
-    svg path {
+    svg {
         fill: $white;
     }
     .active {
         background: $white;
-        svg path {
+        svg {
             fill: $black;
         }
     }
@@ -198,7 +198,7 @@ tg-project-menu {
 //Kanban table
 .kanban-table-header {
     .task-colum-name {
-        background: lighten($white, 20%);
+        background: lighten($whitish, 50%);
         border-top: 3px solid $black;
         .icon {
             color: $black;
@@ -208,7 +208,7 @@ tg-project-menu {
 
 .kanban-table-body {
     .kanban-uses-box {
-        background: $whitish;
+        background: lighten($whitish, 50%);
     }
 }
 
diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss
index f17d0a73..987d7cd1 100644
--- a/app/themes/material-design/custom.scss
+++ b/app/themes/material-design/custom.scss
@@ -172,7 +172,7 @@ tg-project-menu {
 //Kanban table
 .kanban-table-header {
     .task-colum-name {
-        background: lighten($primary-light, 20%);
+        background: lighten($whitish, 5%);
         border-top: 3px solid $primary;
         .icon {
             color: $primary;
@@ -182,6 +182,6 @@ tg-project-menu {
 
 .kanban-table-body {
     .kanban-uses-box {
-        background: $whitish;
+        background: lighten($whitish, 5%);
     }
 }
diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss
index 8c64cb2b..890cdaca 100644
--- a/app/themes/taiga/custom.scss
+++ b/app/themes/taiga/custom.scss
@@ -152,7 +152,7 @@ tg-project-menu {
 //Kanban table
 .kanban-table-header {
     .task-colum-name {
-        background: $whitish;
+        background: lighten($whitish, 5%);
         border-top: 3px solid $gray-light;
         .icon {
             color: $gray-light;
@@ -162,6 +162,6 @@ tg-project-menu {
 
 .kanban-table-body {
     .kanban-uses-box {
-        background: $whitish;
+        background: lighten($whitish, 5%);
     }
 }

From 371b50c81eb0c236120cb1c48ea8e28810bd7ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Mar 2016 10:16:46 +0100
Subject: [PATCH 116/155] Fixed wrong basis width for module icons

---
 app/styles/modules/admin/admin-functionalities.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss
index 0dacc074..cc29e8e6 100644
--- a/app/styles/modules/admin/admin-functionalities.scss
+++ b/app/styles/modules/admin/admin-functionalities.scss
@@ -18,7 +18,7 @@
         }
     }
     .module-icon {
-        flex-basis: 2rem;
+        flex-basis: 3rem;
         flex-shrink: 0;
         margin: 0 .5rem 0 0;
         .icon {

From 25c71789920846bfcf1f451b98ef062265aac702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Mar 2016 10:35:49 +0100
Subject: [PATCH 117/155] Fix iocaine button when adding new task

---
 app/styles/modules/common/lightbox.scss | 4 ++++
 app/themes/taiga/custom.scss            | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 26bf2945..def10271 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -57,10 +57,14 @@
         }
         .requirement,
         .iocaine {
+            vertical-align: middle;
             &:hover {
                 background: $primary-light;
                 border: 1px solid $primary;
             }
+            svg {
+                @include svg-size(.75rem);
+            }
         }
 
         .blocked {
diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss
index 890cdaca..1b44de5a 100644
--- a/app/themes/taiga/custom.scss
+++ b/app/themes/taiga/custom.scss
@@ -61,11 +61,11 @@ input[type="date"],
 input[type="password"],
 select,
 textarea {
-    background: $whitish;
+    background: lighten($whitish, 6%);
     border-color: $gray-light;
     color: $grayer;
     @include placeholder {
-        color: darken($gray-light, 10%);
+        color: lighten($gray-light, 10%);
     }
     &.checksley-error {
         border: 1px solid $red;

From 075c3d04b3d5d402cd34288f9d28311631eedf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Mar 2016 10:37:47 +0100
Subject: [PATCH 118/155] Taskboard table body color contrast

---
 app/themes/taiga/custom.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss
index 1b44de5a..3c6a40dd 100644
--- a/app/themes/taiga/custom.scss
+++ b/app/themes/taiga/custom.scss
@@ -132,7 +132,7 @@ tg-project-menu {
 //Taskboard table
 .taskboard-table-header {
     .task-colum-name {
-        background: $whitish;
+        background: lighten($whitish, 5%);
         border-top: 3px solid $gray-light;
         .icon {
             fill: $gray-light;
@@ -141,7 +141,7 @@ tg-project-menu {
 }
 .taskboard-table-body {
     .taskboard-tasks-box {
-        background: $whitish;
+        background: lighten($whitish, 5%);
     }
 }
 

From b46f255745c8d14d767e079a96f516e3ed323725 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 23 Mar 2016 12:14:45 +0100
Subject: [PATCH 119/155] upgrade babel

---
 .babelrc                                |  1 +
 conf.e2e.js                             | 20 +++++++-------------
 e2e/capabilities.js                     | 18 ++++++++++++++----
 e2e/suites/admin/project/modules.e2e.js | 18 +++++++++---------
 e2e/utils/common.js                     |  9 +++------
 package.json                            |  7 +++++--
 6 files changed, 39 insertions(+), 34 deletions(-)
 create mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 00000000..7b893c5f
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1 @@
+{ "presets": ["es2015", "stage-0"] }
diff --git a/conf.e2e.js b/conf.e2e.js
index bca55590..b6b82dee 100644
--- a/conf.e2e.js
+++ b/conf.e2e.js
@@ -1,6 +1,5 @@
-require("babel/register")({
-    stage: 1
-});
+require("babel-register");
+require("babel-polyfill");
 
 var utils = require('./e2e/utils');
 
@@ -20,9 +19,13 @@ exports.config = {
     },
     mochaOpts: {
         timeout: 45000,
-        compilers: 'js:babel/register'
+        compilers: 'js:babel-register',
+        require: 'babel-polyfill'
     },
     // capabilities: {
+    //     'browserName': 'firefox'
+    // },
+    // capabilities: {
     //     browserName: 'internet explorer',
     //     version: '11'
     // },
@@ -99,10 +102,6 @@ exports.config = {
 
         browser.driver.manage().window().maximize();
 
-        browser.getCapabilities().then(function (cap) {
-            browser.browserName = cap.caps_.browserName;
-        });
-
         browser.get(browser.params.glob.host + 'login');
 
         var username = $('input[name="username"]');
@@ -125,11 +124,6 @@ exports.config = {
         .then(function() {
             return utils.common.closeJoyride();
         })
-        .then(function() {
-            return browser.getCapabilities();
-        }).then(function (cap) {
-            browser.browserName = cap.caps_.browserName;
-        })
         .then(function() {
             return browser.get(browser.params.glob.host);
         });
diff --git a/e2e/capabilities.js b/e2e/capabilities.js
index f754e79f..5ae4ea92 100644
--- a/e2e/capabilities.js
+++ b/e2e/capabilities.js
@@ -8,10 +8,20 @@ module.exports = browser.getCapabilities().then(function(s) {
     var shortName, shortVersion;
     var ie, ff, ch, sa;
     var platform;
-    platform = s.caps_.platform;
-    browserName = s.caps_.browserName;
-    browserVersion = s.caps_.version;
+
+    var capabilities = {};
+
+    for(let item of s) {
+        capabilities[item[0]] = item[1];
+    }
+
+    platform = capabilities.platform;
+    browserName = capabilities.browserName;
+    browserVersion = capabilities.version;
     shortVersion = browserVersion.split('.')[0];
+
+    browser.browserName = browserName;
+
     ie = /i.*explore/.test(browserName);
     ff = /firefox/.test(browserName);
     ch = /chrome/.test(browserName);
@@ -86,7 +96,7 @@ module.exports = browser.getCapabilities().then(function(s) {
     };
 
     // Save current webdriver session id for later use
-    browser.webdriverRemoteSessionId = s.caps_['webdriver.remote.sessionid'];
+    browser.webdriverRemoteSessionId = capabilities['webdriver.remote.sessionid'];
 
     browser.inSauceLabs = function() {
         return !!(browser.params.inSauceLabs);
diff --git a/e2e/suites/admin/project/modules.e2e.js b/e2e/suites/admin/project/modules.e2e.js
index bfc2976f..4e56f925 100644
--- a/e2e/suites/admin/project/modules.e2e.js
+++ b/e2e/suites/admin/project/modules.e2e.js
@@ -6,7 +6,7 @@ var chaiAsPromised = require('chai-as-promised');
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-describe.only('modules', function() {
+describe('modules', function() {
     before(async function(){
         browser.get(browser.params.glob.host + 'project/project-0/admin/project-profile/modules');
 
@@ -20,10 +20,10 @@ describe.only('modules', function() {
 
         let functionality = functionalities.get(0);
 
-        let label = functionality.$('.check div');
+        let input = functionality.$('.check input');
 
         browser.actions()
-            .mouseMove(label)
+            .mouseMove(input)
             .click()
             .perform();
 
@@ -40,10 +40,10 @@ describe.only('modules', function() {
 
         let functionality = functionalities.get(0);
 
-        let label = functionality.$('.check div');
+        let input = functionality.$('.check input');
 
         browser.actions()
-            .mouseMove(label)
+            .mouseMove(input)
             .click()
             .perform();
 
@@ -58,18 +58,18 @@ describe.only('modules', function() {
     it('enable videoconference', async function() {
         let functionality = $$('.module').get(4);
 
-        let label = functionality.$('.check div');
+        let input = functionality.$('.check input');
 
         browser.actions()
-            .mouseMove(label)
+            .mouseMove(input)
             .click()
             .perform();
 
         let videoconference = functionality.$$('select').get(0);
 
-        videoconference.$(`option:nth-child(1)`).click();
+        videoconference.$(`option:nth-child(2)`).click();
 
-        let salt = functionality.$$('select').get(0);
+        let salt = $('#videoconference-prefix');
 
         salt.sendKeys('abccceee');
 
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index 9f2efdd7..4877c918 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -26,10 +26,8 @@ common.hasClass = async function (element, cls) {
     return classes.split(' ').indexOf(cls) !== -1;
 };
 
-common.isBrowser = async function(browserName) {
-    let cap = await browser.getCapabilities();
-
-    return browserName === cap.caps_.browserName;
+common.isBrowser = function(browserName) {
+    return browserName === browser.browserName;
 };
 
 common.browserSkip = function(browserName, name, fn) {
@@ -102,8 +100,7 @@ common.waitLoader = function () {
 common.takeScreenshot = async function (section, filename) {
     await common.waitRequestAnimationFrame();
 
-    let cap = await browser.getCapabilities();
-    let browserName = cap.caps_.browserName;
+    let browserName = browser.browserName;
 
     let screenshotsFolder = __dirname + "/../screenshots/" + browserName + "/";
     let dir = screenshotsFolder + section + "/";
diff --git a/package.json b/package.json
index ec26f476..1232b445 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,14 @@
   "scripts": {
     "scss-lint": "gulp scss-lint --fail",
     "test": "./node_modules/karma/bin/karma start",
-    "e2e": "node ./node_modules/babel/bin/babel-node.js --stage=1 ./run-e2e.js"
+    "e2e": "./node_modules/.bin/babel-node run-e2e.js"
   },
   "devDependencies": {
     "angular-mocks": "1.4.7",
-    "babel": "^5.6.5",
+    "babel-cli": "^6.6.5",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-register": "^6.7.2",
     "bluebird": "^3.0.2",
     "chai": "^3.3.0",
     "chai-as-promised": "^5.1.0",

From 6fbd3a7f0615ce2d73c53856148d0b5960bd0ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Mar 2016 13:56:33 +0100
Subject: [PATCH 120/155] IE11 style fixes

---
 app/modules/projects/project/blocked-project.scss | 3 +++
 app/styles/modules/common/nav.scss                | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/modules/projects/project/blocked-project.scss b/app/modules/projects/project/blocked-project.scss
index 40bbc218..c53b7d04 100644
--- a/app/modules/projects/project/blocked-project.scss
+++ b/app/modules/projects/project/blocked-project.scss
@@ -2,8 +2,11 @@
     align-items: center;
     background: url('../images/discover.png') bottom center repeat-x;
     display: flex;
+    height: calc(100vh - 40px);
     justify-content: center;
     min-height: calc(100vh - 40px);
+    min-width: 100vw;
+    width: 100vw;
 }
 
 .blocked-project-inner {
diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 232dd04d..9a2f7b56 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -3,6 +3,7 @@ $label-arrow-wh: 12px;
 tg-project-menu {
     background-position: 0 -300px;
     display: inline-block;
+    height: calc(100vh - 40px);
     min-height: 95%;
     min-width: 50px;
     padding: 1rem 0;

From 56cb222fd63aaca86e36339370dbdc8c840696c7 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 23 Mar 2016 12:30:11 +0100
Subject: [PATCH 121/155] fix leaving project warning close link

---
 .../common/lightbox/lightbox-leave-project-warning.jade   | 5 +++--
 e2e/suites/team.e2e.js                                    | 8 ++++++--
 e2e/utils/lightbox.js                                     | 4 +---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/partials/common/lightbox/lightbox-leave-project-warning.jade b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
index 06ce8158..24210682 100644
--- a/app/partials/common/lightbox/lightbox-leave-project-warning.jade
+++ b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
@@ -1,5 +1,6 @@
-svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}")
-    use(xlink:href="#icon-close")
+a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
+    svg.icon.icon-close(title="{{'COMMON.CLOSE' | translate}}")
+        use(xlink:href="#icon-close")
 div.content
     svg.icon.icon-exclamation
         use(xlink:href="#icon-exclamation")
diff --git a/e2e/suites/team.e2e.js b/e2e/suites/team.e2e.js
index da7f33b3..6da84e2e 100644
--- a/e2e/suites/team.e2e.js
+++ b/e2e/suites/team.e2e.js
@@ -40,8 +40,12 @@ describe('leaving project owner', function(){
 
         let lb = teamHelper.leavingProjectWarningLb();
 
-        await utils.lightbox.exit(lb);
-        await utils.lightbox.close(lb);
+        await utils.lightbox.open(lb);
+
+        utils.lightbox.exit(lb);
+
+        let isPresent = await lb.isPresent();
+        expect(isPresent).to.be.false;
     });
 });
 
diff --git a/e2e/utils/lightbox.js b/e2e/utils/lightbox.js
index b4504568..471bb098 100644
--- a/e2e/utils/lightbox.js
+++ b/e2e/utils/lightbox.js
@@ -4,13 +4,11 @@ var lightbox = module.exports;
 var transition = 300;
 
 lightbox.exit = function(el) {
-    var deferred = protractor.promise.defer();
-
     if (typeof el === 'string' || el instanceof String) {
         el = $(el);
     }
 
-    el.$('.icon-close').click();
+    el.$('.close').click();
 };
 
 lightbox.open = async function(el) {

From b636cfd5cf7a4318bba699f4865b30ff98fbfda0 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 23 Mar 2016 14:15:49 +0100
Subject: [PATCH 122/155] several e2e fixes

---
 app/coffee/modules/admin/memberships.coffee   |  3 +--
 .../includes/modules/related-tasks.jade       |  2 +-
 e2e/helpers/admin-memberships.js              |  2 +-
 e2e/helpers/custom-fields-helper.js           |  9 ++++----
 e2e/helpers/issues-helper.js                  |  6 ++---
 e2e/helpers/us-detail-helper.js               | 11 +++++++---
 e2e/shared/detail.js                          |  4 +++-
 e2e/suites/admin/members.e2e.js               |  8 +++++--
 e2e/suites/admin/project/create-delete.e2e.js | 22 +++++++++----------
 e2e/suites/issues/issues.e2e.js               |  4 +++-
 e2e/suites/tasks/taskboard.e2e.js             |  2 +-
 e2e/utils/common.js                           |  2 ++
 12 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index a85ae6e2..d50009b0 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -486,9 +486,8 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
 
     return {link: link}
 
-
 module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile",
-                                             "$translate", MembershipsRowActionsDirective])
+                                             "$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective])
 
 
 #############################################################################
diff --git a/app/partials/includes/modules/related-tasks.jade b/app/partials/includes/modules/related-tasks.jade
index da0c24ba..c7a5054e 100644
--- a/app/partials/includes/modules/related-tasks.jade
+++ b/app/partials/includes/modules/related-tasks.jade
@@ -6,7 +6,7 @@ section.related-tasks(
         span.related-tasks-title(translate="COMMON.RELATED_TASKS")
         div(tg-related-task-create-button)
     .related-tasks-body
-        .row.single-related-task(
+        .row.single-related-task.js-related-task(
             ng-repeat="task in tasks"
             ng-class="{closed: task.is_closed, blocked: task.is_blocked, iocaine: task.is_iocaine}"
             tg-related-task-row
diff --git a/e2e/helpers/admin-memberships.js b/e2e/helpers/admin-memberships.js
index cb420c35..bcef88a6 100644
--- a/e2e/helpers/admin-memberships.js
+++ b/e2e/helpers/admin-memberships.js
@@ -7,7 +7,7 @@ helper.openNewMemberLightbox = function() {
 };
 
 helper.getNewMemberLightbox = function() {
-    let el = $('div[tg-lb-create-members]');
+    let el = $('div[tg-lb-add-members]');
 
     let obj = {
         el: el,
diff --git a/e2e/helpers/custom-fields-helper.js b/e2e/helpers/custom-fields-helper.js
index 5420a98e..84a6d5ef 100644
--- a/e2e/helpers/custom-fields-helper.js
+++ b/e2e/helpers/custom-fields-helper.js
@@ -2,20 +2,19 @@ var utils = require('../utils');
 
 var helper = module.exports;
 
-helper.create = function(indexType, name, desc, option) {
+helper.create = async function(indexType, name, desc, option) {
     let type = $$('div[tg-project-custom-attributes]').get(indexType);
 
     type.$('.js-add-custom-field-button').click();
-
     let form = type.$$('form').last();
 
-    form.$('input[name="name"]').sendKeys(name);
-    form.$('input[name="description"]').sendKeys(desc);
+    await form.$('input[name="name"]').sendKeys(name);
+    await form.$('input[name="description"]').sendKeys(desc);
     form.$(`select option:nth-child(${option})`).click();
 
     let saveButton = form.$('.js-create-custom-field-button');
 
-    browser.actions()
+    return browser.actions()
         .mouseMove(saveButton)
         .click()
         .perform();
diff --git a/e2e/helpers/issues-helper.js b/e2e/helpers/issues-helper.js
index ef66b5d0..ec081fc6 100644
--- a/e2e/helpers/issues-helper.js
+++ b/e2e/helpers/issues-helper.js
@@ -134,13 +134,13 @@ helper.getCustomFilters = function() {
 };
 
 helper.removeCustomFilters = async function() {
-    let count = await $$('.filter-list .icon-delete').count();
+    let count = await $$('.filter-list .remove-filter').count();
 
     while(count) {
-        $$('.filter-list .icon-delete').get(0).click();
+        $$('.filter-list .remove-filter').get(0).click();
 
         await utils.lightbox.confirm.ok();
 
-        count = await $$('.filter-list .icon-delete').count();
+        count = await $$('.filter-list .remove-filter').count();
     }
 };
diff --git a/e2e/helpers/us-detail-helper.js b/e2e/helpers/us-detail-helper.js
index 9e538ab0..563530ae 100644
--- a/e2e/helpers/us-detail-helper.js
+++ b/e2e/helpers/us-detail-helper.js
@@ -44,7 +44,7 @@ helper.clientRequirement = function() {
 };
 
 helper.relatedTaskForm = async function(form, name, status, assigned_to) {
-   form.$('input').sendKeys(name);
+    await form.$('input').sendKeys(name);
 
     let taskStatus = form.$('.task-status');
 
@@ -58,7 +58,12 @@ helper.relatedTaskForm = async function(form, name, status, assigned_to) {
     await assignToLightbox.selectFirst();
     await assignToLightbox.waitClose();
 
-    form.$('.icon-save').click();
+    let saveBtn = form.$('.icon-save');
+
+    await browser.actions()
+        .mouseMove(saveBtn)
+        .click()
+        .perform();
 };
 
 helper.createRelatedTasks = function(name, status, assigned_to) {
@@ -94,5 +99,5 @@ helper.deleteRelatedTask = function(taskIndex, name, status, assigned_to) {
 };
 
 helper.relatedTasks = function() {
-    return $$('.related-tasks-body .single-related-task');
+    return $$('.js-related-task');
 };
diff --git a/e2e/shared/detail.js b/e2e/shared/detail.js
index a9b1a361..40bac601 100644
--- a/e2e/shared/detail.js
+++ b/e2e/shared/detail.js
@@ -367,7 +367,9 @@ shared.customFields = function(typeIndex) {
     before(async function() {
         let url = await browser.getCurrentUrl();
         let rootUrl = await commonUtil.getProjectUrlRoot();
-        browser.get(rootUrl + '/admin/project-values/custom-fields');
+
+        await browser.get(rootUrl + '/admin/project-values/custom-fields');
+        await browser.sleep(2000);
 
         await customFieldsHelper.create(typeIndex, 'detail-test-custom-fields-text', 'desc1', 1);
 
diff --git a/e2e/suites/admin/members.e2e.js b/e2e/suites/admin/members.e2e.js
index 02de904b..399d2ffe 100644
--- a/e2e/suites/admin/members.e2e.js
+++ b/e2e/suites/admin/members.e2e.js
@@ -106,8 +106,12 @@ describe('admin - members', function() {
 
         let lb = adminMembershipsHelper.leavingProjectWarningLb();
 
-        await utils.lightbox.exit(lb);
-        await utils.lightbox.close(lb);
+        await utils.lightbox.open(lb);
+
+        utils.lightbox.exit(lb);
+
+        let isPresent = await lb.isPresent();
+        expect(isPresent).to.be.false;
     });
 
     it('change role', async function() {
diff --git a/e2e/suites/admin/project/create-delete.e2e.js b/e2e/suites/admin/project/create-delete.e2e.js
index 06048212..fa338d0a 100644
--- a/e2e/suites/admin/project/create-delete.e2e.js
+++ b/e2e/suites/admin/project/create-delete.e2e.js
@@ -22,33 +22,31 @@ describe('create-delete project', function() {
         createProject.openWizard();
 
         await lb.waitOpen();
+
+        utils.common.takeScreenshot('project-wizard', 'create-project');
     });
 
-    it('create - step 1', async function() {
-        utils.common.takeScreenshot('project-wizard', 'step1');
-
-        await lb.next();
-    });
-
-    it('create - step 2 errors', async function() {
-        utils.common.takeScreenshot('project-wizard', 'step2');
+    it('create project error', async function() {
+        utils.common.takeScreenshot('project-wizard', 'create-project-errors');
 
         await lb.submit();
 
-        utils.common.takeScreenshot('project-wizard', 'step2-error');
-
         let errors = await lb.errors().count();
 
         expect(errors).to.be.equal(2);
     });
 
-    it('create - step 2', async function() {
+    it('create project', async function() {
         lb.name().sendKeys('aaa');
         lb.description().sendKeys('bbb');
 
         await lb.submit();
 
-        expect(utils.notifications.success.open()).to.be.eventually.true;
+        let open = utils.notifications.success.open();
+
+        expect(open).to.be.equal.true;
+
+        await utils.notifications.success.close();
     });
 
     it('delete', async function() {
diff --git a/e2e/suites/issues/issues.e2e.js b/e2e/suites/issues/issues.e2e.js
index 8eeb93f1..8c840e0f 100644
--- a/e2e/suites/issues/issues.e2e.js
+++ b/e2e/suites/issues/issues.e2e.js
@@ -307,7 +307,9 @@ describe('issues list', function() {
         it('remove custom filter', async function() {
             await issuesHelper.removeCustomFilters();
 
-            expect(issuesHelper.getCustomFilters().count()).to.be.eventually.equal(0);
+            let customFilterCount = await issuesHelper.getCustomFilters().count();
+
+            expect(customFilterCount).to.be.equal(0);
         });
     });
 });
diff --git a/e2e/suites/tasks/taskboard.e2e.js b/e2e/suites/tasks/taskboard.e2e.js
index c1ba08e6..1bfa66d6 100644
--- a/e2e/suites/tasks/taskboard.e2e.js
+++ b/e2e/suites/tasks/taskboard.e2e.js
@@ -151,7 +151,7 @@ describe('taskboard', function() {
         });
     });
 
-    describe.only('folds', function() {
+    describe('folds', function() {
         it('fold row', async function() {
             taskboardHelper.foldRow(0);
 
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index 4877c918..4c981c2e 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -74,6 +74,8 @@ common.link = async function(el) {
         return (href.length > 1 && href !== browser.params.glob.host + "#");
      }, 5000);
 
+
+
     await browser
         .actions()
         .mouseMove(el)

From 121346871c121975fbcc72d69e7c42b21825f5dd Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 23 Mar 2016 14:33:35 +0100
Subject: [PATCH 123/155] add missing delete user text

---
 app/locales/taiga/locale-en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 936d704f..12dc8ec4 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -889,7 +889,8 @@
             "NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Delete project",

From c850b6e523a5c7ee3a707de8c09d04d2f81eaf95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 24 Mar 2016 12:25:05 +0100
Subject: [PATCH 124/155] [i18n] Update locales

---
 app/locales/taiga/locale-ca.json      |  68 +++++++++--
 app/locales/taiga/locale-de.json      |  70 ++++++++---
 app/locales/taiga/locale-es.json      |  70 ++++++++---
 app/locales/taiga/locale-fi.json      |  70 ++++++++---
 app/locales/taiga/locale-fr.json      | 162 ++++++++++++++++----------
 app/locales/taiga/locale-it.json      |  70 ++++++++---
 app/locales/taiga/locale-nl.json      |  70 ++++++++---
 app/locales/taiga/locale-pl.json      |  70 ++++++++---
 app/locales/taiga/locale-pt-br.json   |  70 ++++++++---
 app/locales/taiga/locale-ru.json      |  70 ++++++++---
 app/locales/taiga/locale-sv.json      |  70 ++++++++---
 app/locales/taiga/locale-tr.json      |  70 ++++++++---
 app/locales/taiga/locale-zh-hant.json |  70 ++++++++---
 13 files changed, 786 insertions(+), 214 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index 2e96a1a6..979d773d 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Afiliacions - {{projectName}}",
             "ADD_BUTTON": "+ Nou membre",
             "ADD_BUTTON_TITLE": "Afegir nou membre",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Serveis"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) es massa gran per als nostres Oompa Loompas, prova amb algun inferior a ({{maxFileSize}})",
             "SYNC_SUCCESS": "El teu projecte s'ha importat correctament",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Esborrar compte de Taiga",
             "CONFIRM": "Segur que vols borrar el teu compte de Taiga? ",
-            "SUBTITLE": "Te trobarem a faltar! :-(",
             "NEWSLETTER_LABEL_TEXT": "No vull rebre més el vostre butlletí de notícies",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Afegix un text personalizat a la invitació. Dis-li algo divertit als nous membres. ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Escriu un correu"
+            "PLACEHOLDER_TYPE_EMAIL": "Escriu un correu",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crear projecte",
         "CREATE_PROJECT_TEXT": "Nou projecte. Qué il·lusió!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Quina plantilla encaixa millor al teu projecte?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Crear projecte",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index 48bbf81f..f4a575ed 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Mitgliedschaften - {{projectName}}",
             "ADD_BUTTON": "+ Neues Mitglied",
             "ADD_BUTTON_TITLE": "Neues Mitglied hinzufügen",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportieren",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Berichte",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Dienste"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Passwort ändern",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Entdecke aktuelle Projekte",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Neu",
             "DISCOVER": "Entdecken",
             "ACTION_REORDER": "Benutzen Sie Drag & Drop zum neuen Ordnen"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) ist zu schwierig für unsere Helferlein, versuchen Sie es bitte mit einer kleineren Datei als ({{maxFileSize}})",
             "SYNC_SUCCESS": "Ihr Projekt wurde erfolgreich importiert",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Dein Taiga Benutzerkonto löschen",
             "CONFIRM": "Sind Sie sicher, dass Sie Ihr Taiga Benutzerkonto löschen wollen?",
-            "SUBTITLE": "Wir werden Sie vermissen! :-(",
             "NEWSLETTER_LABEL_TEXT": "Ich möchte keinen Newsletter mehr erhalten",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Fügen Sie einen persönlichen Text zur Einladung hinzu. Erzählen Sie Ihren neuen Mitgliedern etwas Schönes. ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Geben Sie eine E-Mail ein"
+            "PLACEHOLDER_TYPE_EMAIL": "Geben Sie eine E-Mail ein",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Projekt erstellen",
         "CREATE_PROJECT_TEXT": "Frisch und sauber. Wie aufregend!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Welches Template würde besser zu Ihrem Projekt passen?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Projekt anlegen",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index 62a0f1da..cc20a36a 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Miembros - {{projectName}}",
             "ADD_BUTTON": "+ Nuevo miembro",
             "ADD_BUTTON_TITLE": "Añadir un nuevo miembro",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Servicios"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Cambiar contraseña",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Descubre los proyectos más relevantes",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Nueva",
             "DISCOVER": "Descubrir",
             "ACTION_REORDER": "Arrastrar y soltar para reordenar"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "El fichero '{{fileName}}' ({{fileSize}}) es demasiado pesado para nuestros Oompa Loompas, prueba con uno de menos de ({{maxFileSize}}).",
             "SYNC_SUCCESS": "Tu proyecto se ha importado con éxito.",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Eliminar cuenta de Taiga",
             "CONFIRM": "¿Está seguro que deseas eliminar tu cuenta de Taiga?",
-            "SUBTITLE": "¡Te extrañaremos! :-(",
             "NEWSLETTER_LABEL_TEXT": "No quiero recibir la newsletter nunca más.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Añade un texto personalizado a la invitación. Dile algo encantador a tus nuevos miembros ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Escribe un email"
+            "PLACEHOLDER_TYPE_EMAIL": "Escribe un email",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crear Proyecto",
         "CREATE_PROJECT_TEXT": "Fresco y claro. ¡Es emocionante!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "¿Que plantilla se ajusta mejor con tu proyecto?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Crear proyecto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index e6f4818d..6df07a5f 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ Uusi jäsen",
             "ADD_BUTTON_TITLE": "Lisää jäsen",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Vie",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Raportit",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Palvelut"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Muuta salasanaa",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Discover trending projects",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Uusi",
             "DISCOVER": "Discover",
             "ACTION_REORDER": "Drag & drop to reorder"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) on liian iso Oompa Loompaseille, kokeile pienemmällä kuin ({{maxFileSize}})",
             "SYNC_SUCCESS": "Projektisi on tuotu sisään onnistuneesti",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Poista Taiga-tunnus",
             "CONFIRM": "Haluatko varmasti poistaa Taiga-tunnuksesi?",
-            "SUBTITLE": "Tulemme kaipaamaan sinua! :-(",
             "NEWSLETTER_LABEL_TEXT": "En halua uutiskirjettä enää",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Vapaaehtoinen) Lisää oma kuvaus kutsuusi uusille jäsenille ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Anna sähköposti"
+            "PLACEHOLDER_TYPE_EMAIL": "Anna sähköposti",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Luo projekti",
         "CREATE_PROJECT_TEXT": "Täysin koskematon. Jännittävää!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Mikä pohja sopii paremmin projektillesi?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Luo projekti",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index f4b58c69..7bc794b9 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -24,7 +24,7 @@
         "UNBLOCK": "Débloquer",
         "UNBLOCK_TITLE": "Débloquer cet élément",
         "BLOCKED_NOTE": "Pourquoi est-ce bloqué ?",
-        "BLOCKED_REASON": "Veillez s'il vous plait indiquer la raison",
+        "BLOCKED_REASON": "Veuillez s'il vous plait indiquer la raison",
         "CREATED_BY": "Créé par {{fullDisplayName}}",
         "FROM": "de",
         "TO": "à",
@@ -41,8 +41,8 @@
         "IOCAINE_TEXT": "Vous vous sentez un peu submergé(e) par une tâche ? Soyez certains d'en informer les autres en cliquant sur Iocaine lors de la modification de la tâche. Il est possible de s'immuniser contre ce poison (fictif) en consommant de petites quantités en heures supplémentaires, tout comme il est possible de s'améliorer en acceptant parfois de nouveaux défis !",
         "CLIENT_REQUIREMENT": "Un besoin client est un nouveau besoin qui n'était pas prévu et qu'il est nécessaire d'intégrer au projet",
         "TEAM_REQUIREMENT": "Un besoin projet est un besoin qui est nécessaire au projet mais qui ne doit avoir aucun impact pour le client",
-        "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "OWNER": "Propriétaire du Projet",
+        "CAPSLOCK_WARNING": "Attention : vous écrivez en lettres majuscules alors que ce champ est sensible à la casse.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Cette valeur semble être invalide.",
             "TYPE_EMAIL": "Cette valeur devrait être une adresse courriel valide.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Vous devez sélectionner %s options ou moins.",
             "RANGE_CHECK": "Vous devez sélectionner parmi les choix %s et %s.",
             "EQUAL_TO": "Cette valeur doit être identique.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "Une ou plusieurs lignes sont trop longues. Elles doivent avoir %s caractères au maximum.",
+            "PIKADAY": "Format de date invalide, utiliser DD MMM YYYY (par exemple 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -119,7 +119,7 @@
             "ADD": "Ajouter un mot-clé"
         },
         "DESCRIPTION": {
-            "EMPTY": "Un espace vide est si ennuyeux… allez-y, soyez descriptif… ",
+            "EMPTY": "Un espace vide est si ennuyeux… allez-y, soyez descriptif…",
             "NO_DESCRIPTION": "Pas encore de description"
         },
         "FIELDS": {
@@ -147,7 +147,7 @@
         },
         "ASSIGNED_TO": {
             "NOT_ASSIGNED": "Non affecté",
-            "ASSIGN": "Assigné",
+            "ASSIGN": "Affecter",
             "DELETE_ASSIGNMENT": "Supprimer l'affectation",
             "REMOVE_ASSIGNED": "Supprimer l'affectation",
             "TOO_MANY": "...trop d'utilisateurs ; filtrez davantage",
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Membres - {{projectName}}",
             "ADD_BUTTON": "+ Nouveau membre",
             "ADD_BUTTON_TITLE": "Ajouter un membre",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exporter",
@@ -432,10 +432,10 @@
             "DISABLE": "Désactiver",
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gérez votre récits utilisateur pour garder une vue organisée des travaux à venir et priorisés.",
-            "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
-            "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS": "Nombre prévu de sprints",
+            "NUMBER_SPRINTS_HELP": "0 pour une quantité indéterminée",
+            "NUMBER_US_POINTS": "Total prévu de points d'histoire",
+            "NUMBER_US_POINTS_HELP": "0 pour une quantité indéterminée",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisez votre projet de manière agile avec ce tableau.",
             "ISSUES": "Tickets",
@@ -443,9 +443,9 @@
             "WIKI": "Wiki",
             "WIKI_DESCRIPTION": "Ajoutez, modifiez, ou supprimez du contenu en collaboration avec d'autres. C'est le bon endroit pour la documentation de votre projet.",
             "MEETUP": "Meet Up",
-            "MEETUP_DESCRIPTION": "Choose your videoconference system.",
+            "MEETUP_DESCRIPTION": "Choisissez un système de vidéoconférence",
             "SELECT_VIDEOCONFERENCE": "Choisissez un système de vidéoconférence",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Ajouter un préfix au nom de l'espace de discussion",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -468,11 +468,20 @@
             "DELETE": "Supprimer ce projet",
             "LOGO_HELP": "L'image va être agrandie à 80x80px",
             "CHANGE_LOGO": "Changer le logo",
-            "ACTION_USE_DEFAULT_LOGO": "Utiliser l'image par défaut ",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "ACTION_USE_DEFAULT_LOGO": "Utiliser l'image par défaut",
+            "MAX_PRIVATE_PROJECTS": "Vous avez atteint le nombre maximum de projets privés",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "Ce projet dépasse le nombre maximum de membres autorisés pour un projet privé",
+            "MAX_PUBLIC_PROJECTS": "Vous avez atteint le nombre maximum de projets publics",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "Ce projet dépasse le nombre maximum de membres autorisés pour un projet public.",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Rapports",
@@ -508,7 +517,7 @@
         },
         "PROJECT_VALUES": {
             "PAGE_TITLE": "{{sectionName}} - Valeurs du projet - {{projectName}}",
-            "REPLACEMENT": "Tous les éléments avec cette valeur seront modifiés pour ",
+            "REPLACEMENT": "Tous les éléments avec cette valeur seront modifiés pour",
             "ERROR_DELETE_ALL": "Vous ne pouvez pas effacer toutes les valeurs."
         },
         "PROJECT_VALUES_POINTS": {
@@ -554,7 +563,7 @@
             "REPLACEMENT_ROLE": "Tous les utilisateurs avec ce rôle seront déplacés dans",
             "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
             "ERROR_DELETE_ALL": "Vous ne pouvez pas supprimer toutes les valeurs",
-            "EXTERNAL_USER": "Utilisateur externe "
+            "EXTERNAL_USER": "Utilisateur externe"
         },
         "THIRD_PARTIES": {
             "SECRET_KEY": "Clé secrète",
@@ -592,7 +601,7 @@
             "REQUEST": "Requête",
             "RESEND_REQUEST": "Renvoyer la requête",
             "HEADERS": "Entêtes",
-            "PAYLOAD": "Données utiles ",
+            "PAYLOAD": "Données utiles",
             "RESPONSE": "Réponse",
             "DATE": "DD MMM YYYY [at] hh:mm:ss",
             "ACTION_HIDE_HISTORY": "(Cacher l'historique)",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Services"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -741,9 +768,9 @@
         "WATCHERS_COUNTER_TITLE": "{total, plural, one{un observateur} other{# observateurs}}",
         "MEMBERS_COUNTER_TITLE": "{total, plural, one{un membre} other{# membres}}",
         "BLOCKED_PROJECT": {
-            "BLOCKED": "Blocked project",
-            "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "BLOCKED": "Projet bloqué",
+            "THIS_PROJECT_IS_BLOCKED": "Ce projet est temporairement verrouillé",
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "Vous devez contacter l'équipe d'administration pour déverrouiller vos projets"
         },
         "STATS": {
             "PROJECT": "points<br/> projet",
@@ -774,7 +801,7 @@
             "TITLE_NEXT_PROJECT": "Montrer les projets suivants",
             "HELP_TITLE": "Page d'assistance Taiga",
             "HELP": "Aide",
-            "HOMEPAGE": "Page d'accueil ",
+            "HOMEPAGE": "Page d'accueil",
             "FEEDBACK_TITLE": "Envoyez vos commentaires",
             "FEEDBACK": "Feedback",
             "NOTIFICATIONS_TITLE": "Modifier vos réglages de notification",
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Modifier le mot de passe",
             "DASHBOARD_TITLE": "Tableau de bord",
             "DISCOVER_TITLE": "Découvrir les projets populaires",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Nouveau",
             "DISCOVER": "Découvrir",
             "ACTION_REORDER": "Glisser-déposer pour réorganiser"
         },
@@ -808,28 +835,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) est un peu trop lourd pour nos Oompa Loompas, réessayez avec un fichier d'une taille inférieure à ({{maxFileSize}})",
             "SYNC_SUCCESS": "Votre projet a été importé avec succès",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Vous n'avez plus d'espace pour un projet privé supplémentaire",
+                    "DESC": "Le projet que vous souhaitez importer est privé mais vous n'avez plus d'espace pour en créer de nouveaux."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Vous n'avez plus d'espace pour un projet public supplémentaire",
+                    "DESC": "Le projet que vous souhaitez importer est public mais vous n'avez plus d'espace pour en créer de nouveaux."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
+                    "DESC": "Le projet que vous souhaitez importer est privé et contient {{members}} utilisateurs."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
+                    "DESC": "Le projet que vous souhaitez importer est public et contient plus de {{members}} utilisateurs."
                 }
             }
         },
@@ -859,10 +886,9 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Supprimer le compte Taiga",
             "CONFIRM": "Etes-vous sûr de vouloir supprimer votre compte Taiga ?",
-            "SUBTITLE": "Vous allez nous manquer ! :-(",
             "NEWSLETTER_LABEL_TEXT": "Je ne veux plus recevoir votre bulletin d'information",
-            "CANCEL": "Back to settings",
-            "ACCEPT": "Delete account",
+            "CANCEL": "Retour aux réglages",
+            "ACCEPT": "Supprimer le compte",
             "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
         },
         "DELETE_PROJECT": {
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optionnel) Ajoutez un texte personnalisé à l'invitation. Dites quelque chose de gentil à vos nouveaux membres ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Saisissez une adresse courriel"
+            "PLACEHOLDER_TYPE_EMAIL": "Saisissez une adresse courriel",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1056,7 +1100,7 @@
         },
         "SPRINT_SUMMARY": {
             "TOTAL_POINTS": "total<br />points",
-            "COMPLETED_POINTS": "complétés<br />points",
+            "COMPLETED_POINTS": "points<br />complétés",
             "OPEN_TASKS": "tâches<br /> ouvertes",
             "CLOSED_TASKS": "tâches<br />fermées",
             "IOCAINE_DOSES": "doses<br />de iocaine",
@@ -1329,7 +1373,7 @@
     "USER_PROFILE": {
         "IMAGE_HELP": "L'image va être agrandie à 80x80px",
         "ACTION_CHANGE_IMAGE": "Modifier",
-        "ACTION_USE_GRAVATAR": "Utiliser l'image par défaut ",
+        "ACTION_USE_GRAVATAR": "Utiliser l'image par défaut",
         "ACTION_DELETE_ACCOUNT": "Supprime le compte Taiga",
         "CHANGE_EMAIL_SUCCESS": "<strong>Consultez votre messagerie !</strong><br />Nous vous avons envoyé un courriel<br />avec les instructions à suivre pour saisir votre nouvelle adresse",
         "CHANGE_PHOTO": "Changer la photo",
@@ -1349,16 +1393,16 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Créer un projet",
         "CREATE_PROJECT_TEXT": "Tout beau, tout nouveau !",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
-        "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
-        "CHOOSE_TEMPLATE_INFO": "More info",
-        "PROJECT_DETAILS": "Project Details",
-        "PUBLIC_PROJECT": "Public Project",
-        "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
-        "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-        "CHANGE_PLANS": "change plans"
+        "CHOOSE_TEMPLATE": "Quel template conviendrait le mieux à votre projet ?",
+        "CHOOSE_TEMPLATE_TITLE": "Plus d'information sur les templates de projets",
+        "CHOOSE_TEMPLATE_INFO": "Plus d'informations",
+        "PROJECT_DETAILS": "Détails du projet",
+        "PUBLIC_PROJECT": "Projet public",
+        "PRIVATE_PROJECT": "Projet privé",
+        "CREATE_PROJECT": "Créer un projet",
+        "MAX_PRIVATE_PROJECTS": "Vous avez atteint le nombre maximum de projets privés",
+        "MAX_PUBLIC_PROJECTS": "Vous avez atteint le nombre maximum de projets publics",
+        "CHANGE_PLANS": "changer de souscription"
     },
     "WIKI": {
         "PAGE_TITLE": "{{wikiPageName}} - Wiki - {{projectName}}",
@@ -1495,12 +1539,12 @@
         }
     },
     "DISCOVER": {
-        "PAGE_TITLE": "Discover projects - Taiga",
+        "PAGE_TITLE": "Découvrir les projets - Taiga",
         "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
         "DISCOVER_TITLE": "Découvrir les projets",
         "DISCOVER_SUBTITLE": "{projects, plural, one{Un projet public à découvrir} other{# projets publics à découvrir}}",
         "MOST_ACTIVE": "les plus actifs",
-        "MOST_ACTIVE_EMPTY": "Il n'y a pas de projets actifs pour le moment",
+        "MOST_ACTIVE_EMPTY": "Il n'y a pas de projet actif pour le moment",
         "MOST_LIKED": "Les plus « aimés »",
         "MOST_LIKED_EMPTY": "Il n'y a pas encore de projet « aimé »",
         "VIEW_MORE": "Voir plus",
@@ -1514,12 +1558,12 @@
             "PEOPLE": "En recherche de membres",
             "WEEK": "Semaine dernière",
             "MONTH": "Mois dernier",
-            "YEAR": "Leanne dernière",
+            "YEAR": "Année dernière",
             "ALL_TIME": "Tout le temps",
             "CLEAR": "Effacer les filtres"
         },
         "SEARCH": {
-            "PAGE_TITLE": "Search - Discover projects - Taiga",
+            "PAGE_TITLE": "Rechercher - Découvrir les projets - Taiga",
             "PAGE_DESCRIPTION": "Searchable directory of Public Projects in Taiga. Explore backlogs, timelines, issues, and teams. Check out the most liked or most active projects. Filter by Kanban or Scrum.",
             "INPUT_PLACEHOLDER": "Écrivez quelque chose...",
             "ACTION_TITLE": "Rechercher",
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index 67887a44..cd913564 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Webhooks - {{projectName}}",
             "ADD_BUTTON": "Nuovo Membro",
             "ADD_BUTTON_TITLE": "Aggiungi un nuovo membro",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Esporta",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Rapporti",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Servizi"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Cambia password",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Scopri i progetti più seguiti",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Nuovo",
             "DISCOVER": "Scopri",
             "ACTION_REORDER": "Usa drag & drop per riordinare"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) è troppo pesante per i nostri Oompa Loompa; falli contenti, prova con una dimensione minore di ({{maxFileSize}})",
             "SYNC_SUCCESS": "Il tuo progetto è stato importato con successo",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Elimina Account Taiga",
             "CONFIRM": "Sei sicuro di voler eliminare il tuo account Taiga?",
-            "SUBTITLE": "Ci mancherai! :-(",
             "NEWSLETTER_LABEL_TEXT": "Non voglio più ricevere le vostre newsletter",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(facoltativo) aggiungi un testo personalizzato all'invito. Di qualcosa di simpatico ai tuoi nuovi membri ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Scrivi una mail"
+            "PLACEHOLDER_TYPE_EMAIL": "Scrivi una mail",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crea Progetto",
         "CREATE_PROJECT_TEXT": "Nuovo di zecca. Vai così!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Quale template si adatta meglio al tuo progetto?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Crea progetto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index 69ae1a0b..f1d57f4c 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Lidmaatschappen - {{projectName}}",
             "ADD_BUTTON": "+ Nieuwe gebruiker",
             "ADD_BUTTON_TITLE": "Nieuwe gebruiker toevoegen",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Rapporten",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Services"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Wachtwoord wijzigen",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Ontdek trending projecten",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Nieuw",
             "DISCOVER": "Ontdek",
             "ACTION_REORDER": "Sleep om de volgorde te veranderen"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is te zwaar voor onze Oempa-Loempa's, probeer het met een bestand kleiner dan ({{maxFileSize}})",
             "SYNC_SUCCESS": "Je project werd met succes geïmporteerd",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Taiga account verwijderen",
             "CONFIRM": "Weet je zeker dat je je Taiga account wilt verwijderen?",
-            "SUBTITLE": "We gaan je missen! :-(",
             "NEWSLETTER_LABEL_TEXT": "Ik wil de nieuwsbrief niet meer ontvangen",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optioneel) Voeg een gepersonaliseerd bericht toe aan je uitnodiging. Vertel iets leuks aan je nieuwe leden ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Type en E-mail"
+            "PLACEHOLDER_TYPE_EMAIL": "Type en E-mail",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Project aanmaken",
         "CREATE_PROJECT_TEXT": "Vers en proper. Spanned!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Welk template zou beter bij je project passen?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Project aanmaken",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index fa4d8960..985e24ab 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Członkostwa - {{projectName}}",
             "ADD_BUTTON": "+ Nowy członek",
             "ADD_BUTTON_TITLE": "Dodaj nowego członka",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Eksport",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Raporty",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Ważność"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Zmień hasło",
             "DASHBOARD_TITLE": "Dashboard",
             "DISCOVER_TITLE": "Odkryj projekty",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Nowe",
             "DISCOVER": "Odkryj",
             "ACTION_REORDER": "Przeciągnij i upuść żeby zmienić kolejność"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) plik jest za ciężki, maksymalna wartość to: ({{maxFileSize}})",
             "SYNC_SUCCESS": "Twój projekt zaimportował się prawidłowo!",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Usuń konto z Taiga",
             "CONFIRM": "Czy na pewno chcesz usunąć swoje konto z Taiga?",
-            "SUBTITLE": "Będziemy tęsknić! :(",
             "NEWSLETTER_LABEL_TEXT": "Nie chcę więcej otrzymywać waszego newslettera",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcjonalne) Dodaj spersonalizowany tekst do zaproszenia. Napisz coś słodziachnego do nowego członka zespołu :)",
-            "PLACEHOLDER_TYPE_EMAIL": "Wpisz Email"
+            "PLACEHOLDER_TYPE_EMAIL": "Wpisz Email",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Utwórz projekt",
         "CREATE_PROJECT_TEXT": "Nowy, zwinny! To takie ekscytujące!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Który szablon lepiej pasuje do Twojego projektu?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Utwórz projekt",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index 15bc02b3..93f7c95f 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Filiados - {{projectName}}",
             "ADD_BUTTON": "+ Novo Membro",
             "ADD_BUTTON_TITLE": "Adicionar novo membro",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Relatórios",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Serviços"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Alterar senha",
             "DASHBOARD_TITLE": "Painel",
             "DISCOVER_TITLE": "Descobrir projetos em destaques",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Novo",
             "DISCOVER": "Descubra",
             "ACTION_REORDER": "Seguro e arraste para ordenar"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) é muito pesado para nossos Oompa Loompas, tente algo menor que ({{maxFileSize}})",
             "SYNC_SUCCESS": "Seu projeto foi importado com sucesso",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Apagar conta no Taiga",
             "CONFIRM": "Você tem certeza que quer apagar sua conta Taiga?",
-            "SUBTITLE": "Nós vamos sentir sua falta! :-(",
             "NEWSLETTER_LABEL_TEXT": "Eu não quero receber mais os informativos",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Adicione uma mensagem de texto ao convite. Diga algo animador para os novos membros ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Digite um Email"
+            "PLACEHOLDER_TYPE_EMAIL": "Digite um Email",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Criar Projeto",
         "CREATE_PROJECT_TEXT": "Novo em folha. Tão excitante!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Qual template se encaixa melhor no seu projeto?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Criar projeto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index 9f23aebf..276baf84 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Участие - {{projectName}}",
             "ADD_BUTTON": "+ Новый участник",
             "ADD_BUTTON_TITLE": "Добавить нового участника",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Экспорт",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Отчеты",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Сервисы"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Изменить пароль",
             "DASHBOARD_TITLE": "Рабочий стол",
             "DISCOVER_TITLE": "Найти проекты в тренде",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Новая",
             "DISCOVER": "Найти",
             "ACTION_REORDER": "Можно перетаскивать мышкой"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) это слишком много для наших Умпа-Лумп, попробуйте еще раз с размером меньшим, чем ({{maxFileSize}})",
             "SYNC_SUCCESS": "Импорт проекта выполнен успешно",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Удалить аккаунт",
             "CONFIRM": "Вы уверены, что хотите удалить ваш аккаунт?",
-            "SUBTITLE": "Мы будем скучать по вам! :-(",
             "NEWSLETTER_LABEL_TEXT": "Я больше не хочу получать вашу новостную рассылку",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Необязательно) Добавьте персональный текст в приглашение. Скажите что-нибудь приятное вашим новым участникам ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Укажите e-mail"
+            "PLACEHOLDER_TYPE_EMAIL": "Укажите e-mail",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Создать проект",
         "CREATE_PROJECT_TEXT": "Свежий и чистый! Так здóрово!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Какой шаблон лучше всего подойдет для Вашего проекта?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Создать проект",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index f20e5557..6558a139 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Medlemskap - {{projectName}}",
             "ADD_BUTTON": "+ Ny medlem",
             "ADD_BUTTON_TITLE": "Lägg till ny medlem",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportera",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Rapporter",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Tjänster"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Byt lösenord",
             "DASHBOARD_TITLE": "Instrumentpanel",
             "DISCOVER_TITLE": "Upptäck nya rörliga projekt",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Ny",
             "DISCOVER": "Upptäck",
             "ACTION_REORDER": "Dra & släpp för att sortera"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) är för tungt för våra Oompa Loompier. Försök med något mindre än ({{maxFileSize}})",
             "SYNC_SUCCESS": "Ditt projekt är korrekt importerad",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Ta bort konto",
             "CONFIRM": "Är du säker på att du vill radera kontot?",
-            "SUBTITLE": "Vi kommer att sakna dig!",
             "NEWSLETTER_LABEL_TEXT": "Jag vill inte motta flera nyhetsbrev",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Valfritt) Lägg till en personlig hälsning till invitationen. Berätta något trevligt till din nya projektmedlem ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Skriv in en e-postadress"
+            "PLACEHOLDER_TYPE_EMAIL": "Skriv in en e-postadress",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Skapa projekt",
         "CREATE_PROJECT_TEXT": "Fräscht och rent. Så trevligt!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Vilken mall skulle passa bättre i det här projektet? ",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Skapa projekt",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index a56d4c14..cf620f99 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "Üyelikler - {{projectName}}",
             "ADD_BUTTON": "+ Yeni üye",
             "ADD_BUTTON_TITLE": "Yeni üye ekle",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Dışarı aktar",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Raporlar",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "Servisler"
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "Parolayı değiştir",
             "DASHBOARD_TITLE": "Pano",
             "DISCOVER_TITLE": "Trend projeleri keşfet",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "Yeni",
             "DISCOVER": "Keşfet",
             "ACTION_REORDER": "Yeniden sıralamak için sürükleyin ve bırakın"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "({{fileSize}}) boyutundaki '{{fileName}}' dosya honki ponkilerimiz için oldukça ağır geldi, ({{maxFileSize}}) boyutundan daha küçük bir şeylerle deneyin",
             "SYNC_SUCCESS": "Projeniz başarıyla içe aktarıldı",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "Taiga Hesabını Sil",
             "CONFIRM": "Taiga hesabınızı silmek istediğinizden emin misiniz?",
-            "SUBTITLE": "Sizi özleyeceğiz! :-(",
             "NEWSLETTER_LABEL_TEXT": "Bundan böyle bülteninizi almak istemiyorum.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opsiyonel) Davetinize kişiselleştirilmiş bir metin ekleyin. Yeni üyelerinize tatlı bir şeyler söyleyin ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "Bir e-posta girin"
+            "PLACEHOLDER_TYPE_EMAIL": "Bir e-posta girin",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Proje Oluştur",
         "CREATE_PROJECT_TEXT": "Taze ve temiz. Heycan verici!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Hangi şablon sizin projeniz için daha uygun?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "Proje oluştur",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index e0fa2f59..e6cc838f 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -409,8 +409,8 @@
             "PAGE_TITLE": "成員資格 - {{projectName}}",
             "ADD_BUTTON": "+ 新成員",
             "ADD_BUTTON_TITLE": "增加新成員",
-            "LIMIT_USERS_WARNING": "Why can't I add more members",
-            "LIMIT_USERS_WARNING_MESSAGE": "Currently you can only have <strong>{{members}}</strong> members per project. If you want to add more members get in touch with the administrators"
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
         },
         "PROJECT_EXPORT": {
             "TITLE": "匯出",
@@ -472,7 +472,16 @@
             "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
             "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
             "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects"
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "PROJECT_OWNER": "Project owner",
+            "REQUEST_OWNERSHIP": "Request ownership",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
+            "CHANGE_OWNER": "Change owner",
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -680,6 +689,24 @@
         },
         "SUBMENU_THIDPARTIES": {
             "TITLE": "服務 "
+        },
+        "PROJECT_TRANSFER": {
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "PRIVATE": "Private",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPT": "Accept",
+            "REJECT": "Reject",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
+            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
+            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "UNLIMITED_PROJECTS": "Unlimited",
+            "OWNER_MESSAGE": {
+                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+            },
+            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CHANGE_MY_PLAN": "Change my plan"
         }
     },
     "USER": {
@@ -791,7 +818,7 @@
             "CHANGE_PASSWORD": "更換密碼 ",
             "DASHBOARD_TITLE": "控制台",
             "DISCOVER_TITLE": "發現流行專案",
-            "NEW_ITEM": "New",
+            "NEW_ITEM": "新　",
             "DISCOVER": "發現",
             "ACTION_REORDER": "拖移 & 丟到來記錄"
         },
@@ -808,7 +835,7 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) 超過系統容量上限, 請重傳小一點的檔案 ({{maxFileSize}})",
             "SYNC_SUCCESS": "你的專案已成功滙入",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_members}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
                 "PRIVATE_PROJECTS_SPACE": {
                     "TITLE": "You don't have space for another private project",
                     "DESC": "The project you want to import is private, but you don't have space to create more."
@@ -818,17 +845,17 @@
                     "DESC": "The project you want to import is public, but you don't have space to create more."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per private project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_members}} users per public project"
+                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_members}} users per private projects",
+                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
                     "DESC": "The project that you want to import is private and has {{members}} users."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_members}} users per public projects",
+                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
                     "DESC": "The public that you want to import is public and has more than {{members}} users."
                 }
             }
@@ -859,7 +886,6 @@
         "DELETE_ACCOUNT": {
             "SECTION_NAME": "刪除Taiga帳戶",
             "CONFIRM": "你確定要刪除Taiga帳戶嗎？",
-            "SUBTITLE": "我們會想念你:-(",
             "NEWSLETTER_LABEL_TEXT": "不願再收到電子月報",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
@@ -919,7 +945,25 @@
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(非必要) 加上一段私人文字在邀請信，告訴你的新成員一些好事  ;-)",
-            "PLACEHOLDER_TYPE_EMAIL": "輸入一個電郵地址"
+            "PLACEHOLDER_TYPE_EMAIL": "輸入一個電郵地址",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
+            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+        },
+        "LEAVE_PROJECT_WARNING": {
+            "TITLE": "You can not leave the project without owner",
+            "CURRENT_USER_OWNER": {
+                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "BUTTON": "Change the project owner"
+            },
+            "OTHER_USER_OWNER": {
+                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
+                "BUTTON": "Request change project owner"
+            }
+        },
+        "CHANGE_OWNER": {
+            "TITLE": "Who do you want to be the new owner?",
+            "ADD_COMMENT": "Add comment",
+            "BUTTON": "Ask this teammate to be the owner"
         }
     },
     "US": {
@@ -1349,13 +1393,13 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "創建專案",
         "CREATE_PROJECT_TEXT": "新鮮與乾淨，太好了",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "哪一個樣版最適合你的專案",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
         "PUBLIC_PROJECT": "Public Project",
         "PRIVATE_PROJECT": "Private Project",
-        "CREATE_PROJECT": "Create project",
+        "CREATE_PROJECT": "創建專案",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
         "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"

From 457d4e9d55c7e4022877dae3c4f645b070e8c3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 24 Mar 2016 12:26:05 +0100
Subject: [PATCH 125/155] [i18n] Update locales

---
 app/locales/taiga/locale-ca.json      | 4 ++--
 app/locales/taiga/locale-de.json      | 4 ++--
 app/locales/taiga/locale-es.json      | 4 ++--
 app/locales/taiga/locale-fi.json      | 4 ++--
 app/locales/taiga/locale-fr.json      | 4 ++--
 app/locales/taiga/locale-it.json      | 4 ++--
 app/locales/taiga/locale-nl.json      | 4 ++--
 app/locales/taiga/locale-pl.json      | 4 ++--
 app/locales/taiga/locale-pt-br.json   | 4 ++--
 app/locales/taiga/locale-ru.json      | 4 ++--
 app/locales/taiga/locale-sv.json      | 4 ++--
 app/locales/taiga/locale-tr.json      | 4 ++--
 app/locales/taiga/locale-zh-hant.json | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index 979d773d..d9762da0 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Petició",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Acceptar",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index f4a575ed..b25f5c84 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Anfrage",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Akzeptieren",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index cc20a36a..bacaa3ef 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Solicitud",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Aceptar",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index 6df07a5f..b29bb452 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Pyyntö",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Hyväksy",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index 7bc794b9..737da7ca 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Requête",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Accepter",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index cd913564..7f357fb7 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Richiesta",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Accetta",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index f1d57f4c..6f25d1cc 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Verzoek",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Accepteren",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index 985e24ab..e0535d36 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Żądanie",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Akceptuj",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index 93f7c95f..f2bbf6d0 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Solicitação",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Aceitar",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index 276baf84..b6c08adc 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Запрос",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Принимаю",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index 6558a139..1568db4d 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Förfrågan",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Acceptera",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index cf620f99..6f2b45b5 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "Talep",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "Kabul et",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index e6cc838f..d714ce65 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -477,7 +477,7 @@
             "REQUEST_OWNERSHIP": "Request ownership",
             "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
             "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
-            "REQUEST_OWNERSHIP_BUTTON": "Request",
+            "REQUEST_OWNERSHIP_BUTTON": "要求",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
             "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
@@ -695,7 +695,7 @@
             "PRIVATE": "Private",
             "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
             "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
-            "ACCEPT": "Accept",
+            "ACCEPT": "接受",
             "REJECT": "Reject",
             "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
             "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",

From 5228fad32b3d3a6b29aef6d07f95dff66cd0f92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 09:32:34 +0200
Subject: [PATCH 126/155] Only require the first email in add members lightbox

---
 app/coffee/modules/admin/lightboxes.coffee   | 3 +++
 app/partials/admin/lightbox-add-members.jade | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index f28aba65..2aa762d5 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -77,6 +77,9 @@ class LightboxAddMembersController
         @.form.reset()
         return if not @.form.validate()
 
+        @.memberInvites = _.filter(@.memberInvites, (invites) ->
+            invites.email != "")
+
         @.submitInvites = true
         promise = @rs.memberships.bulkCreateMemberships(
             @.project.id,
diff --git a/app/partials/admin/lightbox-add-members.jade b/app/partials/admin/lightbox-add-members.jade
index 2cd98ac7..5ba1f1b0 100644
--- a/app/partials/admin/lightbox-add-members.jade
+++ b/app/partials/admin/lightbox-add-members.jade
@@ -10,6 +10,7 @@ a.close(
         .add-single-member(ng-repeat="member in vm.memberInvites")
             fieldset
                 input(
+                    ng-if="$first"
                     type="email"
                     required
                     placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
@@ -17,6 +18,13 @@ a.close(
                     data-type="email"
                     ng-model="member.email"
                 )
+                input(
+                    ng-if="!$first"
+                    type="email"
+                    placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
+                    data-type="email"
+                    ng-model="member.email"
+                )
             fieldset
                 select(
                     ng-if="vm.project"

From 9f422ee66568db80810f687c8926b1db673770b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 09:40:22 +0200
Subject: [PATCH 127/155] Bad padding on folded blocked stories

---
 app/styles/modules/backlog/taskboard-table.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss
index 67ed9612..cd99e5a4 100644
--- a/app/styles/modules/backlog/taskboard-table.scss
+++ b/app/styles/modules/backlog/taskboard-table.scss
@@ -12,7 +12,7 @@ $column-margin: 0 10px 0 0;
         margin: 0;
         min-height: 0;
         .taskboard-task-inner {
-            padding: .2rem;
+            padding: .1rem;
         }
         .taskboard-tagline,
         .taskboard-text {

From b412350e9ff54af30879b649d2cd064117c2d64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 09:55:21 +0200
Subject: [PATCH 128/155] Fix success message on forgot pass message

---
 app/coffee/modules/auth.coffee   | 6 ++++--
 app/locales/taiga/locale-en.json | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index b6448ca9..31f73349 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -358,8 +358,10 @@ ForgotPasswordDirective = ($auth, $confirm, $location, $navUrls, $translate) ->
         onSuccessSubmit = (response) ->
             $location.path($navUrls.resolve("login"))
 
-            text = $translate.instant("FORGOT_PASSWORD_FORM.SUCCESS")
-            $confirm.success(text)
+            title = $translate.instant("FORGOT_PASSWORD_FORM.SUCCESS_TITLE")
+            message = $translate.instant("FORGOT_PASSWORD_FORM.SUCCESS_TEXT")
+
+            $confirm.success(title, message)
 
         onErrorSubmit = (response) ->
             text = $translate.instant("FORGOT_PASSWORD_FORM.ERROR")
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 12dc8ec4..c65155e2 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Username or email",
         "ACTION_RESET_PASSWORD": "Reset Password",
         "LINK_CANCEL": "Nah, take me back. I think I remember it.",
-        "SUCCESS": "<strong>Check your inbox!</strong><br />We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "According to our Oompa Loompas, your are not registered yet."
     },
     "CHANGE_PASSWORD": {

From e4434b78ed70a822d25eef765f7c1f0e58fc7c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 11:16:10 +0200
Subject: [PATCH 129/155] Hide drag icon when blocked project

---
 app/modules/projects/listing/styles/project-list.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss
index fe26d12c..d22945ad 100644
--- a/app/modules/projects/listing/styles/project-list.scss
+++ b/app/modules/projects/listing/styles/project-list.scss
@@ -68,11 +68,15 @@
             .project-title,
             .private,
             .project-description,
-            .icon-badge,
-            .icon-drag {
+            .icon-badge {
                 opacity: .25;
             }
         }
+        &.blocked-project:hover {
+            .icon-drag {
+                opacity: 1;
+            }
+        }
         .list-itemtype-project-data-wrapper {
             display: flex;
         }

From 82a3daa71acf3b59d166334f36aa86fb1037d0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 12:14:37 +0200
Subject: [PATCH 130/155] Add small black background to project owner in team

---
 app/styles/modules/home-project.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss
index 3f06f949..074c7414 100644
--- a/app/styles/modules/home-project.scss
+++ b/app/styles/modules/home-project.scss
@@ -112,9 +112,12 @@
             width: 100%;
         }
         .icon-badge {
-            bottom: 15%;
+            @include svg-size(1.2rem);
+            background: rgba($black, .5);
+            bottom: 5%;
+            padding: .1rem;
             position: absolute;
-            right: 15%;
+            right: 5%;
         }
     }
 }

From 0866d22442c500c8e6734b01d74e6db0e3dcff95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 13:33:19 +0200
Subject: [PATCH 131/155] Remove gray over red to avoid contrast problems

---
 app/styles/modules/team/team-table.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss
index 1e2edc11..c7927a87 100644
--- a/app/styles/modules/team/team-table.scss
+++ b/app/styles/modules/team/team-table.scss
@@ -61,9 +61,10 @@
     .hero {
         width: 100%;
         .row {
-            background: $whitish;
-            border-bottom: 0;
+            border-bottom: 1px solid $whitish;
+            border-top: 1px solid $whitish;
             margin: 1rem 0;
+            padding: 1.5rem 1rem;
         }
     }
     .avatar {

From b52d10fef3b7b5aa0e13ff2c1071e5c6ddb91814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 13:43:38 +0200
Subject: [PATCH 132/155] Update your plan info text

---
 app/styles/modules/admin/admin-project-profile.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss
index c15a8f18..fe3984be 100644
--- a/app/styles/modules/admin/admin-project-profile.scss
+++ b/app/styles/modules/admin/admin-project-profile.scss
@@ -116,16 +116,13 @@
 tg-admin-project-restrictions {
     p {
         @extend %xsmall;
-        margin-bottom: 0;
-    }
-    span {
-        display: block;
+        text-align: center;
     }
     a {
         color: $primary;
     }
-    fieldset {
-        text-align: center;
+    span {
+        display: block;
     }
     span:first-child {
         &::before {

From 819cd73ce895707fa505d6ae1e7fceed93a29440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 28 Mar 2016 13:47:49 +0200
Subject: [PATCH 133/155] Nav menu height fix

---
 app/styles/modules/common/nav.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss
index 9a2f7b56..5703357b 100644
--- a/app/styles/modules/common/nav.scss
+++ b/app/styles/modules/common/nav.scss
@@ -3,8 +3,7 @@ $label-arrow-wh: 12px;
 tg-project-menu {
     background-position: 0 -300px;
     display: inline-block;
-    height: calc(100vh - 40px);
-    min-height: 95%;
+    min-height: calc(100vh - 40px);
     min-width: 50px;
     padding: 1rem 0;
     position: relative;

From d8b26973498ec893267d92eba420a39bd1d60519 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Mon, 28 Mar 2016 14:00:41 +0200
Subject: [PATCH 134/155] Fixing owner avatar image

---
 app/partials/admin/admin-project-change-owner.jade      | 2 +-
 app/partials/admin/admin-project-request-ownership.jade | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/partials/admin/admin-project-change-owner.jade b/app/partials/admin/admin-project-change-owner.jade
index 25c442ab..6647f441 100644
--- a/app/partials/admin/admin-project-change-owner.jade
+++ b/app/partials/admin/admin-project-change-owner.jade
@@ -1,5 +1,5 @@
 .owner-avatar
-    img(ng-src="{{::owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
+    img(ng-src="{{owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
 
 .owner-info
     .owner-info-title {{ 'ADMIN.PROJECT_PROFILE.PROJECT_OWNER' | translate }}
diff --git a/app/partials/admin/admin-project-request-ownership.jade b/app/partials/admin/admin-project-request-ownership.jade
index 796f9cc3..713bd6b6 100644
--- a/app/partials/admin/admin-project-request-ownership.jade
+++ b/app/partials/admin/admin-project-request-ownership.jade
@@ -1,8 +1,8 @@
 .owner-avatar
-    img(ng-src="{{::owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
+    img(ng-src="{{owner.photo || '/#{v}/images/user-noimage.png'}}", alt="{{::owner.full_name_display}}")
 
 .owner-info
     .title {{ 'ADMIN.PROJECT_PROFILE.PROJECT_OWNER' | translate }}
     .owner-name {{::owner.full_name_display}}
 
-a.request(href="", ng-click="requestOwnership()") {{ 'ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP' | translate }}
\ No newline at end of file
+a.request(href="", ng-click="requestOwnership()") {{ 'ADMIN.PROJECT_PROFILE.REQUEST_OWNERSHIP' | translate }}

From f27f1a23be067f53a1e3c192eef12eb5045eb1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 28 Mar 2016 20:44:28 +0200
Subject: [PATCH 135/155] Fix Issue #227 (tg-sub): Redirect to home if a leave
 a project from the admin panel

---
 app/coffee/modules/admin/memberships.coffee   | 27 ++++++++++---------
 app/coffee/modules/team/main.coffee           |  2 +-
 .../lightbox-leave-project-warning.jade       |  6 ++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index d50009b0..127d3959 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -385,7 +385,8 @@ module.directive("tgMembershipsRowRoleSelector", ["$log", "$tgRepo", "$tgConfirm
 ## Member Actions Directive
 #############################################################################
 
-MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate, currentUserService, lightboxFactory) ->
+MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate, $location,
+                                  $navUrls, lightboxFactory) ->
     activedTemplate = """
     <div class="active"
          translate="ADMIN.MEMBERSHIP.STATUS_ACTIVE">
@@ -448,20 +449,22 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
             $confirm.askOnDelete(title, message).then (askResponse) ->
                 onSuccess = =>
                     askResponse.finish()
+                    if member.user != $scope.user.id
+                        if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy
+                            $ctrl.selectFilter("page", $scope.page - 1)
 
-                    if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy
-                        $ctrl.selectFilter("page", $scope.page - 1)
+                        $ctrl.loadMembers()
+                    else
+                        $location.path($navUrls.resolve("home"))
 
-                    $ctrl.loadMembers()
-
-                    text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE")
-                    $confirm.notify("success", null, text)
+                    text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE", {message: message})
+                    $confirm.notify("success", text, null, 5000)
 
                 onError = =>
                     askResponse.finish(false)
 
                     text = $translate.instant("ADMIN.MEMBERSHIP.ERROR_DELETE", {message: message})
-                    $confirm.notify("error", null, text)
+                    $confirm.notify("error", text)
 
                 $repo.remove(member).then(onSuccess, onError)
 
@@ -469,13 +472,12 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
             event.preventDefault()
 
             if $scope.project.owner.id == member.user
-                currentUser = currentUserService.getUser()
-                isCurrentUser = currentUser.get('id') == member.user
+                isCurrentUser = $scope.user.id == member.user
 
                 lightboxFactory.create("tg-lightbox-leave-project-warning", {
                     class: "lightbox lightbox-leave-project-warning"
                 }, {
-                    currentUser: isCurrentUser,
+                    isCurrentUser: isCurrentUser,
                     project: $scope.project
                 })
             else
@@ -487,7 +489,8 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
     return {link: link}
 
 module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile",
-                                             "$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective])
+                                             "$translate", "$tgLocation", "$tgNavUrls", "tgLightboxFactory",
+                                             MembershipsRowActionsDirective])
 
 
 #############################################################################
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 40b08514..b82a61e9 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -248,7 +248,7 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
                 lightboxFactory.create("tg-lightbox-leave-project-warning", {
                     class: "lightbox lightbox-leave-project-warning"
                 }, {
-                    currentUser: true,
+                    isCurrentUser: true,
                     project: $scope.project
                 })
             else
diff --git a/app/partials/common/lightbox/lightbox-leave-project-warning.jade b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
index 24210682..51fd7caa 100644
--- a/app/partials/common/lightbox/lightbox-leave-project-warning.jade
+++ b/app/partials/common/lightbox/lightbox-leave-project-warning.jade
@@ -7,14 +7,14 @@ div.content
 
     h2.title {{'LIGHTBOX.LEAVE_PROJECT_WARNING.TITLE' | translate}}
 
-    div(ng-if="currentUser")
+    div(ng-if="isCurrentUser")
         p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.DESC' | translate}}
 
         a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
             span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.BUTTON")
 
-    div(ng-if="!currentUser")
+    div(ng-if="!isCurrentUser")
         p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.DESC' | translate}}
 
         a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
-            span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.BUTTON")
\ No newline at end of file
+            span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.BUTTON")

From 048be8a6eee7ed572924e30f8972daee0fe381e3 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 29 Mar 2016 08:26:34 +0200
Subject: [PATCH 136/155] refresh projects after import

---
 app/coffee/modules/common/importer.coffee | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index 27610446..70a426f3 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -92,17 +92,19 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
             loader = $confirm.loader($translate.instant("PROJECT.IMPORT.UPLOADING_FILE"))
 
             onSuccess = (result) ->
-                loader.stop()
-                if result.status == 202 # Async mode
-                    title = $translate.instant("PROJECT.IMPORT.ASYNC_IN_PROGRESS_TITLE")
-                    message = $translate.instant("PROJECT.IMPORT.ASYNC_IN_PROGRESS_MESSAGE")
-                    $confirm.success(title, message)
+                currentUserService.loadProjects().then () ->
+                    loader.stop()
 
-                else # result.status == 201 # Sync mode
-                    ctx = {project: result.data.slug}
-                    $location.path($navUrls.resolve("project-admin-project-profile-details", ctx))
-                    msg = $translate.instant("PROJECT.IMPORT.SYNC_SUCCESS")
-                    $confirm.notify("success", msg)
+                    if result.status == 202 # Async mode
+                        title = $translate.instant("PROJECT.IMPORT.ASYNC_IN_PROGRESS_TITLE")
+                        message = $translate.instant("PROJECT.IMPORT.ASYNC_IN_PROGRESS_MESSAGE")
+                        $confirm.success(title, message)
+
+                    else # result.status == 201 # Sync mode
+                        ctx = {project: result.data.slug}
+                        $location.path($navUrls.resolve("project-admin-project-profile-details", ctx))
+                        msg = $translate.instant("PROJECT.IMPORT.SYNC_SUCCESS")
+                        $confirm.notify("success", msg)
 
             onError = (result) ->
                 $tgAuth.refresh().then () ->

From 23c0e9062f53c69f100dabee769652933f56544b Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 29 Mar 2016 08:54:13 +0200
Subject: [PATCH 137/155] refresh projects list after leaving a project

---
 app/coffee/modules/team/main.coffee | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 40b08514..eb69f789 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -225,7 +225,7 @@ module.directive("tgTeamMembers", TeamMembersDirective)
 ## Leave project Directive
 #############################################################################
 
-LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate, lightboxFactory) ->
+LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate, lightboxFactory, currentUserService) ->
     link = ($scope, $el, $attrs) ->
         leaveConfirm = () ->
             leave_project_text = $translate.instant("TEAM.ACTION_LEAVE_PROJECT")
@@ -235,9 +235,10 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
                 promise = $rs.projects.leave($scope.project.id)
 
                 promise.then =>
-                    response.finish()
-                    $confirm.notify("success")
-                    $location.path($navurls.resolve("home"))
+                    currentUserService.loadProjects().then () ->
+                        response.finish()
+                        $confirm.notify("success")
+                        $location.path($navurls.resolve("home"))
 
                 promise.then null, (response) ->
                     response.finish()
@@ -263,7 +264,7 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
         link: link
     }
 
-module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate", "tgLightboxFactory",
+module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", "$translate", "tgLightboxFactory", "tgCurrentUserService",
                                     LeaveProjectDirective])
 
 

From 27c419a4a433b147e2b637bd04ffca45190b939e Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 29 Mar 2016 10:09:11 +0200
Subject: [PATCH 138/155] fix custom notifications messages

---
 .../transfer/transfer-project.controller.coffee      |  7 ++++++-
 .../includes/components/notification-message.jade    | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/modules/projects/transfer/transfer-project.controller.coffee b/app/modules/projects/transfer/transfer-project.controller.coffee
index 41fbd976..2921e896 100644
--- a/app/modules/projects/transfer/transfer-project.controller.coffee
+++ b/app/modules/projects/transfer/transfer-project.controller.coffee
@@ -76,7 +76,10 @@ class TransferProject
                 project: @.project.get("slug")
             })
             @location.path(newUrl)
-            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
+
+            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 15000)
+
+        return
 
     transferReject: (token, reason) ->
         @projectService.transferReject(@.project.get("id"), token, reason).success () =>
@@ -86,6 +89,8 @@ class TransferProject
             @location.path(newUrl)
             @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)
 
+        return
+
     addComment: () ->
         @.showAddComment = true
 
diff --git a/app/partials/includes/components/notification-message.jade b/app/partials/includes/components/notification-message.jade
index 4597bd30..aae6172b 100644
--- a/app/partials/includes/components/notification-message.jade
+++ b/app/partials/includes/components/notification-message.jade
@@ -11,22 +11,22 @@
 
 div.notification-message.notification-message-success
    div.text
-       h4.warning(translate="NOTIFICATION.OK")
-       p(translate="NOTIFICATION.SAVED")
+       h4.warning
+       p
 
 div.notification-message.notification-message-error
     svg.icon.icon-error
         use(xlink:href="#icon-error")
     div.text
-        h4.warning(translate="NOTIFICATION.WARNING")
-        p(translate="NOTIFICATION.WARNING_TEXT")
+        h4.warning
+        p
     svg.icon.icon-close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
         use(xlink:href="#icon-close")
 
 div.notification-light.notification-message-light-error
     div.text
-        h4.warning(translate="NOTIFICATION.WARNING")
-        p(translate="NOTIFICATION.WARNING_TEXT")
+        h4.warning
+        p
     a.close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
         svg.icon.icon-close
             use(xlink:href="#icon-close")

From f8213d64a775b77ef723b65e9bb829c13cf4f875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 29 Mar 2016 10:47:57 +0200
Subject: [PATCH 139/155] [i18n] Update locales

---
 app/locales/taiga/locale-ca.json      | 6 ++++--
 app/locales/taiga/locale-de.json      | 6 ++++--
 app/locales/taiga/locale-es.json      | 6 ++++--
 app/locales/taiga/locale-fi.json      | 6 ++++--
 app/locales/taiga/locale-fr.json      | 6 ++++--
 app/locales/taiga/locale-it.json      | 6 ++++--
 app/locales/taiga/locale-nl.json      | 6 ++++--
 app/locales/taiga/locale-pl.json      | 6 ++++--
 app/locales/taiga/locale-pt-br.json   | 6 ++++--
 app/locales/taiga/locale-ru.json      | 6 ++++--
 app/locales/taiga/locale-sv.json      | 6 ++++--
 app/locales/taiga/locale-tr.json      | 6 ++++--
 app/locales/taiga/locale-zh-hant.json | 6 ++++--
 13 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index d9762da0..50924ac5 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Nom d'usuari o correu electrònic",
         "ACTION_RESET_PASSWORD": "Resetejar contrasenya",
         "LINK_CANCEL": "No, porta'm enrere, crec que ja ho recordo.",
-        "SUCCESS": "<strong>Mira el teu correu!</strong><br /> Hem enviat un correu amb les instrucciones per a setejar una nova contrasenya.",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Segons els nostres Oompa Loompas, no estàs registrat encara."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "No vull rebre més el vostre butlletí de notícies",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Esborrar projecte",
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index b25f5c84..008e2926 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Benutzername oder E-Mail-Adresse",
         "ACTION_RESET_PASSWORD": "Passwort zurücksetzen",
         "LINK_CANCEL": "Nein, bring mich zurück. Ich denke, ich erinnere mich daran.",
-        "SUCCESS": "<strong>Sehen Sie in Ihren Posteingang!</strong><br />Unsere Helferelein haben Ihnen eine E-Mail mit einer Anleitung gesendet, um ein neues Passwort festzulegen.",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Laut unseren Helferlein sind Sie bislang noch nicht registriert."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Ich möchte keinen Newsletter mehr erhalten",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Projekt löschen",
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index bacaa3ef..d28a7df0 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Nombre de usuario o email",
         "ACTION_RESET_PASSWORD": "Restablecer Contraseña",
         "LINK_CANCEL": "Nah, llévame de vuelta, creo que lo recordé.",
-        "SUCCESS": "<strong>¡Revisa tu bandeja de entrada!</strong><br />Te hemos enviado un mail con las instrucciones necesarias para restablecer tu contraseña\n",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Según nuestros Oompa Loompas tú no estás registrado"
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "No quiero recibir la newsletter nunca más.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Borrar proyecto",
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index b29bb452..adecd512 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Käyttäjänimi tai sähköposti",
         "ACTION_RESET_PASSWORD": "Uusi salsanasi",
         "LINK_CANCEL": "Vie minut takaisin, muistan sen.",
-        "SUCCESS": "<strong>Tarkista sähköpostisi!</strong><br />Olemme lähettäneet sinulle sähköpostissa kirjautumisohjeet",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Oompa Loompas sanovat että käyttäjänimesi tai sähköpostisi tai salasanasi on väärä."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "En halua uutiskirjettä enää",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Poista projekti",
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index 737da7ca..d0b53078 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Nom d'utilisateur ou adresse courriel",
         "ACTION_RESET_PASSWORD": "Réinitialiser le mot de passe",
         "LINK_CANCEL": "Nan, ramenez-moi en arrière. Je crois que je m'en souviens.",
-        "SUCCESS": "<strong>Consultez votre messagerie !</strong><br />Nous venons d'envoyer un courriel avec les instructions pour créer un nouveau mot de passe",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "D'après nos Oompa Loompas, vous n'êtes pas encore enregistré."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Je ne veux plus recevoir votre bulletin d'information",
             "CANCEL": "Retour aux réglages",
             "ACCEPT": "Supprimer le compte",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Supprimer le projet",
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index 7f357fb7..aa812f94 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Nome utente o email",
         "ACTION_RESET_PASSWORD": "Reimposta la password",
         "LINK_CANCEL": "Fa niente dai, riportami indietro. Penso di ricordarmela.",
-        "SUCCESS": "<strong>Controlla la tua posta!</strong><br />Ti abbiamo inviato una email con le istruzioni per reimpostare la password",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Secondo i nostri Oompa Loompa, non sei ancora registrato."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Non voglio più ricevere le vostre newsletter",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Elimina progetto",
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index 6f25d1cc..a89dfc04 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Gebruikersnaam of e-mail",
         "ACTION_RESET_PASSWORD": "Wachtwoord resetten",
         "LINK_CANCEL": "Nah, stuur me terug. I denk dat ik het zal onthouden.",
-        "SUCCESS": "<strong>Controleer je inbox!</strong><br />We hebben je een email gestuurd met instructie om een nieuw wachtwoord aan te maken",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Volgens onze Oempa-Loempa's ben je nog niet geregisteerd"
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Ik wil de nieuwsbrief niet meer ontvangen",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Verwijder project",
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index e0535d36..552a8f5a 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Login albo e-mail",
         "ACTION_RESET_PASSWORD": "Resetuj hasło",
         "LINK_CANCEL": "Nie, zabierz mnie stąd. Chyba je pamiętam.",
-        "SUCCESS": "<strong>Sprawdź swoją skrzynkę!</strong><br />Wysłaliśmy Ci wiadomość e-mail z instrukcją jak ustawić nowe hasło.",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Nasze Umpa Lumpy twierdzą, że nie jesteś jeszcze zarejestrowany."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Nie chcę więcej otrzymywać waszego newslettera",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Usuń projekt",
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index f2bbf6d0..82d9d2d3 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Nome de usuário ou email",
         "ACTION_RESET_PASSWORD": "Resetar Senha",
         "LINK_CANCEL": "Nããão, me leve de volta. Acho que me lembrei.",
-        "SUCCESS": "<strong>Verifique sua conta de email</strong><br />Enviamos um email com as instruções para configurar uma nova senha",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Segundo nossos Oompa Loompas, você ainda não está inscrito."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Eu não quero receber mais os informativos",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Apagar projeto",
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index b6c08adc..1403e276 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Логин или e-mail",
         "ACTION_RESET_PASSWORD": "Сбросить пароль",
         "LINK_CANCEL": "Не, давай назад, думаю я вспомню.",
-        "SUCCESS": "<strong>Проверьте почту!</strong><br />Мы выслали Вам письмо с инструкцией по установке нового пароля",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Умпа-Лумпы говорят, что вы еще не зарегистрированы."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Я больше не хочу получать вашу новостную рассылку",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Удалить проект",
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index 1568db4d..cfc98a27 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Användarnamn eller e-postadress",
         "ACTION_RESET_PASSWORD": "Återställ lösenord",
         "LINK_CANCEL": "Nej, ta mig tillbaka. Jag tror att jag minns det.",
-        "SUCCESS": "<strong>Kolla inboxen!</strong><br/>Du ska ha fått ett e-postmeddelande med instruktioner för hur du ändrar lösenordet",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Enligt våra Oompaloompier är du inte registrerad ännu."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Jag vill inte motta flera nyhetsbrev",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Ta bort projekt",
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index 6f2b45b5..d6d79c32 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "Kullanıcı adı veya e-posta",
         "ACTION_RESET_PASSWORD": "Parolayı Sıfırla",
         "LINK_CANCEL": "Boşver, geri gidelim. Sanırım hatırladım.",
-        "SUCCESS": "<strong>Gelen kutunuzu kontrol edin!</strong><br />Yeni parolanızı oluşturabilmeniz için gerekli yönergeleri içeren bir e-posta gönderdik",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "Honki ponkilerimize göre, siz henüz bir kayıt yaptırmamış durumdasınız."
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Bundan böyle bülteninizi almak istemiyorum.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "Proje Sil",
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index d714ce65..11f2e27a 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -318,7 +318,8 @@
         "PLACEHOLDER_FIELD": "使用者名稱或電子郵件",
         "ACTION_RESET_PASSWORD": "重設密碼 ",
         "LINK_CANCEL": "不，請帶我回去，我記起來了",
-        "SUCCESS": "<strong>檢查你的收信箱</strong><br />我們送出了一封信<br />裏面有設定你新電子郵件的相關指示",
+        "SUCCESS_TITLE": "Check your inbox!",
+        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
         "ERROR": "按我們的記錄，你尚未註冊"
     },
     "CHANGE_PASSWORD": {
@@ -889,7 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "不願再收到電子月報",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
+            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
+            "SUBTITLE": "You are going to miss you!:("
         },
         "DELETE_PROJECT": {
             "TITLE": "刪除專案",

From 80c77042982689d7eac13d0e6e9d6dca5e56bde2 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Tue, 29 Mar 2016 14:02:22 +0200
Subject: [PATCH 140/155] Fixing error when importing public projects and max
 memberships is achieved

---
 app/coffee/modules/common/importer.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index 70a426f3..5eb48006 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -55,7 +55,7 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                 else
                     publicError = !currentUserService.canCreatePublicProjects().valid
 
-                    if user.get('max_memberships_public_projects') != null && result.headers.members > user.get('max_memberships_public_projects')
+                    if user.get('max_memberships_public_projects') != null && result.headers.memberships > user.get('max_memberships_public_projects')
                         membersError = true
                     else
                         membersError = false
@@ -73,7 +73,7 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                     key: errorKey,
                     values: {
                         max_memberships: maxMemberships,
-                        members: result.headers.members
+                        members: result.headers.memberships
                     }
                 }
             else

From cb07dea242bd2d7406468002ef44909963b68094 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 30 Mar 2016 09:12:53 +0200
Subject: [PATCH 141/155] Adding transfer project unit tests

---
 .../projects/transfer/transfer-page.jade      |   2 +-
 .../transfer-project.controler.spec.coffee    | 275 ++++++++++++++++++
 .../transfer-project.controller.coffee        |  19 +-
 .../transfer-project.directive.coffee         |   4 +
 4 files changed, 290 insertions(+), 10 deletions(-)
 create mode 100644 app/modules/projects/transfer/transfer-project.controler.spec.coffee

diff --git a/app/modules/projects/transfer/transfer-page.jade b/app/modules/projects/transfer/transfer-page.jade
index bb9dad96..58cc9c2e 100644
--- a/app/modules/projects/transfer/transfer-page.jade
+++ b/app/modules/projects/transfer/transfer-page.jade
@@ -1,4 +1,4 @@
 tg-transfer-project.transfer-project(
     ng-if="vm.project"
-    project = "vm.project"
+    project="vm.project"
 )
diff --git a/app/modules/projects/transfer/transfer-project.controler.spec.coffee b/app/modules/projects/transfer/transfer-project.controler.spec.coffee
new file mode 100644
index 00000000..6d6af88c
--- /dev/null
+++ b/app/modules/projects/transfer/transfer-project.controler.spec.coffee
@@ -0,0 +1,275 @@
+###
+# Copyright (C) 2014-2016 Taiga Agile LLC <taiga@taiga.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: transfer-project.controller.spec.coffee
+###
+
+describe "TransferProject", ->
+    $controller = null
+    $q = null
+    provide = null
+    $rootScope = null
+    mocks = {}
+
+    _mockRouteParams = () ->
+        mocks.routeParams = {}
+        provide.value "$routeParams", mocks.routeParams
+
+    _mockProjectsService = () ->
+        mocks.projectsService = {
+            transferValidateToken: sinon.stub()
+            transferAccept: sinon.stub()
+            transferReject: sinon.stub()
+        }
+
+        provide.value "tgProjectsService", mocks.projectsService
+
+    _mockLocation = () ->
+        mocks.location = {
+            path: sinon.stub()
+        }
+        provide.value "$location", mocks.location
+
+    _mockAuth = () ->
+        mocks.auth = {
+            refresh: sinon.stub()
+        }
+
+        provide.value "$tgAuth", mocks.auth
+
+    _mockCurrentUserService = () ->
+        mocks.currentUserService = {
+            getUser: sinon.stub()
+            canOwnProject: sinon.stub()
+        }
+
+        provide.value "tgCurrentUserService", mocks.currentUserService
+
+    _mockTgNavUrls = () ->
+        mocks.tgNavUrls = {
+            resolve: sinon.stub()
+        }
+
+        provide.value "$tgNavUrls", mocks.tgNavUrls
+
+    _mockTranslate = () ->
+        mocks.translate = {
+            instant: sinon.stub()
+        }
+
+        provide.value "$translate", mocks.translate
+
+    _mockTgConfirm = ->
+        mocks.tgConfirm = {
+            notify: sinon.stub()
+        }
+
+        provide.value("$tgConfirm", mocks.tgConfirm)
+
+    _mocks = () ->
+        module ($provide) ->
+            provide = $provide
+            _mockRouteParams()
+            _mockProjectsService()
+            _mockLocation()
+            _mockAuth()
+            _mockCurrentUserService()
+            _mockTgNavUrls()
+            _mockTranslate()
+            _mockTgConfirm()
+            return null
+
+    _inject = (callback) ->
+        inject (_$controller_, _$q_, _$rootScope_) ->
+            $q = _$q_
+            $rootScope = _$rootScope_
+            $controller = _$controller_
+
+    beforeEach ->
+        module "taigaProjects"
+        _mocks()
+        _inject()
+
+    it "invalid token", (done) ->
+        project = Immutable.fromJS({
+            id: 1
+        })
+
+        user = Immutable.fromJS({})
+
+        mocks.auth.refresh.promise().resolve()
+        mocks.routeParams.token = "BAD_TOKEN"
+        mocks.currentUserService.getUser.returns(user)
+        mocks.projectsService.transferValidateToken.withArgs(1, "BAD_TOKEN").promise().reject()
+        mocks.tgNavUrls.resolve.withArgs("not-found").returns("/not-found")
+
+        ctrl = $controller("TransferProjectController")
+        ctrl.project = project
+        ctrl.initialize().then () ->
+            expect(mocks.location.path).to.be.calledWith("/not-found")
+            done()
+
+    it "valid token private project with max projects for user", (done) ->
+        project = Immutable.fromJS({
+            id: 1
+            is_private: true
+        })
+
+        user = Immutable.fromJS({
+            max_private_projects: 1
+            total_private_projects: 1
+            max_memberships_private_projects: 25
+        })
+
+        mocks.auth.refresh.promise().resolve()
+        mocks.routeParams.token = "TOKEN"
+        mocks.currentUserService.getUser.returns(user)
+        mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+
+        ctrl = $controller("TransferProjectController")
+        ctrl.project = project
+        ctrl.initialize().then () ->
+            expect(ctrl.ownerMessage).to.be.equal("ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PRIVATE")
+            expect(ctrl.maxProjects).to.be.equal(1)
+            expect(ctrl.currentProjects).to.be.equal(1)
+            done()
+
+      it "valid token private project without max projects for user", (done) ->
+          project = Immutable.fromJS({
+              id: 1
+              is_private: true
+          })
+
+          user = Immutable.fromJS({
+              max_private_projects: null
+              total_private_projects: 1
+              max_memberships_private_projects: 25
+          })
+
+          mocks.auth.refresh.promise().resolve()
+          mocks.routeParams.token = "TOKEN"
+          mocks.currentUserService.getUser.returns(user)
+          mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+          mocks.translate.instant.withArgs("ADMIN.PROJECT_TRANSFER.UNLIMITED_PROJECTS").returns("UNLIMITED_PROJECTS")
+
+          ctrl = $controller("TransferProjectController")
+          ctrl.project = project
+          ctrl.initialize().then () ->
+              expect(ctrl.ownerMessage).to.be.equal("ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PRIVATE")
+              expect(ctrl.maxProjects).to.be.equal("UNLIMITED_PROJECTS")
+              expect(ctrl.currentProjects).to.be.equal(1)
+              done()
+
+    it "valid token public project with max projects for user", (done) ->
+        project = Immutable.fromJS({
+            id: 1
+            is_public: true
+        })
+
+        user = Immutable.fromJS({
+            max_public_projects: 1
+            total_public_projects: 1
+            max_memberships_public_projects: 25
+        })
+
+        mocks.auth.refresh.promise().resolve()
+        mocks.routeParams.token = "TOKEN"
+        mocks.currentUserService.getUser.returns(user)
+        mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+
+        ctrl = $controller("TransferProjectController")
+        ctrl.project = project
+        ctrl.initialize().then () ->
+            expect(ctrl.ownerMessage).to.be.equal("ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PUBLIC")
+            expect(ctrl.maxProjects).to.be.equal(1)
+            expect(ctrl.currentProjects).to.be.equal(1)
+            done()
+
+      it "valid token public project without max projects for user", (done) ->
+          project = Immutable.fromJS({
+              id: 1
+              is_public: true
+          })
+
+          user = Immutable.fromJS({
+              max_public_projects: null
+              total_public_projects: 1
+              max_memberships_public_projects: 25
+          })
+
+          mocks.auth.refresh.promise().resolve()
+          mocks.routeParams.token = "TOKEN"
+          mocks.currentUserService.getUser.returns(user)
+          mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+          mocks.translate.instant.withArgs("ADMIN.PROJECT_TRANSFER.UNLIMITED_PROJECTS").returns("UNLIMITED_PROJECTS")
+
+          ctrl = $controller("TransferProjectController")
+          ctrl.project = project
+          ctrl.initialize().then () ->
+              expect(ctrl.ownerMessage).to.be.equal("ADMIN.PROJECT_TRANSFER.OWNER_MESSAGE.PUBLIC")
+              expect(ctrl.maxProjects).to.be.equal("UNLIMITED_PROJECTS")
+              expect(ctrl.currentProjects).to.be.equal(1)
+              done()
+
+      it "transfer accept", (done) ->
+          project = Immutable.fromJS({
+              id: 1
+              slug: "slug"
+          })
+
+          user = Immutable.fromJS({})
+
+          mocks.auth.refresh.promise().resolve()
+          mocks.routeParams.token = "TOKEN"
+          mocks.currentUserService.getUser.returns(user)
+          mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+          mocks.projectsService.transferAccept.withArgs(1, "TOKEN", "this is my reason").promise().resolve()
+          mocks.tgNavUrls.resolve.withArgs("project-admin-project-profile-details", {project: "slug"}).returns("/project/slug/")
+          mocks.translate.instant.withArgs("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP").returns("ACCEPTED_PROJECT_OWNERNSHIP")
+
+          ctrl = $controller("TransferProjectController")
+          ctrl.project = project
+          ctrl.initialize().then () ->
+              ctrl.transferAccept("TOKEN", "this is my reason").then ->
+                  expect(mocks.location.path).to.be.calledWith("/project/slug/")
+                  expect(mocks.tgConfirm.notify).to.be.calledWith("success", "ACCEPTED_PROJECT_OWNERNSHIP", '', 5000)
+
+              done()
+
+      it "transfer reject", (done) ->
+          project = Immutable.fromJS({
+              id: 1
+              slug: "slug"
+          })
+
+          user = Immutable.fromJS({})
+
+          mocks.auth.refresh.promise().resolve()
+          mocks.routeParams.token = "TOKEN"
+          mocks.currentUserService.getUser.returns(user)
+          mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve()
+          mocks.projectsService.transferReject.withArgs(1, "TOKEN", "this is my reason").promise().resolve()
+          mocks.tgNavUrls.resolve.withArgs("project-admin-project-profile-details", {project: "slug"}).returns("/project/slug/")
+          mocks.translate.instant.withArgs("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP").returns("REJECTED_PROJECT_OWNERNSHIP")
+
+          ctrl = $controller("TransferProjectController")
+          ctrl.project = project
+          ctrl.initialize().then () ->
+              ctrl.transferReject("TOKEN", "this is my reason").then ->
+                  expect(mocks.location.path).to.be.calledWith("/project/slug/")
+                  expect(mocks.tgConfirm.notify).to.be.calledWith("success", "REJECTED_PROJECT_OWNERNSHIP", '', 5000)
+
+              done()
diff --git a/app/modules/projects/transfer/transfer-project.controller.coffee b/app/modules/projects/transfer/transfer-project.controller.coffee
index 2921e896..7e9bb914 100644
--- a/app/modules/projects/transfer/transfer-project.controller.coffee
+++ b/app/modules/projects/transfer/transfer-project.controller.coffee
@@ -32,17 +32,19 @@ class TransferProject
     ]
 
     constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) ->
+
+    initialize: () ->
         @.projectId = @.project.get("id")
         @.token = @routeParams.token
-        @._refreshUserData()
         @.showAddComment = false
+        return @._refreshUserData()
 
     _validateToken: () ->
-        @projectService.transferValidateToken(@.projectId, @.token).error (data, status) =>
+        return @projectService.transferValidateToken(@.projectId, @.token).then null, (data, status) =>
             @location.path(@navUrls.resolve("not-found"))
 
     _refreshUserData: () ->
-        @authService.refresh().then () =>
+        return @authService.refresh().then () =>
             @._validateToken()
             @._setProjectData()
             @._checkOwnerData()
@@ -71,25 +73,25 @@ class TransferProject
         @.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships
 
     transferAccept: (token, reason) ->
-        @projectService.transferAccept(@.project.get("id"), token, reason).success () =>
+        return @projectService.transferAccept(@.project.get("id"), token, reason).then () =>
             newUrl = @navUrls.resolve("project-admin-project-profile-details", {
                 project: @.project.get("slug")
             })
             @location.path(newUrl)
 
-            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 15000)
+            @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
 
-        return
+            return
 
     transferReject: (token, reason) ->
-        @projectService.transferReject(@.project.get("id"), token, reason).success () =>
+        return @projectService.transferReject(@.project.get("id"), token, reason).then () =>
             newUrl = @navUrls.resolve("project-admin-project-profile-details", {
                 project: @project.get("slug")
             })
             @location.path(newUrl)
             @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)
 
-        return
+            return
 
     addComment: () ->
         @.showAddComment = true
@@ -99,5 +101,4 @@ class TransferProject
         @.reason = ''
 
 
-
 module.controller("TransferProjectController", TransferProject)
diff --git a/app/modules/projects/transfer/transfer-project.directive.coffee b/app/modules/projects/transfer/transfer-project.directive.coffee
index d6b35f76..5a117d27 100644
--- a/app/modules/projects/transfer/transfer-project.directive.coffee
+++ b/app/modules/projects/transfer/transfer-project.directive.coffee
@@ -20,7 +20,11 @@
 module = angular.module('taigaProjects')
 
 TransferProjectDirective = () ->
+    link = (scope, el, attrs, ctrl) ->
+      ctrl.initialize()
+
     return {
+        link: link,
         scope: {},
         bindToController: {
             project: "="

From 08340bee378676bd93d07d89855364aede49e49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 30 Mar 2016 09:17:07 +0200
Subject: [PATCH 142/155] Admin header links avoid float

---
 app/styles/layout/admin-memberships.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/styles/layout/admin-memberships.scss b/app/styles/layout/admin-memberships.scss
index 6a8d22fd..a3349c34 100644
--- a/app/styles/layout/admin-memberships.scss
+++ b/app/styles/layout/admin-memberships.scss
@@ -1,9 +1,6 @@
 .admin-membership {
     header {
         @include clearfix;
-        a {
-            float: right;
-        }
     }
     .limit-users-warning {
         @extend %small;

From d7340c57a499d6b60599b1190ea801d9a1f5c807 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 30 Mar 2016 10:37:13 +0200
Subject: [PATCH 143/155] next url support in login view if the user is logged
 in

---
 app/coffee/modules/auth.coffee | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 31f73349..5267c509 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -31,12 +31,19 @@ class LoginPage
     @.$inject = [
         'tgCurrentUserService',
         '$location',
-        '$tgNavUrls'
+        '$tgNavUrls',
+        '$routeParams'
     ]
 
-    constructor: (currentUserService, $location, $navUrls) ->
+    constructor: (currentUserService, $location, $navUrls, $routeParams) ->
         if currentUserService.isAuthenticated()
-            $location.path($navUrls.resolve("home"))
+            url = $navUrls.resolve("home")
+            if $routeParams['next']
+                url = $routeParams['next']
+                $location.search('next', null)
+
+            $location.path(url)
+
 
 module.controller('LoginPage', LoginPage)
 

From d39de5beda1f0096d5ea82f60685d9df849759b1 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 30 Mar 2016 14:37:29 +0200
Subject: [PATCH 144/155] Fixing total_memberships when transfer projects

---
 app/modules/projects/transfer/transfer-project.jade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade
index cc184317..87f3ac12 100644
--- a/app/modules/projects/transfer/transfer-project.jade
+++ b/app/modules/projects/transfer/transfer-project.jade
@@ -15,7 +15,7 @@
                 span.transfer-project-members
                     svg.icon.icon-team
                         use(xlink:href="#icon-team")
-                    span {{::vm.project.get("members").size}}
+                    span {{::vm.project.get("total_memberships")}}
 
     p(
         translate="ADMIN.PROJECT_TRANSFER.PROPOSE_OWNERSHIP"
@@ -23,7 +23,7 @@
     )
 
     div(ng-if="vm.canBeOwnedByUser.valid")
-    
+
         p(
             translate="{{vm.ownerMessage}}"
             translate-values="{maxProjects: vm.maxProjects, currentProjects: vm.currentProjects}"
@@ -35,7 +35,7 @@
             ng-if="!vm.showAddComment"
             translate="ADMIN.PROJECT_TRANSFER.ADD_COMMENT_QUESTION"
         )
-        
+
         fieldset.transfer-project-comment-form(
             ng-if="vm.showAddComment"
             ng-class="{'open': vm.showAddComment}"

From 8f105c9c31ab313c3e17ca1cc48c9c966a1faaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 30 Mar 2016 15:22:21 +0200
Subject: [PATCH 145/155] Fix some corner-cases in members admin panel

---
 app/coffee/modules/admin/memberships.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 127d3959..24c3aea9 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -69,7 +69,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
         promise.then null, @.onInitialDataError.bind(@)
 
         @scope.$on "membersform:new:success", =>
-            @.loadMembers()
+            @.loadInitialData()
             @analytics.trackEvent("membership", "create", "create memberships on admin", 1)
 
     loadProject: ->

From 2b8aae7378c6f80ff2cb0b6ca466f530aa838970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 30 Mar 2016 15:31:49 +0200
Subject: [PATCH 146/155] Fix more corner-cases in members admin panel when
 delete a membership

---
 app/coffee/modules/admin/memberships.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 24c3aea9..4a1da796 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -453,7 +453,7 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
                         if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy
                             $ctrl.selectFilter("page", $scope.page - 1)
 
-                        $ctrl.loadMembers()
+                        $ctrl.loadInitialData()
                     else
                         $location.path($navUrls.resolve("home"))
 

From 870b9f7cbb474029a1b44f8ed95cc7ba3978eff7 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 30 Mar 2016 15:48:37 +0200
Subject: [PATCH 147/155] Updating translations

---
 app/locales/taiga/locale-ca.json      | 102 +++++++++---------
 app/locales/taiga/locale-de.json      | 102 +++++++++---------
 app/locales/taiga/locale-en.json      | 144 +++++++++++++-------------
 app/locales/taiga/locale-es.json      | 102 +++++++++---------
 app/locales/taiga/locale-fi.json      | 102 +++++++++---------
 app/locales/taiga/locale-fr.json      | 102 +++++++++---------
 app/locales/taiga/locale-it.json      | 102 +++++++++---------
 app/locales/taiga/locale-nl.json      | 102 +++++++++---------
 app/locales/taiga/locale-pl.json      | 102 +++++++++---------
 app/locales/taiga/locale-pt-br.json   | 102 +++++++++---------
 app/locales/taiga/locale-ru.json      | 102 +++++++++---------
 app/locales/taiga/locale-sv.json      | 102 +++++++++---------
 app/locales/taiga/locale-tr.json      | 102 +++++++++---------
 app/locales/taiga/locale-zh-hant.json | 102 +++++++++---------
 14 files changed, 734 insertions(+), 736 deletions(-)

diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json
index 50924ac5..57a3a9b5 100644
--- a/app/locales/taiga/locale-ca.json
+++ b/app/locales/taiga/locale-ca.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Aquest valor pareix invàlid.",
             "TYPE_EMAIL": "Deu ser un correu vàlid.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Heu de seleccionar la opció %s o inferior.",
             "RANGE_CHECK": "Heu de seleccionar entre les opcions %s i %s.",
             "EQUAL_TO": "Aquest valor hauria de ser el mateix.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Resetejar contrasenya",
         "LINK_CANCEL": "No, porta'm enrere, crec que ja ho recordo.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Segons els nostres Oompa Loompas, no estàs registrat encara."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Afiliacions - {{projectName}}",
             "ADD_BUTTON": "+ Nou membre",
             "ADD_BUTTON_TITLE": "Afegir nou membre",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Organitza les històries d'usuari per a mantindre una vista organitzada i prioritzada del treball.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organitza els projectes de un mode sencill amb aquest tauler",
             "ISSUES": "Incidències",
@@ -446,7 +446,7 @@
             "MEETUP": "Trobar-se",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Selecciona un sistema de videconferència",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Petició",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membres amb aquest rol",
             "TITLE_DELETE_ROLE": "Esborrar rol",
             "REPLACEMENT_ROLE": "Tots els usuaris amb aquest rol es canviaran a",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "No pots esborrar tots els valors",
             "EXTERNAL_USER": "Usuari extern"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Serveis"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Acceptar",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "punts<br/> projecte",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) es massa gran per als nostres Oompa Loompas, prova amb algun inferior a ({{maxFileSize}})",
             "SYNC_SUCCESS": "El teu projecte s'ha importat correctament",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "No vull rebre més el vostre butlletí de notícies",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Esborrar projecte",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Afegix un text personalizat a la invitació. Dis-li algo divertit als nous membres. ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Escriu un correu",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crear projecte",
         "CREATE_PROJECT_TEXT": "Nou projecte. Qué il·lusió!",
-        "CHOOSE_TEMPLATE": "Quina plantilla encaixa millor al teu projecte?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Crear projecte",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json
index 008e2926..92639637 100644
--- a/app/locales/taiga/locale-de.json
+++ b/app/locales/taiga/locale-de.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Dieser Wert scheint ungültig zu sein.",
             "TYPE_EMAIL": "Dieser Wert sollte eine gültige E-Mail Adresse enthalten.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Wählen Sie %s oder weniger.",
             "RANGE_CHECK": "Wählen Sie zwischen  %s und %s",
             "EQUAL_TO": "Dieser Wert sollte der gleiche sein.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Passwort zurücksetzen",
         "LINK_CANCEL": "Nein, bring mich zurück. Ich denke, ich erinnere mich daran.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Laut unseren Helferlein sind Sie bislang noch nicht registriert."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Mitgliedschaften - {{projectName}}",
             "ADD_BUTTON": "+ Neues Mitglied",
             "ADD_BUTTON_TITLE": "Neues Mitglied hinzufügen",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportieren",
@@ -434,9 +434,9 @@
             "BACKLOG": "Auftragsliste",
             "BACKLOG_DESCRIPTION": "Verwalten Sie Ihre User-Stories, um einen organisierten Überblick der anstehenden und priorisierten Aufgaben zu erhalten.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisieren Sie Ihr Projekt auf übersichtliche Art.",
             "ISSUES": "Tickets",
@@ -446,7 +446,7 @@
             "MEETUP": "Zusammentreffen",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Wählen Sie ein Videokonferenzsystem",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "Erscheint in",
             "TALKY_CHAT_ROOM": "Gesprächig",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "Das Bild wird auf 80x80px skaliert.",
             "CHANGE_LOGO": "Logo ändern",
             "ACTION_USE_DEFAULT_LOGO": "Nutze Standardbild",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Anfrage",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Berichte",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} Mitglieder mit dieser Rolle",
             "TITLE_DELETE_ROLE": "Rolle löschen",
             "REPLACEMENT_ROLE": "Alle Benutzer mit dieser Rolle werden verschoben nach",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Sie können nicht alle Werte löschen",
             "EXTERNAL_USER": "Externer Benutzer"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Dienste"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Akzeptieren",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "Projekt<br/> Punkte",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) ist zu schwierig für unsere Helferlein, versuchen Sie es bitte mit einer kleineren Datei als ({{maxFileSize}})",
             "SYNC_SUCCESS": "Ihr Projekt wurde erfolgreich importiert",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Ich möchte keinen Newsletter mehr erhalten",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Projekt löschen",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Fügen Sie einen persönlichen Text zur Einladung hinzu. Erzählen Sie Ihren neuen Mitgliedern etwas Schönes. ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Geben Sie eine E-Mail ein",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Projekt erstellen",
         "CREATE_PROJECT_TEXT": "Frisch und sauber. Wie aufregend!",
-        "CHOOSE_TEMPLATE": "Welches Template würde besser zu Ihrem Projekt passen?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Projekt anlegen",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index c65155e2..4a49d61f 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "This value seems to be invalid.",
             "TYPE_EMAIL": "This value should be a valid email.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "You must select %s choices or less.",
             "RANGE_CHECK": "You must select between %s and %s choices.",
             "EQUAL_TO": "This value should be the same.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Reset Password",
         "LINK_CANCEL": "Nah, take me back. I think I remember it.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "According to our Oompa Loompas, your are not registered yet."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ New member",
             "ADD_BUTTON_TITLE": "Add new member",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Manage your user stories to maintain an organized view of upcoming and prioritized work.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organize your project in a lean way with this board.",
             "ISSUES": "Issues",
@@ -446,7 +446,7 @@
             "MEETUP": "Meet Up",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Select a videoconference system",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Request",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} members with this role",
             "TITLE_DELETE_ROLE": "Delete Role",
             "REPLACEMENT_ROLE": "All the users with this role will be moved to",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "You can't delete all values",
             "EXTERNAL_USER": "External user"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Services"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Accept",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "project<br/> points",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is too heavy for our Oompa Loompas, try it with a smaller than ({{maxFileSize}})",
             "SYNC_SUCCESS": "Your project has been imported successfuly",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account. ",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Delete project",
@@ -926,7 +926,7 @@
             "PLACEHOLDER_SPRINT_END": "Estimated End",
             "ACTION_DELETE_SPRINT": "Do you want to delete this sprint?",
             "TITLE_ACTION_DELETE_SPRINT": "delete sprint",
-            "LAST_SPRINT_NAME": " last sprint is <strong> {{lastSprint}} ;-) </strong>"
+            "LAST_SPRINT_NAME": "last sprint is <strong> {{lastSprint}} ;-) </strong>"
         },
         "CREATE_EDIT_TASK": {
             "TITLE": "New task",
@@ -948,30 +948,29 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Type an Email",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
         "PAGE_TITLE": "{{userStorySubject}} - User Story {{userStoryRef}} - {{projectName}}",
         "PAGE_DESCRIPTION": "Status: {{userStoryStatus }}. Completed {{userStoryProgressPercentage}}% ({{userStoryClosedTasks}} of {{userStoryTotalTasks}} tasks closed). Points: {{userStoryPoints}}. Description: {{userStoryDescription}}",
-
         "SECTION_NAME": "User story details",
         "LINK_TASKBOARD": "Taskboard",
         "TITLE_LINK_TASKBOARD": "Go to the taskboard",
@@ -1027,36 +1026,36 @@
             "UNASSIGNED": "unassigned"
         },
         "FIELDS": {
-            "SUBJECT" : "subject",
+            "SUBJECT": "subject",
             "NAME": "name",
-            "DESCRIPTION" : "description",
+            "DESCRIPTION": "description",
             "CONTENT": "content",
             "STATUS": "status",
-            "IS_CLOSED" : "is closed",
-            "FINISH_DATE" : "finish date",
+            "IS_CLOSED": "is closed",
+            "FINISH_DATE": "finish date",
             "TYPE": "type",
             "PRIORITY": "priority",
             "SEVERITY": "severity",
-            "ASSIGNED_TO" : "assigned to",
-            "WATCHERS" : "watchers",
-            "MILESTONE" : "sprint",
+            "ASSIGNED_TO": "assigned to",
+            "WATCHERS": "watchers",
+            "MILESTONE": "sprint",
             "USER_STORY": "user story",
             "PROJECT": "project",
             "IS_BLOCKED": "is blocked",
             "BLOCKED_NOTE": "blocked note",
             "POINTS": "points",
-            "CLIENT_REQUIREMENT" : "client requirement",
-            "TEAM_REQUIREMENT" : "team requirement",
+            "CLIENT_REQUIREMENT": "client requirement",
+            "TEAM_REQUIREMENT": "team requirement",
             "IS_IOCAINE": "is iocaine",
             "TAGS": "tags",
-            "ATTACHMENTS" : "attachments",
+            "ATTACHMENTS": "attachments",
             "IS_DEPRECATED": "is deprecated",
-            "ORDER" : "order",
-            "BACKLOG_ORDER" : "backlog order",
-            "SPRINT_ORDER" : "sprint order",
-            "KANBAN_ORDER" : "kanban order",
-            "TASKBOARD_ORDER" : "taskboard order",
-            "US_ORDER" : "us order"
+            "ORDER": "order",
+            "BACKLOG_ORDER": "backlog order",
+            "SPRINT_ORDER": "sprint order",
+            "KANBAN_ORDER": "kanban order",
+            "TASKBOARD_ORDER": "taskboard order",
+            "US_ORDER": "us order"
         }
     },
     "BACKLOG": {
@@ -1076,11 +1075,10 @@
         "CREATE_NEW_US_EMPTY_HELP": "You may want to create a new user story",
         "EXCESS_OF_POINTS": "Excess of points",
         "PENDING_POINTS": "Pending Points",
-        "CLOSED_POINTS": "Closed points",
+        "CLOSED_POINTS": "closed",
         "COMPACT_SPRINT": "Compact Sprint",
         "GO_TO_TASKBOARD": "Go to the taskboard of {{::name}}",
         "EDIT_SPRINT": "Edit Sprint",
-        "CLOSED_POINTS": "closed",
         "TOTAL_POINTS": "total",
         "STATUS_NAME": "Status Name",
         "SORTABLE_FILTER_ERROR": "You can't drop on backlog when filters are open",
@@ -1151,7 +1149,7 @@
     },
     "TASKBOARD": {
         "PAGE_TITLE": "{{sprintName}} - Sprint taskboard - {{projectName}}",
-        "PAGE_DESCRIPTION": "Sprint {{sprintName}} (from {{startDate}} to {{endDate}}) of {{projectName}}. Completed {{completedPercentage}}% ({{completedPoints}} of {{totalPoints}} points). {{openTasks}} opened tasks of {{totalTasks}}." ,
+        "PAGE_DESCRIPTION": "Sprint {{sprintName}} (from {{startDate}} to {{endDate}}) of {{projectName}}. Completed {{completedPercentage}}% ({{completedPoints}} of {{totalPoints}} points). {{openTasks}} opened tasks of {{totalTasks}}.",
         "SECTION_NAME": "Taskboard",
         "TITLE_ACTION_ADD": "Add a new Task",
         "TITLE_ACTION_ADD_BULK": "Add some new Tasks in bulk",
@@ -1397,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Create Project",
         "CREATE_PROJECT_TEXT": "Fresh and clean. So exciting!",
-        "CHOOSE_TEMPLATE": "Which template would fit better in your project?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1405,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Create project",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
@@ -1574,4 +1572,4 @@
             "RESULTS": "Search results"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json
index d28a7df0..c8518ba9 100644
--- a/app/locales/taiga/locale-es.json
+++ b/app/locales/taiga/locale-es.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Requerimiento de cliente es un nuevo requisito que no se esperaba y es necesario que forme parte del proyecto.",
         "TEAM_REQUIREMENT": "Requerimiento del equipo es un nuevo requisito que debe existir en el proyecto pero que no conllevará ningún coste para el cliente.",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece inválido.",
             "TYPE_EMAIL": "El valor debe ser un email.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Debes seleccionar %s o menos.",
             "RANGE_CHECK": "Debes seleccionar de %s a %s.",
             "EQUAL_TO": "Este valor debe ser el mismo.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Restablecer Contraseña",
         "LINK_CANCEL": "Nah, llévame de vuelta, creo que lo recordé.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Según nuestros Oompa Loompas tú no estás registrado"
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Miembros - {{projectName}}",
             "ADD_BUTTON": "+ Nuevo miembro",
             "ADD_BUTTON_TITLE": "Añadir un nuevo miembro",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gestiona tus historias de usuario para mantener una vista organizada y priorizada de los próximos trabajos que deberás afrontar. ",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organiza tus proyectos de una manera flexible con este panel.",
             "ISSUES": "Peticiones",
@@ -446,7 +446,7 @@
             "MEETUP": "Meet Up",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Elige un sistema de videoconferencia",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "La imagen se escalará a 80x80px.",
             "CHANGE_LOGO": "Cambia el logo",
             "ACTION_USE_DEFAULT_LOGO": "Usar imagen por defecto",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Solicitud",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Informes",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} miembros con este rol",
             "TITLE_DELETE_ROLE": "Borrar Rol",
             "REPLACEMENT_ROLE": "Todos los usuarios con este rol serán movidos a",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "No puedes eliminar todos los valores",
             "EXTERNAL_USER": "Usuario externo"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Servicios"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Aceptar",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "puntos<br/> proyecto",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "El fichero '{{fileName}}' ({{fileSize}}) es demasiado pesado para nuestros Oompa Loompas, prueba con uno de menos de ({{maxFileSize}}).",
             "SYNC_SUCCESS": "Tu proyecto se ha importado con éxito.",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "No quiero recibir la newsletter nunca más.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Borrar proyecto",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Añade un texto personalizado a la invitación. Dile algo encantador a tus nuevos miembros ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Escribe un email",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crear Proyecto",
         "CREATE_PROJECT_TEXT": "Fresco y claro. ¡Es emocionante!",
-        "CHOOSE_TEMPLATE": "¿Que plantilla se ajusta mejor con tu proyecto?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Crear proyecto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json
index adecd512..1c3f526f 100644
--- a/app/locales/taiga/locale-fi.json
+++ b/app/locales/taiga/locale-fi.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Tämä arvo vaikuttaa virheelliseltä.",
             "TYPE_EMAIL": "Tämän pitäisi olla toimiva sähköpostiosoite.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Valitse korkeintaan %s vaihtoehtoa.",
             "RANGE_CHECK": "Valitse %s - %s vaihteohtoa.",
             "EQUAL_TO": "Arvojen pitäisi olla samat.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD.MM.YY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Uusi salsanasi",
         "LINK_CANCEL": "Vie minut takaisin, muistan sen.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Oompa Loompas sanovat että käyttäjänimesi tai sähköpostisi tai salasanasi on väärä."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ Uusi jäsen",
             "ADD_BUTTON_TITLE": "Lisää jäsen",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Vie",
@@ -434,9 +434,9 @@
             "BACKLOG": "Odottavat",
             "BACKLOG_DESCRIPTION": "Hallinnoi käyttäjätarinoita: järjestele ja priorisoi työtä.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Järjestä projektisi tehokkaasti tällä taululla.",
             "ISSUES": "Pyynnöt",
@@ -446,7 +446,7 @@
             "MEETUP": "Tapaa",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Valitse videoconferenssi-järjestelmä",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Pyyntö",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Raportit",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} jäsentä joilla tämä rooli",
             "TITLE_DELETE_ROLE": "Poista rooli",
             "REPLACEMENT_ROLE": "Kaikki käyttäjä joilla on tämä rooli siirretään",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Voit poistaa kaikki arvot",
             "EXTERNAL_USER": "Ulkoinen käyttäjä"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Palvelut"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Hyväksy",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "projekti<br/> pisteet",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) on liian iso Oompa Loompaseille, kokeile pienemmällä kuin ({{maxFileSize}})",
             "SYNC_SUCCESS": "Projektisi on tuotu sisään onnistuneesti",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "En halua uutiskirjettä enää",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Poista projekti",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Vapaaehtoinen) Lisää oma kuvaus kutsuusi uusille jäsenille ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Anna sähköposti",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Luo projekti",
         "CREATE_PROJECT_TEXT": "Täysin koskematon. Jännittävää!",
-        "CHOOSE_TEMPLATE": "Mikä pohja sopii paremmin projektillesi?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Luo projekti",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index d0b53078..78f00986 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Un besoin client est un nouveau besoin qui n'était pas prévu et qu'il est nécessaire d'intégrer au projet",
         "TEAM_REQUIREMENT": "Un besoin projet est un besoin qui est nécessaire au projet mais qui ne doit avoir aucun impact pour le client",
         "OWNER": "Propriétaire du Projet",
-        "CAPSLOCK_WARNING": "Attention : vous écrivez en lettres majuscules alors que ce champ est sensible à la casse.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Cette valeur semble être invalide.",
             "TYPE_EMAIL": "Cette valeur devrait être une adresse courriel valide.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Vous devez sélectionner %s options ou moins.",
             "RANGE_CHECK": "Vous devez sélectionner parmi les choix %s et %s.",
             "EQUAL_TO": "Cette valeur doit être identique.",
-            "LINEWIDTH": "Une ou plusieurs lignes sont trop longues. Elles doivent avoir %s caractères au maximum.",
-            "PIKADAY": "Format de date invalide, utiliser DD MMM YYYY (par exemple 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Réinitialiser le mot de passe",
         "LINK_CANCEL": "Nan, ramenez-moi en arrière. Je crois que je m'en souviens.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "D'après nos Oompa Loompas, vous n'êtes pas encore enregistré."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Membres - {{projectName}}",
             "ADD_BUTTON": "+ Nouveau membre",
             "ADD_BUTTON_TITLE": "Ajouter un membre",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exporter",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gérez votre récits utilisateur pour garder une vue organisée des travaux à venir et priorisés.",
             "NUMBER_SPRINTS": "Nombre prévu de sprints",
-            "NUMBER_SPRINTS_HELP": "0 pour une quantité indéterminée",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Total prévu de points d'histoire",
-            "NUMBER_US_POINTS_HELP": "0 pour une quantité indéterminée",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisez votre projet de manière agile avec ce tableau.",
             "ISSUES": "Tickets",
@@ -446,7 +446,7 @@
             "MEETUP": "Meet Up",
             "MEETUP_DESCRIPTION": "Choisissez un système de vidéoconférence",
             "SELECT_VIDEOCONFERENCE": "Choisissez un système de vidéoconférence",
-            "SALT_CHAT_ROOM": "Ajouter un préfix au nom de l'espace de discussion",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "L'image va être agrandie à 80x80px",
             "CHANGE_LOGO": "Changer le logo",
             "ACTION_USE_DEFAULT_LOGO": "Utiliser l'image par défaut",
-            "MAX_PRIVATE_PROJECTS": "Vous avez atteint le nombre maximum de projets privés",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "Ce projet dépasse le nombre maximum de membres autorisés pour un projet privé",
-            "MAX_PUBLIC_PROJECTS": "Vous avez atteint le nombre maximum de projets publics",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "Ce projet dépasse le nombre maximum de membres autorisés pour un projet public.",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Requête",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Rapports",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membres avec ce rôle",
             "TITLE_DELETE_ROLE": "Supprimer des rôles",
             "REPLACEMENT_ROLE": "Tous les utilisateurs avec ce rôle seront déplacés dans",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Vous ne pouvez pas supprimer toutes les valeurs",
             "EXTERNAL_USER": "Utilisateur externe"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Services"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Accepter",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Projet bloqué",
             "THIS_PROJECT_IS_BLOCKED": "Ce projet est temporairement verrouillé",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "Vous devez contacter l'équipe d'administration pour déverrouiller vos projets"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "points<br/> projet",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) est un peu trop lourd pour nos Oompa Loompas, réessayez avec un fichier d'une taille inférieure à ({{maxFileSize}})",
             "SYNC_SUCCESS": "Votre projet a été importé avec succès",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "Vous n'avez plus d'espace pour un projet privé supplémentaire",
-                    "DESC": "Le projet que vous souhaitez importer est privé mais vous n'avez plus d'espace pour en créer de nouveaux."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "Vous n'avez plus d'espace pour un projet public supplémentaire",
-                    "DESC": "Le projet que vous souhaitez importer est public mais vous n'avez plus d'espace pour en créer de nouveaux."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "Le projet que vous souhaitez importer est privé et contient {{members}} utilisateurs."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "Le projet que vous souhaitez importer est public et contient plus de {{members}} utilisateurs."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Je ne veux plus recevoir votre bulletin d'information",
             "CANCEL": "Retour aux réglages",
             "ACCEPT": "Supprimer le compte",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Supprimer le projet",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optionnel) Ajoutez un texte personnalisé à l'invitation. Dites quelque chose de gentil à vos nouveaux membres ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Saisissez une adresse courriel",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Créer un projet",
         "CREATE_PROJECT_TEXT": "Tout beau, tout nouveau !",
-        "CHOOSE_TEMPLATE": "Quel template conviendrait le mieux à votre projet ?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "Plus d'information sur les templates de projets",
         "CHOOSE_TEMPLATE_INFO": "Plus d'informations",
         "PROJECT_DETAILS": "Détails du projet",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Projet privé",
         "CREATE_PROJECT": "Créer un projet",
         "MAX_PRIVATE_PROJECTS": "Vous avez atteint le nombre maximum de projets privés",
-        "MAX_PUBLIC_PROJECTS": "Vous avez atteint le nombre maximum de projets publics",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "changer de souscription"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json
index aa812f94..ed6e9b2b 100644
--- a/app/locales/taiga/locale-it.json
+++ b/app/locales/taiga/locale-it.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Requisito del Cliente è un nuovo requisito che non era stato previsto ed ora è stato richiesto come requisito del progetto",
         "TEAM_REQUIREMENT": "Requisito del Team è un requisito che deve esistere nel progetto ma non deve avere costi per il cliente",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Questo valore non è valido.",
             "TYPE_EMAIL": "Questo valore dovrebbe corrispondere ad una mail valida",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Devi selezionare la scelta %s o meno.",
             "RANGE_CHECK": "Devi selezionare tra %s e %s scelta.",
             "EQUAL_TO": "Il valore dovrebbe essere uguale",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Reimposta la password",
         "LINK_CANCEL": "Fa niente dai, riportami indietro. Penso di ricordarmela.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Secondo i nostri Oompa Loompa, non sei ancora registrato."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Webhooks - {{projectName}}",
             "ADD_BUTTON": "Nuovo Membro",
             "ADD_BUTTON_TITLE": "Aggiungi un nuovo membro",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Esporta",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Amministra le storie degli utenti per mantenere una visione organizzata dei lavori in arrivo e di quelli ad alta priorità ",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organizza in modo semplice il tuo progetto con questa board",
             "ISSUES": "problemi",
@@ -446,7 +446,7 @@
             "MEETUP": "Incontro",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Seleziona un sistema di videoconferenza",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "L'immagine sarà scalata a 80x80px.",
             "CHANGE_LOGO": "Cambia Logo",
             "ACTION_USE_DEFAULT_LOGO": "Usa l'immagine di default",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Richiesta",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Rapporti",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membri con questo ruolo",
             "TITLE_DELETE_ROLE": "Elimina ruolo",
             "REPLACEMENT_ROLE": "Tutti gli utenti con questo ruolo saranno spostati a ",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Non puoi cancellare tutti i valori",
             "EXTERNAL_USER": "Utente esterno"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Servizi"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Accetta",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "progetto<br/> punti",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) è troppo pesante per i nostri Oompa Loompa; falli contenti, prova con una dimensione minore di ({{maxFileSize}})",
             "SYNC_SUCCESS": "Il tuo progetto è stato importato con successo",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Non voglio più ricevere le vostre newsletter",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Elimina progetto",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(facoltativo) aggiungi un testo personalizzato all'invito. Di qualcosa di simpatico ai tuoi nuovi membri ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Scrivi una mail",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Crea Progetto",
         "CREATE_PROJECT_TEXT": "Nuovo di zecca. Vai così!",
-        "CHOOSE_TEMPLATE": "Quale template si adatta meglio al tuo progetto?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Crea progetto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json
index a89dfc04..df0de862 100644
--- a/app/locales/taiga/locale-nl.json
+++ b/app/locales/taiga/locale-nl.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Deze waarde lijkt ongeldig te zijn",
             "TYPE_EMAIL": "Deze waarde moet een geldig emailadres bevatten",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Je moet %s keuzes of minder selecteren.",
             "RANGE_CHECK": "Je moet tussen %s en %s keuzes selecteren.",
             "EQUAL_TO": "Deze waarde zou hetzelfde moeten zijn.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Wachtwoord resetten",
         "LINK_CANCEL": "Nah, stuur me terug. I denk dat ik het zal onthouden.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Volgens onze Oempa-Loempa's ben je nog niet geregisteerd"
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Lidmaatschappen - {{projectName}}",
             "ADD_BUTTON": "+ Nieuwe gebruiker",
             "ADD_BUTTON_TITLE": "Nieuwe gebruiker toevoegen",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Export",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Organiseer je user stories om een duidelijk overzicht van aankomend en geprioritiseerd werk te behouden.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organiseer je project volgens het lean principe met dit bord.",
             "ISSUES": "Issues",
@@ -446,7 +446,7 @@
             "MEETUP": "Meet Up",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Kies een videoconference systeem",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Verzoek",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Rapporten",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} leden met deze rol",
             "TITLE_DELETE_ROLE": "Verwijder Rol",
             "REPLACEMENT_ROLE": "Al de gebruikers met deze rol zullen verplaats worden naar",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Je kan niet alle waarden verwijderen",
             "EXTERNAL_USER": "Externe gebruiker"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Services"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Accepteren",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "project<br/> punten",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) is te zwaar voor onze Oempa-Loempa's, probeer het met een bestand kleiner dan ({{maxFileSize}})",
             "SYNC_SUCCESS": "Je project werd met succes geïmporteerd",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Ik wil de nieuwsbrief niet meer ontvangen",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Verwijder project",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optioneel) Voeg een gepersonaliseerd bericht toe aan je uitnodiging. Vertel iets leuks aan je nieuwe leden ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Type en E-mail",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Project aanmaken",
         "CREATE_PROJECT_TEXT": "Vers en proper. Spanned!",
-        "CHOOSE_TEMPLATE": "Welk template zou beter bij je project passen?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Project aanmaken",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json
index 552a8f5a..fb9db52f 100644
--- a/app/locales/taiga/locale-pl.json
+++ b/app/locales/taiga/locale-pl.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Nieprawidłowa wartość",
             "TYPE_EMAIL": "Podaj prawidłowy adres email.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Musisz zaznaczyć %s pozycji lub mniej.",
             "RANGE_CHECK": "Musisz zaznaczyć pomiędzy %s a %s pozycji.",
             "EQUAL_TO": "Ta wartość powinna być taka sama.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Resetuj hasło",
         "LINK_CANCEL": "Nie, zabierz mnie stąd. Chyba je pamiętam.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Nasze Umpa Lumpy twierdzą, że nie jesteś jeszcze zarejestrowany."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Członkostwa - {{projectName}}",
             "ADD_BUTTON": "+ Nowy członek",
             "ADD_BUTTON_TITLE": "Dodaj nowego członka",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Eksport",
@@ -434,9 +434,9 @@
             "BACKLOG": "Dziennik",
             "BACKLOG_DESCRIPTION": "Zarządzaj swoimi historyjkami użytkownika aby utrzymać zorganizowany widok i priorytety zadań",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organizuj swój projekt przy użyciu metody lean.",
             "ISSUES": "Zgłoszenia",
@@ -446,7 +446,7 @@
             "MEETUP": "Spotkaj się",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Wybierz system do wideokonferencji.",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "The image will be scaled to 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Żądanie",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Raporty",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} użytkowników pełniących tę rolę w projekcie",
             "TITLE_DELETE_ROLE": "Usuń rolę",
             "REPLACEMENT_ROLE": "Wszyscy użytkownicy pełniący tę rolę zostaną przeniesieni do",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Nie możesz usunąć wszystkich wartości",
             "EXTERNAL_USER": "Zewnętrzny użytkownik"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Ważność"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Akceptuj",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "projekt<br/> punkty",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) plik jest za ciężki, maksymalna wartość to: ({{maxFileSize}})",
             "SYNC_SUCCESS": "Twój projekt zaimportował się prawidłowo!",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Nie chcę więcej otrzymywać waszego newslettera",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Usuń projekt",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcjonalne) Dodaj spersonalizowany tekst do zaproszenia. Napisz coś słodziachnego do nowego członka zespołu :)",
             "PLACEHOLDER_TYPE_EMAIL": "Wpisz Email",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Utwórz projekt",
         "CREATE_PROJECT_TEXT": "Nowy, zwinny! To takie ekscytujące!",
-        "CHOOSE_TEMPLATE": "Który szablon lepiej pasuje do Twojego projektu?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Utwórz projekt",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json
index 82d9d2d3..2e78ad2d 100644
--- a/app/locales/taiga/locale-pt-br.json
+++ b/app/locales/taiga/locale-pt-br.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Este valor parece ser inválido.",
             "TYPE_EMAIL": "Este valor deve ser um e-mail válido.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Você deve selecionar %s escolhas ou menos.",
             "RANGE_CHECK": "Você deve selecionar entre %s e %s escolhas.",
             "EQUAL_TO": "Esse valor deveria ser o mesmo.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Formato de data inválido, use DD MMM YYY (Ex.: 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Resetar Senha",
         "LINK_CANCEL": "Nããão, me leve de volta. Acho que me lembrei.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Segundo nossos Oompa Loompas, você ainda não está inscrito."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Filiados - {{projectName}}",
             "ADD_BUTTON": "+ Novo Membro",
             "ADD_BUTTON_TITLE": "Adicionar novo membro",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportar",
@@ -434,9 +434,9 @@
             "BACKLOG": "Backlog",
             "BACKLOG_DESCRIPTION": "Gerencie suas user stories para manter uma visualização organizada de trabalhos futuros e priorizados.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organize seu projeto de um jeito \"lean\" com esse mural",
             "ISSUES": "Problemas",
@@ -446,7 +446,7 @@
             "MEETUP": "Reunião",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Selecione um sistema de video conferência",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "A imagem deve ser na escala de 80x80px.",
             "CHANGE_LOGO": "Alterar logo",
             "ACTION_USE_DEFAULT_LOGO": "Usar imagem padrão",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Solicitação",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Relatórios",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} membros com a mesma função",
             "TITLE_DELETE_ROLE": "Apagar Função",
             "REPLACEMENT_ROLE": "Todos os usuários com essa função serão movidos para",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Você não pode apagar todos os valores",
             "EXTERNAL_USER": "Usuário externo"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Serviços"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Aceitar",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "projetos<br/> pontos",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) é muito pesado para nossos Oompa Loompas, tente algo menor que ({{maxFileSize}})",
             "SYNC_SUCCESS": "Seu projeto foi importado com sucesso",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Eu não quero receber mais os informativos",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Apagar projeto",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opcional) Adicione uma mensagem de texto ao convite. Diga algo animador para os novos membros ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Digite um Email",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Criar Projeto",
         "CREATE_PROJECT_TEXT": "Novo em folha. Tão excitante!",
-        "CHOOSE_TEMPLATE": "Qual template se encaixa melhor no seu projeto?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Criar projeto",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json
index 1403e276..50ec8091 100644
--- a/app/locales/taiga/locale-ru.json
+++ b/app/locales/taiga/locale-ru.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Кажется, это значение некорректно.",
             "TYPE_EMAIL": "Это значение должно быть корректным email-адресом.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Вы должны выбрать %s вариантов или меньше.",
             "RANGE_CHECK": "Вы должны выбрать от %s до %s вариантов.",
             "EQUAL_TO": "Это значение должно быть таким же.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Сбросить пароль",
         "LINK_CANCEL": "Не, давай назад, думаю я вспомню.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Умпа-Лумпы говорят, что вы еще не зарегистрированы."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Участие - {{projectName}}",
             "ADD_BUTTON": "+ Новый участник",
             "ADD_BUTTON_TITLE": "Добавить нового участника",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Экспорт",
@@ -434,9 +434,9 @@
             "BACKLOG": "Список задач",
             "BACKLOG_DESCRIPTION": "Управляйте пользовательскими историями, чтобы поддерживать организованное видение важных и приоритетных задач.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Организуйте эффективную работу с проектом с помощью этой панели",
             "ISSUES": "Запросы",
@@ -446,7 +446,7 @@
             "MEETUP": "Созвониться",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Выберите систему видеоконференций",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "Изображение будет отмасштабировано до 80x80px.",
             "CHANGE_LOGO": "Change logo",
             "ACTION_USE_DEFAULT_LOGO": "Использовать картинку по умолчанию",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Запрос",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Отчеты",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} участников с этой ролью",
             "TITLE_DELETE_ROLE": "Удалить Роль",
             "REPLACEMENT_ROLE": "Все пользователи этой роли будут перемещены в",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Вы не можете удалить все значения",
             "EXTERNAL_USER": "Внешний пользователь"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Сервисы"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Принимаю",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "проекта<br/> очки",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) это слишком много для наших Умпа-Лумп, попробуйте еще раз с размером меньшим, чем ({{maxFileSize}})",
             "SYNC_SUCCESS": "Импорт проекта выполнен успешно",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Я больше не хочу получать вашу новостную рассылку",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Удалить проект",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Необязательно) Добавьте персональный текст в приглашение. Скажите что-нибудь приятное вашим новым участникам ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Укажите e-mail",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Создать проект",
         "CREATE_PROJECT_TEXT": "Свежий и чистый! Так здóрово!",
-        "CHOOSE_TEMPLATE": "Какой шаблон лучше всего подойдет для Вашего проекта?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Создать проект",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json
index cfc98a27..7caf2895 100644
--- a/app/locales/taiga/locale-sv.json
+++ b/app/locales/taiga/locale-sv.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Det här värdet är felaktigt. ",
             "TYPE_EMAIL": "Värdet måste vara en giltig e-postadress",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "Du måste välja %s val eller mindre.",
             "RANGE_CHECK": "Du måste välja mellan %s och %s val.",
             "EQUAL_TO": "Det här värdet skulle vara det samma. ",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "YYYY-MM-DD",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Återställ lösenord",
         "LINK_CANCEL": "Nej, ta mig tillbaka. Jag tror att jag minns det.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Enligt våra Oompaloompier är du inte registrerad ännu."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Medlemskap - {{projectName}}",
             "ADD_BUTTON": "+ Ny medlem",
             "ADD_BUTTON_TITLE": "Lägg till ny medlem",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Exportera",
@@ -434,9 +434,9 @@
             "BACKLOG": "Inkorg",
             "BACKLOG_DESCRIPTION": "Hantera dina användarhistorier för att organisera visningar av kommande och prioriterade jobb. ",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Organisera dina projekt med Lean med den här tavlan.  ",
             "ISSUES": "Frågor",
@@ -446,7 +446,7 @@
             "MEETUP": "Möt upp",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Välj videokonferenssystem",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "Dyker upp i ",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "Bilden kommer skalas till 80x80px.",
             "CHANGE_LOGO": "Ändra logga",
             "ACTION_USE_DEFAULT_LOGO": "Use default image",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Förfrågan",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Rapporter",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} medlemmar med den här rollen",
             "TITLE_DELETE_ROLE": "Ta bort rollen",
             "REPLACEMENT_ROLE": "Alla användarna med den här rollen vill flyttas till",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Du kan inte ta bort alla värden",
             "EXTERNAL_USER": "Extern användare"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Tjänster"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Acceptera",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "projekt<br/> poäng",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) är för tungt för våra Oompa Loompier. Försök med något mindre än ({{maxFileSize}})",
             "SYNC_SUCCESS": "Ditt projekt är korrekt importerad",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Jag vill inte motta flera nyhetsbrev",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Ta bort projekt",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Valfritt) Lägg till en personlig hälsning till invitationen. Berätta något trevligt till din nya projektmedlem ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Skriv in en e-postadress",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Skapa projekt",
         "CREATE_PROJECT_TEXT": "Fräscht och rent. Så trevligt!",
-        "CHOOSE_TEMPLATE": "Vilken mall skulle passa bättre i det här projektet? ",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Skapa projekt",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json
index d6d79c32..7969c999 100644
--- a/app/locales/taiga/locale-tr.json
+++ b/app/locales/taiga/locale-tr.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Müşteri gereksinimi, daha önceden belli olmayan ama projeye dahil olması gereken bir gereksinimdir",
         "TEAM_REQUIREMENT": "Takım gereksinimi, müsteriyi ilgilendirmeyen, ama projede yer alması zorunlu olan bir gereksinimdir.",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "Bu değer geçersiz gözüküyor",
             "TYPE_EMAIL": "Bu değer geçerli bir e-posta adresi olmalı.",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "%s seçenek ya da daha azını seçmek zorunlu.",
             "RANGE_CHECK": "%s ve %s seçenekleri arasında bir seçim yapmak zorunludu.",
             "EQUAL_TO": "Bu değer aynı olmalı.",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "Parolayı Sıfırla",
         "LINK_CANCEL": "Boşver, geri gidelim. Sanırım hatırladım.",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "Honki ponkilerimize göre, siz henüz bir kayıt yaptırmamış durumdasınız."
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "Üyelikler - {{projectName}}",
             "ADD_BUTTON": "+ Yeni üye",
             "ADD_BUTTON_TITLE": "Yeni üye ekle",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "Dışarı aktar",
@@ -434,9 +434,9 @@
             "BACKLOG": "Havuz",
             "BACKLOG_DESCRIPTION": "Yeni gelen ve önceliklendirilmiş işler için düzenli bir görünüm elde etmek için kullanıcı hikayelerinizi yönetin.",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban",
             "KANBAN_DESCRIPTION": "Bu pano ile projenizi güzel bir şekilde düzenleyin.",
             "ISSUES": "Sorunlar",
@@ -446,7 +446,7 @@
             "MEETUP": "Toplantı",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "Bir video konferans sistemi seç",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "Resim 80×80 piksel boyutuna ölçeklenecek. ",
             "CHANGE_LOGO": "Logoyu değiştir",
             "ACTION_USE_DEFAULT_LOGO": "Varsayılan resmi kullan",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "Talep",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Raporlar",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "bu roldeki üyelerin sayısı {{ role.members_count }} ",
             "TITLE_DELETE_ROLE": "Rol Sil",
             "REPLACEMENT_ROLE": "Bu role sahip kullanıcıların taşınacağı",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "Bütün değerleri silemezsiniz",
             "EXTERNAL_USER": "Dış kullanıcı"
         },
@@ -692,21 +692,21 @@
             "TITLE": "Servisler"
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "Kabul et",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "proje<br/> puanlar",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "({{fileSize}}) boyutundaki '{{fileName}}' dosya honki ponkilerimiz için oldukça ağır geldi, ({{maxFileSize}}) boyutundan daha küçük bir şeylerle deneyin",
             "SYNC_SUCCESS": "Projeniz başarıyla içe aktarıldı",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "Bundan böyle bülteninizi almak istemiyorum.",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "Proje Sil",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Opsiyonel) Davetinize kişiselleştirilmiş bir metin ekleyin. Yeni üyelerinize tatlı bir şeyler söyleyin ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "Bir e-posta girin",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "Proje Oluştur",
         "CREATE_PROJECT_TEXT": "Taze ve temiz. Heycan verici!",
-        "CHOOSE_TEMPLATE": "Hangi şablon sizin projeniz için daha uygun?",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "Proje oluştur",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {
diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json
index 11f2e27a..c1f81f88 100644
--- a/app/locales/taiga/locale-zh-hant.json
+++ b/app/locales/taiga/locale-zh-hant.json
@@ -42,7 +42,7 @@
         "CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
         "TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
         "OWNER": "Project Owner",
-        "CAPSLOCK_WARNING": "Be careful! You are writing with capital letters and this input is case sensitive.",
+        "CAPSLOCK_WARNING": "Be careful! You are using capital letters in an input field that is case sensitive.",
         "FORM_ERRORS": {
             "DEFAULT_MESSAGE": "該數值似乎為無效",
             "TYPE_EMAIL": "該電子郵件應為有效地址",
@@ -67,8 +67,8 @@
             "MAX_CHECK": "你必須至多選出 %s選項",
             "RANGE_CHECK": "你必須在%s 與 %s 之間作出選擇",
             "EQUAL_TO": "該數值應為一致",
-            "LINEWIDTH": "One or some lines are too long. They should have %s characters or less.",
-            "PIKADAY": "Invalid date format, use DD MMM YYYY (like 23 Mar 1984)"
+            "LINEWIDTH": "One or more lines is perhaps too long. Try to keep under %s characters.",
+            "PIKADAY": "Invalid date format, please use DD MMM YYYY (like 23 Mar 1984)"
         },
         "PICKERDATE": {
             "FORMAT": "DD MMM YYYY",
@@ -319,7 +319,7 @@
         "ACTION_RESET_PASSWORD": "重設密碼 ",
         "LINK_CANCEL": "不，請帶我回去，我記起來了",
         "SUCCESS_TITLE": "Check your inbox!",
-        "SUCCESS_TEXT": "We have sent you an email with the instructions to set a new password",
+        "SUCCESS_TEXT": "We sent you an email with the instructions to set a new password",
         "ERROR": "按我們的記錄，你尚未註冊"
     },
     "CHANGE_PASSWORD": {
@@ -410,8 +410,8 @@
             "PAGE_TITLE": "成員資格 - {{projectName}}",
             "ADD_BUTTON": "+ 新成員",
             "ADD_BUTTON_TITLE": "增加新成員",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "This project has reached its limit of allowed members <strong>({{members}})</strong>.",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of allowed members <strong>({{members}})</strong>. If you want to add more members please contact the administrators."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
             "TITLE": "匯出",
@@ -434,9 +434,9 @@
             "BACKLOG": "待辦任務優先表",
             "BACKLOG_DESCRIPTION": "管理你的 User Story 讓接下來的及優先的工作能被有條理地檢視 ",
             "NUMBER_SPRINTS": "Expected number of sprints",
-            "NUMBER_SPRINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_SPRINTS_HELP": "0 for an undetermined number",
             "NUMBER_US_POINTS": "Expected total of story points",
-            "NUMBER_US_POINTS_HELP": "0 for an undetermined quantity",
+            "NUMBER_US_POINTS_HELP": "0 for an undetermined number",
             "KANBAN": "Kanban(看板)",
             "KANBAN_DESCRIPTION": "在此看板上組織你的專案",
             "ISSUES": "問題 ",
@@ -446,7 +446,7 @@
             "MEETUP": "符合",
             "MEETUP_DESCRIPTION": "Choose your videoconference system.",
             "SELECT_VIDEOCONFERENCE": "選擇一個視訊會議系統　",
-            "SALT_CHAT_ROOM": "Add a prefix to the chat room name",
+            "SALT_CHAT_ROOM": "Add a prefix to the chatroom name",
             "JITSI_CHAT_ROOM": "Jitsi",
             "APPEARIN_CHAT_ROOM": "AppearIn",
             "TALKY_CHAT_ROOM": "Talky",
@@ -470,19 +470,19 @@
             "LOGO_HELP": "此圖片將被裁成80x80px.<br>",
             "CHANGE_LOGO": "更改圖標",
             "ACTION_USE_DEFAULT_LOGO": "使用設預圖片",
-            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-            "MAX_PRIVATE_PROJECTS_MEMBERS": "The project exceeds the maximum members number in private projects",
-            "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
-            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds the maximum members number in public projects",
+            "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects allowed by your current plan",
+            "MAX_PRIVATE_PROJECTS_MEMBERS": "The maximum number of members for private projects has been exceeded",
+            "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects allowed by your current plan",
+            "MAX_PUBLIC_PROJECTS_MEMBERS": "The project exceeds your maximum number of members for public projects",
             "PROJECT_OWNER": "Project owner",
             "REQUEST_OWNERSHIP": "Request ownership",
-            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to be the project owner?",
-            "REQUEST_OWNERSHIP_DESC": "Ask the owner {{name}} to transfert to you the project ownership.",
+            "REQUEST_OWNERSHIP_CONFIRMATION_TITLE": "Do you want to become the new project owner?",
+            "REQUEST_OWNERSHIP_DESC": "Request that current project owner {{name}} transfer ownership of this project to you.",
             "REQUEST_OWNERSHIP_BUTTON": "要求",
             "REQUEST_OWNERSHIP_SUCCESS": "We'll notify the project owner",
             "CHANGE_OWNER": "Change owner",
-            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent",
-            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email whether it accepts or rejects the ownership of the project."
+            "CHANGE_OWNER_SUCCESS_TITLE": "Ok, your request has been sent!",
+            "CHANGE_OWNER_SUCCESS_DESC": "We will notify you by email if the project ownership request is accepted or declined"
         },
         "REPORTS": {
             "TITLE": "Reports",
@@ -562,7 +562,7 @@
             "COUNT_MEMBERS": "{{ role.members_count }} 這類角色的成員",
             "TITLE_DELETE_ROLE": "删除角色",
             "REPLACEMENT_ROLE": "和此角色有關的使用者都將遭移除　",
-            "WARNING_DELETE_ROLE": "Be careful, all role estimations will be removed",
+            "WARNING_DELETE_ROLE": "Be careful! All role estimations will be removed",
             "ERROR_DELETE_ALL": "你不能刪除所有數值",
             "EXTERNAL_USER": "外部使用者"
         },
@@ -692,21 +692,21 @@
             "TITLE": "服務 "
         },
         "PROJECT_TRANSFER": {
-            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Do you want to be the new project owner?",
+            "DO_YOU_ACCEPT_PROJECT_OWNERNSHIP": "Would you like to become the new project owner?",
             "PRIVATE": "Private",
-            "ACCEPTED_PROJECT_OWNERNSHIP": "OK. Now you are the new owner of the project.",
-            "REJECTED_PROJECT_OWNERNSHIP": "OK. We will contact with the owner",
+            "ACCEPTED_PROJECT_OWNERNSHIP": "Congratulations! You're now the new project owner.",
+            "REJECTED_PROJECT_OWNERNSHIP": "OK. We'll contact the current project owner",
             "ACCEPT": "接受",
             "REJECT": "Reject",
-            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> wants you to be the new owner of the project.",
-            "ADD_COMMENT_QUESTION": "Do you want to add a comment for the owner?",
-            "ADD_COMMENT": "Do you want to add a comment for the owner?",
+            "PROPOSE_OWNERSHIP": "<strong>{{owner}}</strong>, the current owner of the project <strong>{{project}}</strong> has asked that you become the new  project owner.",
+            "ADD_COMMENT_QUESTION": "Would you like to send a question to the project owner?",
+            "ADD_COMMENT": "Would you like to add a comment for the project owner?",
             "UNLIMITED_PROJECTS": "Unlimited",
             "OWNER_MESSAGE": {
-                "PRIVATE": "Remember, you can own up to <strong>{{maxProjects}}</strong> private projects and you already own <strong>{{currentProjects}}</strong> private projects",
-                "PUBLIC": "Remember, you can own <strong>{{maxProjects}}</strong> public projects and you already own <strong>{{currentProjects}}</strong> public projects"
+                "PRIVATE": "Please remember that you can own up to <strong>{{maxProjects}}</strong> private projects. You currently own <strong>{{currentProjects}}</strong> private projects",
+                "PUBLIC": "Please remember that you can own up to <strong>{{maxProjects}}</strong> public projects. You currently own <strong>{{currentProjects}}</strong> public projects"
             },
-            "CANT_BE_OWNED": "Right now you can't be the owner of a project with this characteristics. To be the owner of this project you should contact the admin staff and change your account conditions.",
+            "CANT_BE_OWNED": "At the moment you cannot become an owner of a project of this type. If you would like to become the owner of this project, please contact the administrator so they change your account settings to enable project ownership.",
             "CHANGE_MY_PLAN": "Change my plan"
         }
     },
@@ -771,7 +771,7 @@
         "BLOCKED_PROJECT": {
             "BLOCKED": "Blocked project",
             "THIS_PROJECT_IS_BLOCKED": "This project is temporarily blocked",
-            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "To unblock your projects you must contact with the admin staff"
+            "TO_UNBLOCK_CONTACT_THE_ADMIN_STAFF": "In order to unblock your projects, contact the administrator."
         },
         "STATS": {
             "PROJECT": "專案<br/> 點數",
@@ -836,28 +836,28 @@
             "ERROR_MAX_SIZE_EXCEEDED": "'{{fileName}}' ({{fileSize}}) 超過系統容量上限, 請重傳小一點的檔案 ({{maxFileSize}})",
             "SYNC_SUCCESS": "你的專案已成功滙入",
             "PROJECT_RESTRICTIONS": {
-                "PROJECT_MEMBERS_DESC": "The project you want to import has {{members}} users, but you are only allowed to have {{max_memberships}} users per project. If you want have more users contact with the administrators.",
+                "PROJECT_MEMBERS_DESC": "The project you are trying to import has {{members}} members, unfortunately, your current plan allows for a maximum of {{max_memberships}} members per project. If you would like to increase that limit please contact the administrator.",
                 "PRIVATE_PROJECTS_SPACE": {
-                    "TITLE": "You don't have space for another private project",
-                    "DESC": "The project you want to import is private, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is private. Unfortunately, your current plan does not allow for additional private projects."
                 },
                 "PUBLIC_PROJECTS_SPACE": {
-                    "TITLE": "You don't' have space for another public project",
-                    "DESC": "The project you want to import is public, but you don't have space to create more."
+                    "TITLE": "Unfortunately, your current plan does not allow for additional private projects",
+                    "DESC": "The project you are trying to import is public. Unfortunately, your current plan does not allow additional public projects."
                 },
                 "PRIVATE_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per private project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per private project"
                 },
                 "PUBLIC_PROJECTS_MEMBERS": {
-                    "TITLE": "Your account only allows {{max_memberships}} users per public project"
+                    "TITLE": "Your current plan allows for a maximum of {{max_memberships}} members per public project."
                 },
                 "PRIVATE_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another private project and neither for more than {{max_memberships}} users per private projects",
-                    "DESC": "The project that you want to import is private and has {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional private projects or an increase of more than {{max_memberships}} members per private project",
+                    "DESC": "The project that you are trying to import is private and has {{members}} members."
                 },
                 "PUBLIC_PROJECTS_SPACE_MEMBERS": {
-                    "TITLE": "You don't have space for another public project and neither for more than {{max_memberships}} users per public projects",
-                    "DESC": "The public that you want to import is public and has more than {{members}} users."
+                    "TITLE": "Unfortunately your current plan doesn't allow additional public projects or an increase of more than {{max_memberships}} members per public project",
+                    "DESC": "The project that you are trying to import is public and has more than {{members}} members."
                 }
             }
         },
@@ -890,8 +890,8 @@
             "NEWSLETTER_LABEL_TEXT": "不願再收到電子月報",
             "CANCEL": "Back to settings",
             "ACCEPT": "Delete account",
-            "BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else.",
-            "SUBTITLE": "You are going to miss you!:("
+            "BLOCK_PROJECT": "Note that all the projects you own projects will be <strong>blocked</strong> after you delete your account. If you do want a project blocked, transfer ownership to another member of each project prior to deleting your account.",
+            "SUBTITLE": "Sorry to see you go. We'll be here if you should ever consider us again! :("
         },
         "DELETE_PROJECT": {
             "TITLE": "刪除專案",
@@ -948,24 +948,24 @@
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(非必要) 加上一段私人文字在邀請信，告訴你的新成員一些好事  ;-)",
             "PLACEHOLDER_TYPE_EMAIL": "輸入一個電郵地址",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you want to add more members contact the administrators.",
-            "LIMIT_USERS_WARNING_MESSAGE": "This project can't have more than <strong>{{maxMembers}}</strong> members."
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members.<br> If you would like to increase the current limit, please contact the administrator.",
+            "LIMIT_USERS_WARNING_MESSAGE": "Unfortunately, this project can't have more than <strong>{{maxMembers}}</strong> members."
         },
         "LEAVE_PROJECT_WARNING": {
-            "TITLE": "You can not leave the project without owner",
+            "TITLE": "Unfortunately, this project can't be left without an owner",
             "CURRENT_USER_OWNER": {
-                "DESC": "You are the project owner before leaving it you must pass the property to someone else.",
+                "DESC": "You are the current owner of this project. Before leaving, please transfer ownership to someone else.",
                 "BUTTON": "Change the project owner"
             },
             "OTHER_USER_OWNER": {
-                "DESC": "You can't delete the project owner, you must request a new owner before deleting the user.",
-                "BUTTON": "Request change project owner"
+                "DESC": "Unfortunately, you can't delete a member who is also the current project owner. First, please assign a new project owner.",
+                "BUTTON": "Request project owner change"
             }
         },
         "CHANGE_OWNER": {
-            "TITLE": "Who do you want to be the new owner?",
+            "TITLE": "Who do you want to be the new project owner?",
             "ADD_COMMENT": "Add comment",
-            "BUTTON": "Ask this teammate to be the owner"
+            "BUTTON": "Ask this project member to become the new project owner"
         }
     },
     "US": {
@@ -1395,7 +1395,7 @@
     "WIZARD": {
         "SECTION_TITLE_CREATE_PROJECT": "創建專案",
         "CREATE_PROJECT_TEXT": "新鮮與乾淨，太好了",
-        "CHOOSE_TEMPLATE": "哪一個樣版最適合你的專案",
+        "CHOOSE_TEMPLATE": "Which template fits your project best?",
         "CHOOSE_TEMPLATE_TITLE": "More info about project templates",
         "CHOOSE_TEMPLATE_INFO": "More info",
         "PROJECT_DETAILS": "Project Details",
@@ -1403,7 +1403,7 @@
         "PRIVATE_PROJECT": "Private Project",
         "CREATE_PROJECT": "創建專案",
         "MAX_PRIVATE_PROJECTS": "You've reached the maximum number of private projects",
-        "MAX_PUBLIC_PROJECTS": "You've reached the maximum number of public projects",
+        "MAX_PUBLIC_PROJECTS": "Unfortunately, you've reached the maximum number of public projects",
         "CHANGE_PLANS": "change plans"
     },
     "WIKI": {

From 14ebd06ce0a5c66318f755ebecf694620d63e77e Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 31 Mar 2016 07:40:53 +0200
Subject: [PATCH 148/155] Fixing importing when project memberships is just the
 same value than the user max

---
 app/coffee/modules/common/importer.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee
index 5eb48006..4ff587c1 100644
--- a/app/coffee/modules/common/importer.coffee
+++ b/app/coffee/modules/common/importer.coffee
@@ -38,7 +38,7 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                     privateError = !currentUserService.canCreatePrivateProjects().valid
                     maxMemberships = null
 
-                    if user.get('max_memberships_private_projects') != null && result.headers.memberships > user.get('max_memberships_private_projects')
+                    if user.get('max_memberships_private_projects') != null && result.headers.memberships >= user.get('max_memberships_private_projects')
                         membersError = true
                     else
                         membersError = false
@@ -55,7 +55,7 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
                 else
                     publicError = !currentUserService.canCreatePublicProjects().valid
 
-                    if user.get('max_memberships_public_projects') != null && result.headers.memberships > user.get('max_memberships_public_projects')
+                    if user.get('max_memberships_public_projects') != null && result.headers.memberships >= user.get('max_memberships_public_projects')
                         membersError = true
                     else
                         membersError = false

From 64d9705c5bf5599728588515ede7ed815b29c9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 31 Mar 2016 08:51:59 +0200
Subject: [PATCH 149/155] Fix label of search option in navigation bar

---
 app/modules/components/project-menu/project-menu.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/modules/components/project-menu/project-menu.jade b/app/modules/components/project-menu/project-menu.jade
index 3d5a4045..6b845c6e 100644
--- a/app/modules/components/project-menu/project-menu.jade
+++ b/app/modules/components/project-menu/project-menu.jade
@@ -14,7 +14,7 @@ nav.menu(
                  )
                      svg.icon.icon-search
                          use(xlink:href="#icon-search")
-                    span.helper(translate="PROJECT.SECTION.SEARCH")
+                     span.helper(translate="PROJECT.SECTION.SEARCH")
 
              li(id="nav-timeline")
                  a(

From 78b922a84750deab20bfa5f60806cf2817ed1225 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 31 Mar 2016 09:14:09 +0200
Subject: [PATCH 150/155] Notify in the browser console if there is an error in
 the conf.json file

---
 app-loader/app-loader.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-loader/app-loader.coffee b/app-loader/app-loader.coffee
index 333e9860..6cbe2f03 100644
--- a/app-loader/app-loader.coffee
+++ b/app-loader/app-loader.coffee
@@ -55,6 +55,9 @@ promise = $.getJSON "/conf.json"
 promise.done (data) ->
     window.taigaConfig = _.assign({}, window.taigaConfig, data)
 
+promise.fail () ->
+    console.error "Your conf.json file is not a valid json file, please review it."
+
 promise.always ->
     if window.taigaConfig.contribPlugins.length > 0
         loadPlugins(window.taigaConfig.contribPlugins).then () ->

From 91fc0661f6e1c8530065c5912474f19ae90b416d Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Fri, 1 Apr 2016 07:38:37 +0200
Subject: [PATCH 151/155] Hiding the transfer project option if I'm the only
 member of the project

---
 app/partials/admin/admin-project-profile.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 36cf992d..bef35943 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -84,7 +84,7 @@ div.wrapper(
                         project-id="project.id"
                     )
 
-                fieldset(ng-if="project.owner.id == user.id")
+                fieldset(ng-if="project.owner.id == user.id && project.members.length > 1")
                     tg-admin-project-change-owner.admin-project-profile-owner-actions(
                         owner="project.owner",
                         project-id="project.id"

From cedaf2cbc437d80bd36cd873692240b09f497e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 29 Mar 2016 11:03:07 +0200
Subject: [PATCH 152/155] Out of beta

---
 app/images/beta.png                        | Bin 3642 -> 0 bytes
 app/partials/auth/forgot-password.jade     |   1 -
 app/partials/auth/login.jade               |   3 ---
 app/partials/includes/components/beta.jade |   1 -
 app/styles/components/beta.scss            |   6 ------
 5 files changed, 11 deletions(-)
 delete mode 100644 app/images/beta.png
 delete mode 100644 app/partials/includes/components/beta.jade
 delete mode 100644 app/styles/components/beta.scss

diff --git a/app/images/beta.png b/app/images/beta.png
deleted file mode 100644
index 47a8a37e53ce6c26de0735750a34525284009460..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3642
zcmV-A4#n|_P)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14Yx@|K~#90?cG^$8~0(y@$cdy36kJ_-=sxJq-0x?9oLdv%XZ^h
zPLn2Wb1817Go9&l`r4U3cH({9>0>+7PF^~e>o`6d*NxpciRHhWNj!;CpOQtH6h-kq
zL=q$+5C^f_hXo-JT96<KfH?lY8IDL`7k`XC{Ga<@P%#Vxne0Rr+6CZW044f`#rKK-
z?&rB5IMVgzWwwthwC@5h0QM{u`TReg`-kUkSt_ikqYCXiz(ul)`vU+8oZ+ZK`!?_*
z2Y?F_IHOU8_ATH)I3Qe*z!{4wv~P02xFCTuk|^#=K(+?4mbf5+(;ii5e?gAmf&@-$
zRH6Mj@FQ{r7bI}nq6+QLfS1W3T#&$Ni7K>jkb}4&f%hF%XkQ0@3^=n?WXiZ8f%g?v
zXnzX4LXP5s1m1I0p?wW_l^n(e3B0GMLi;LtfD00M*HMM`C%|ifD@#T085bn*t`fz4
zojkz>37m3Np?!rs!vzVPQdFTmOCI8a1l}>K(9Q$@36x~1$h6^t1l~5P(4GN)LZ0G6
z_LkQ2E~?P}7<dB<+~8^u@5maq5*t<BmAJ~&GFwVJE=XX@s6u-h3*51HCs-X@!@sbO
zzM%tPciJd#DW~U|F3KCr_F7~{Z~+v#ZFXy-xc>!|#y>vxiwS0aH%Db#1$6^8*h_3E
z4m;jqFU!MT?4@>kp6;UdaP@AB%or|6;4M*w_GREr5^yJfJ<Y`X(=;Bhr{{bZHitrR
zC5X%8LQxcaQ+K%j`VAC2Jn%Pz*qtfw(#a?;$U#;ts?h!ji<)Z~26G?Xrn0SqzOQy;
zbC`R}ul;D4TklQ+P~PIE_0eVm%R#0;m`k<DjN^g?20#_sQ<ydPo=!Bd7$CG7qPoYk
z<?+sQZ8SaD0KoJIvnUEww7OXyUQVURtl)wiWT6V}N#MV+zy(;H^kL`*747AO{b8>B
z`w$&Zv{QeyCU%T}-VZh#*lg&b$WBFO4Ht^M2CG7Qf^BdCN}^LB|3Uz#+e!UE9p#Pg
z*z<;A5b%buyA;q3Y}@z0S;d7S29DzX6mV~MTxDk^j#4{8ZxDcvbFGxsnX@OuFqn9M
zn)StXs=7S{76Z7-lQxQ3$AuzoqE(@tBL!Rldx@R$MmGzeEmGN0LH$52w=PW*@CFI4
zga|AKXg}M^;?OdNZqWKjv(?KS2rd-iG)WcO<G|abfV-JHvv;`m@-Vs%9gnr3hjomI
zfgaXzRk`p@-C^OgMd}A@IrR13#M2K97m5s671|$S;+F6B+{MqAxFseDECq48om8~C
z39W|k-(E+t+i1MMp01}lu)DVOdIyRNMFebx8wo`SECncUPR%>)4>S3z8Sc#b33!7z
z%j~#nN@+dSNL8;V@$du3g(3k~h4vWmKg8n(BV2vy3w%>Ps{5*FKhuJzvoht^Gz<ep
zQIb8K6Sz<Wz^c&BV&YcBKYrzfAy&uNwjAr}tfc)+3)Ov9`zbPKaG}6Q(W=nSV1WzZ
zsxarbwf)sN${Z|wy2$GI8lR7^QPJY2{cI~W{ngvmQmf<?E);MLR)uyN_!(f??)vBb
zeDcH3L4gy0dmO_s7#EW)4SCu8KXKQW(ssI)`eU^ywjH5!4i^d(*b3LsjeC%;{dkz=
zVK23ZYdG@F`v91^Jjcy<#<v_-T3tfxqs=s(Xh;T~lekcTD_N@09wh-+-!QoL@-P$s
zJGJH5j<YQQEL~s5H|1k(!pHb~<`tsqzAD_&3-|$VkoDVvyu*b8>w{IH{Q(xZL$3_u
z9bLgU<D=<hW32zJXse*AyONc$HAa3qMsOuaB&1V!w1)m~^r6@k7OpO_zOYW`xi+gJ
za~c;4sEJmE_6YEEAT}Y5$90rC82Da46)jumyeng?Tz&C+?B{sg9g_37P#{h8PPhQQ
z=ezE~1*q!wP}yb<vK?jig2IIY09J+eCEy*l!3A@}Twp0^`5NtK%)WSIJ;Lp)OFI>r
zH@J}Jz^c$5#;m!qm5D9Qa+#ghN16Z#t%kVr;*ceB^`W~1s)_ff&?8B^t-Qj8JO);U
z_7DlU0D4#_><{B8vorX;!*qYSlb)wLf#k@FqR@V(6@Z#U)!6L$H(E}Xyc}djaeo2C
z_NeL+o$IgNpy7BO)x91<t0CNRJ1^qrw=R#1W6vF-wD#_{XTva<{$Q52(=Ap-<|QuV
zA+Rd6Q@}4t#C>&y<&hPf6;4k6-TjG|?Esj$JkQN{ZUNTFNs_m?kY`P_DzuX%)LcV1
z?&6j?7`)JLi3`y3a3j6XbOGD<$#KbRT*xEfDDE$T*mg!kHyDcII!YZ3Ja;(OEH8iI
zCG6k0=XIJNYNYpk7mA_~S`9J(>Fs1i<~=Ut$x4<gv=f*$w<iAa8*h!VJnRKbxbh|w
z_x9B#hTj;atf7?Se>HGVjcz{G2q^gH{d7FuYE@)G;6fe%t3rDav*y+&KG*t4Gt0wf
zO`ZDn3?(%#98NpKZ;WCX2DOK3k~Y`Pry7zKSunVe<AW?!Xb%AI0(Hrb@z1Yw^~E8=
z{tffmtztIa?PpuJtRHXqH*mOj{CzGcT*%=*I2o?KVc=iz6A78OZ@L@H7<}#sPPYTY
zFfeq3n*Qo7xZWEp{NF!+!s4}UZ!0M{T*y&iRcQBPfx9;8<C7m=;p2b1%18hD8NQi2
zz*b}c@9+w9pDdW)-&kSjl@TH#ot3zy%Y+mpF63YntqScpa0#g2d`yq%j9;2$`nOx}
z+$(Q(bN^ot#J1HWHrLG$H8S_%0(wNJ=|ls)&vsdD!6{f=$gvun4EOr0BTWBx4x8OZ
z=ehRS`m%p+ok&2BouAlT&s?4>YFx;n8mtQK7$$CPcx&k9g@ff0^TNTvg(Fn7xG@Za
z-~H1^*lY?-4>jVOx<m7+25JwRv#9u*+;p-bHt$VH!Q(=XOp{ch4U&Khuyoza@`%}Q
z+MRZsW#-$R|M)hMV1x)T`KxIFyrV00KHf(AW3928yl`ca&L`T678i1$2FKwxT0KAc
zn_0#$O#o0*RYLpO7H<A*96h4r>8zx>&%^BHc|yK0HoL;Ze}6LR+&7w{!G!~^!K%;(
z*ajD%{j_<v-uR^nf-6C8yfp?u$78K@JZ?^f9BwD0Z;hcx48p!J_T(23iV7DFaFC@6
z?I=6oZl?WoGo4R%#C~>^*lB#=Zfm~2unvH;!nxhmp`ycu0|JiXz6Ug=dQLp@Mliya
zi$esxA-p$MnEm}cK&(bvq$qLW0Qz86Xh$${V|Pj$y1~+QFLg(2lAjn&e4p&9bg|*z
zFsDK%8|Zts+v=2}#f2=_U@KfbVledD2-ja9Ve&V#JHAGIO%APv?#^@1cUc`?)VPqv
zL6$1C!<c>Umd`j)Y-XPd#A@c|z$#hd2VTu58t5s~MT}IEl_pvhT0bBF%MDKe!*7nV
z@aZA|olkb`hz#c3x2ne@akojvfup$Z0hU+R<1_N+&Dai$RFN$rapRKFK3EmnArf#6
z-C*|j^Q=wzNc`ox?`u6YK4>mOk6)TdsZUOb#7#)XYOpG_`!Jj3*xbd?%>mW&7v?q_
zM~NLzw}<K;4^=%L%IZon41=+sPcU=YymGXQnk;cGk`Z7lT!7KH#+dzRA?bN8k1K|~
zc55wmYzoK{H%ZbCtO~6U6SqC_xxjLeD;I|dt%h*A9khI@8ULK0m9bUA>-X+}jL*P@
zeyV#dKRZL>Zj-bETj3hIfxe+*cbQY6z;ckQ7l#P0hA6EqVerBcN~&G>X8f#-uHe17
z%G!hvJ#zOtZ!urb-EYzctO~6c6F0VKyxHe&+}Yshh5p!lH{cC&^#v2zRpDgtFON`G
zclTqO^$nfXTWjXsfr>)cQ|%IWk4X!#DzqNped2Hd=005D#@k~6RJK(lMRry=IhKID
zLnLmB+4nRliYrLK1!z1`AKhdQYg0b1z4QeeLG$yJORGy5{QeP2JTAh%Fjp=PvA!5c
zrAUdpi|h+n6<RkYZl~4rilWf-Oeakz%}aY}K$f_>%$|XF!rhFbDD<B1qWMH}<YV7I
zN=a1-VPBZ}kCRTLB<>!vr#@H}S{Ej6cdF+YhQa9Dx0s90Z4>+Cpf|+ahjUvl?8imo
z?lHRt-V5$#c0x`PiMx;Ns)<&G)`_{c+`X5=6h)!;*{;}n^Ja4$3G2yDk+}Oz%D_=v
z0rc#rKt)mL`${)W(LGh=jb*XFMU)VUn}(#+M5{vUz{I`h^Xm5+!!TI*Y>|fJb#f6S
zgV_;S6<RyyB1YP9cZkGIW43LgqqqWzo3}{{tO~6Sb3oOXrS~FnGZ0JQD6RnR%hLOh
zxEablz^c$%F>9{GEr4tRj^Ya7P?pM<xEW3iSQT0eX3dqj1r!@>!R^mdxe_-^vD?nM
zn=zZ^!&xd*;$|^6;3r7jf{l$7?l?$OB<=yk2JGrjd+jk2_kfZOV2OKx$uzLUJ>X;#
zSmNeDY-HvRLy4Os$wUp7xH*(`154Z-OFDriZVo10z!En{lMY~so5R`fC|cs?c=l6+
zC2k&MufP&FPqG(aiJM2+EwIGRv+M>~;^tve1(vvZnpCDq5;u>tQw^55d7kZnC2j#E
z8L-4HkXQjr+yY7>u*5B}#E+sSZUJVq220!mjRO<+`GbBVGMUN$10XL`hE`LiqyPW_
M07*qoM6N<$f?+KDZU6uP

diff --git a/app/partials/auth/forgot-password.jade b/app/partials/auth/forgot-password.jade
index ceca6a3e..b9d64138 100644
--- a/app/partials/auth/forgot-password.jade
+++ b/app/partials/auth/forgot-password.jade
@@ -1,6 +1,5 @@
 doctype html
 
-include ../includes/components/beta
 div.wrapper
     div.auth
         div.auth-container
diff --git a/app/partials/auth/login.jade b/app/partials/auth/login.jade
index b5182527..554023f7 100644
--- a/app/partials/auth/login.jade
+++ b/app/partials/auth/login.jade
@@ -1,8 +1,5 @@
 doctype html
 
-div
-  include ../includes/components/beta
-
 div.wrapper
     div.auth
         div.auth-container
diff --git a/app/partials/includes/components/beta.jade b/app/partials/includes/components/beta.jade
deleted file mode 100644
index 647d2108..00000000
--- a/app/partials/includes/components/beta.jade
+++ /dev/null
@@ -1 +0,0 @@
-img.beta(src="/#{v}/images/beta.png", title="{{'COMMON.BETA' | translate}}")
diff --git a/app/styles/components/beta.scss b/app/styles/components/beta.scss
deleted file mode 100644
index 6856d586..00000000
--- a/app/styles/components/beta.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.beta {
-    left: 0;
-    position: absolute;
-    top: 0;
-    z-index: 9999;
-}

From b526c2c8db2689e3a00759a177157716a7f90d90 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Fri, 1 Apr 2016 10:52:11 +0200
Subject: [PATCH 153/155] Hiding the transfer project option if I'm the only
 member of the project but show the owner

---
 app/coffee/modules/admin/project-profile.coffee    | 4 +++-
 app/partials/admin/admin-project-change-owner.jade | 5 ++++-
 app/partials/admin/admin-project-profile.jade      | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 8b0d64e4..5959330f 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -569,13 +569,15 @@ AdminProjectChangeOwnerDirective = (lightboxFactory) ->
                 }, {
                     projectId: scope.projectId,
                     activeUsers: scope.activeUsers,
-                    currentOwnerId: scope.owner.id
+                    currentOwnerId: scope.owner.id,
+                    members: scope.members
                 })
 
         scope: {
             "activeUsers": "="
             "projectId": "="
             "owner": "="
+            "members": "="
         },
         templateUrl: "admin/admin-project-change-owner.html"
     }
diff --git a/app/partials/admin/admin-project-change-owner.jade b/app/partials/admin/admin-project-change-owner.jade
index 6647f441..b7a4766a 100644
--- a/app/partials/admin/admin-project-change-owner.jade
+++ b/app/partials/admin/admin-project-change-owner.jade
@@ -5,4 +5,7 @@
     .owner-info-title {{ 'ADMIN.PROJECT_PROFILE.PROJECT_OWNER' | translate }}
     .owner-name {{::owner.full_name_display}}
 
-a.request(href="", ng-click="changeOwner()") {{ 'ADMIN.PROJECT_PROFILE.CHANGE_OWNER' | translate }}
+a.request(
+    href="",
+    ng-click="changeOwner()",
+    ng-if="members > 1") {{ 'ADMIN.PROJECT_PROFILE.CHANGE_OWNER' | translate }}
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index bef35943..7cd2f329 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -84,8 +84,9 @@ div.wrapper(
                         project-id="project.id"
                     )
 
-                fieldset(ng-if="project.owner.id == user.id && project.members.length > 1")
+                fieldset(ng-if="project.owner.id == user.id")
                     tg-admin-project-change-owner.admin-project-profile-owner-actions(
+                        members="project.members.length"
                         owner="project.owner",
                         project-id="project.id"
                         active-users="activeUsers"

From fd15c777573ba5c00a2245f8c284db61bb8751d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 1 Apr 2016 11:11:21 +0200
Subject: [PATCH 154/155] [i18n] Update locales

---
 app/locales/taiga/locale-fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json
index 78f00986..5af40473 100644
--- a/app/locales/taiga/locale-fr.json
+++ b/app/locales/taiga/locale-fr.json
@@ -1389,7 +1389,7 @@
             "LANGUAGE": "Langue",
             "LANGUAGE_DEFAULT": "-- utiliser la langue par défaut --",
             "THEME": "Thème",
-            "THEME_DEFAULT": "-- Utiliser la langue par défaut --"
+            "THEME_DEFAULT": "-- utiliser le thème par défaut --"
         }
     },
     "WIZARD": {

From 61ba15570ecf334b17572ae672da189652b052b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 1 Apr 2016 11:11:33 +0200
Subject: [PATCH 155/155] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a528eec..930a76fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog #
 
 
-## 2.0.0 ??? (unreleased)
+## 2.0.0 Pulsatilla Patens (2016-04-04)
 
 ### Features
 - Ability to create url custom fields. (thanks to [@astagi](https://github.com/astagi)).