- Merge duplicate translation.

Thanks to xet7 !

4 files changed, 15 insertions, 16 deletions

diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index cd388e68..b8c11d69 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -23,7 +23,7 @@ template(name="boardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")     
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-create-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -41,7 +41,7 @@ template(name="boardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-moved-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -72,7 +72,7 @@ template(name="boardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-moved-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -94,7 +94,7 @@ template(name="boardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-arch-trigger.js-goto-action
       i.fa.fa-plus
 
diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade
index 54133451..4492502b 100644
--- a/client/components/rules/triggers/cardTriggers.jade
+++ b/client/components/rules/triggers/cardTriggers.jade
@@ -15,7 +15,7 @@ template(name="cardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-label-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -42,7 +42,7 @@ template(name="cardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-spec-label-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -62,7 +62,7 @@ template(name="cardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-member-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -87,7 +87,7 @@ template(name="cardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-spec-member-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -109,6 +109,6 @@ template(name="cardTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-attachment-trigger.js-goto-action
       i.fa.fa-plus
diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade
index 8745b364..841ec6f7 100644
--- a/client/components/rules/triggers/checklistTriggers.jade
+++ b/client/components/rules/triggers/checklistTriggers.jade
@@ -15,7 +15,7 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-check-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -40,7 +40,7 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-spec-check-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -58,7 +58,7 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-comp-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -80,7 +80,7 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-spec-comp-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -98,7 +98,7 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-gen-check-item-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -120,6 +120,6 @@ template(name="checklistTriggers")
         div.trigger-text
           | {{_'r-by'}}
         div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}")
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
     div.trigger-button.js-add-spec-check-item-trigger.js-goto-action
       i.fa.fa-plus
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 343d17c2..5e21f767 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -623,7 +623,6 @@
     "r-items-list": "item1,item2,item3",
     "r-add-swimlane": "Add swimlane",
     "r-swimlane-name": "swimlane name",
-    "r-user-name": "username",
     "r-board-note": "Note: leave a field empty to match every possible value. ",
     "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
     "r-added-to": "added to",