Cleanup unused translations

app/admin-tab/ha/template.hbs

@@ -22,7 +22,7 @@
       <td>{{member.uuid}}</td>
       <td>{{member.advertiseAddress}}</td>
       <td>{{member.httpPort}}</td>
-      <td>{{#if member.clustered}}{{t 'generic.yess'}}{{else}}{{t 'generic.noo'}}{{/if}}</td>
+      <td>{{#if member.clustered}}{{t 'generic.yes'}}{{else}}{{t 'generic.no'}}{{/if}}</td>
       <td>{{date-str member.heartbeat}}</td>
     {{else if (eq kind "norows")}}
       <tr>

app/components/edit-stack/template.hbs

@@ -6,7 +6,7 @@
       <label>{{t 'editStack.name.label'}}</label>
     </div>
     <div class="col span-8">
-      {{input type="text" value=primaryResource.name classNames="form-control" placeholder=(t 'editStack.description.placeholder')}}
+      {{input type="text" value=primaryResource.name classNames="form-control" placeholder=(t 'editStack.name.placeholder')}}
     </div>
   </div>
 

app/components/hero-add-service/component.js

@@ -1,32 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  settings: Ember.inject.service(),
-
-  showUser: true,
-  catalog: null,
-
-  stackId: null,
-
-  actions: {
-    newService() {
-      var stackId = this.get('stackId');
-
-      if ( stackId )
-      {
-        this.get('router').transitionTo('service.new', {queryParams: {stackId: stackId}});
-      }
-      else
-      {
-        var stack = this.get('store').createRecord({
-          type: 'stack',
-          name: 'Default',
-        });
-
-        return stack.save().then(() => {
-          this.get('router').transitionTo('service.new', {queryParams: {stackId: stack.get('id') }});
-        });
-      }
-    },
-  }
-});

app/components/hero-add-service/template.hbs

@@ -1,16 +0,0 @@
-{{#if showUser}}
-  <section class="welcome">
-    <h2>{{t 'heroAddService.service.header'}}</h2>
-    <p>
-      {{t 'heroAddService.service.paragraph1' appName=settings.appName}}
-    </p>
-    <p>
-      {{t 'heroAddService.service.paragraph2' appName=settings.appName}}
-      {{#if settings.isRancher}}<a href="{{settings.docsBase}}/cattle/adding-services/" target="_blank">{{t 'heroAddService.service.contentLink'}}</a>{{/if}}
-    </p>
-    <button role="button" class="btn bg-primary" {{action "newService"}}>{{t 'heroAddService.addService'}}</button>
-    {{#link-to "catalog-tab" class="btn bg-primary"}}{{t 'heroAddService.linkToCatalog'}}{{/link-to}}
-  </section>
-{{/if}}
-
-{{yield}}

app/components/info-multi-stats/template.hbs

@@ -15,7 +15,7 @@
       {{spark-line
         data=stats.memory
         width=smallWidth height=smallHeight
-        prefix="containersPage.table.sparkPrefixCpu"
+        prefix="containersPage.table.sparkPrefixMemory"
         formatter="mib"
         gradient="memory"
         maxDoubleInital=true
@@ -24,7 +24,7 @@
       {{spark-line
         data=stats.networkTotal
         width=smallWidth height=smallHeight
-        prefix="containersPage.table.sparkPrefixCpu"
+        prefix="containersPage.table.sparkPrefixNetwork"
         formatter="kbps"
         gradient="network"
         minMax=100
@@ -33,7 +33,7 @@
       {{spark-line
         data=stats.storageTotal
         width=smallWidth height=smallHeight
-        prefix="containersPage.table.sparkPrefixCpu"
+        prefix="containersPage.table.sparkPrefixStorage"
         formatter="kbps"
         gradient="storage"
         minMax=100

app/components/machine/driver-azure/template.hbs

@@ -59,13 +59,13 @@
     <div class="row">
       <div class="col span-6">
       <label class="acc-label">{{t 'machine.driverAzure.clientId.label'}}{{field-required}}</label>
-        {{input type="text" value=azureConfig.clientId classNames="form-control"}}
+        {{input type="text" value=azureConfig.clientId classNames="form-control" placeholder=(t 'machine.driverAzure.clientId.placeholder')}}
         <p class="text-info">{{t 'machine.driverAzure.helpBlock' htmlSafe=true}}</p>
       </div>
 
       <div class="col span-6">
         <label class="acc-label">{{t 'machine.driverAzure.clientSecret.label'}}{{field-required}}</label>
-        {{input type="password" value=model.secretValues.azureConfig.clientSecret classNames="form-control"}}
+        {{input type="password" value=model.secretValues.azureConfig.clientSecret classNames="form-control" placeholder=(t 'machine.driverAzure.clientSecret.placeholder')}}
       </div>
   </div>
 </div>

app/components/service-log/template.hbs

@@ -27,8 +27,8 @@
       </td>
     </tr>
   {{else if (eq kind "nomatch")}}
-    <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted p-20">{{t 'containersPage.table.noMatch'}}</td></tr>
+    <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted p-20">{{t 'serviceLog.noMatch'}}</td></tr>
   {{else if (eq kind "norows")}}
-    <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted p-20">{{t 'containersPage.table.noData'}}</td></tr>
+    <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted p-20">{{t 'serviceLog.noData'}}</td></tr>
   {{/if}}
 {{/sortable-table}}

app/components/service-row/template.hbs

@@ -28,29 +28,25 @@
   <td data-title="{{dt.instanceState}}" class="pt-5">
     <div style="margin-top:2px;">
       {{#if canExpand}}
-        {{#if model.instances.length}}
+        {{progress-bar-multi
-          {{progress-bar-multi
+          labelKey="state"
-            labelKey="state"
+          valueKey="count"
-            valueKey="count"
+          values=model.instanceStates.byColor
-            values=model.instanceStates.byColor
+          tooltipValues=model.instanceStates.byName
-            tooltipValues=model.instanceStates.byName
+        }}
-          }}
-        {{/if}}
       {{else}}
         <span class="text-muted">{{t 'stacksPage.table.standalone'}}</span>
       {{/if}}
     </div>
     <div>
-       {{#if showInstanceCount}}
+      {{#if subMatches}}
-         {{#if subMatches}}
+        {{#if (lt (get subMatches model.id) model.instances.length)}}
-          {{#if (lt (get subMatches model.id) model.instances.length)}}
+          <p class="m-0 text-muted"><small>{{t 'pagination.containerHighlightSubset' subset=1 count=model.instances.length htmlSafe=true}}</small></p>
-            <p class="m-0 text-muted"><small>{{t 'pagination.containerHighlightSubset' subset=1 count=model.instances.length htmlSafe=true}}</small></p>
-          {{else}}
-            <p class="m-0 text-muted"><small><b>{{t 'pagination.container' pages=1 count=model.instances.length}}</b></small></p>
-          {{/if}}
         {{else}}
-          <p class="m-0 text-muted"><small>{{t 'pagination.container' pages=1 count=model.instances.length}}</small></p>
+          <p class="m-0 text-muted"><small><b>{{t 'pagination.container' pages=1 count=model.instances.length}}</b></small></p>
         {{/if}}
+      {{else}}
+        <p class="m-0 text-muted"><small>{{t 'pagination.container' pages=1 count=(concat model.instances.length "")}}</small></p>
       {{/if}}
     </div>
   </td>

app/custom-host/template.hbs

@@ -1,7 +1,6 @@
 <section class="header clearfix">
   <h1>
-    {{#link-to "infrastructure-tab"}}{{t 'hostsPage.new.header.linkTo'}}{{/link-to}}
+    {{t 'hostsPage.new.header.customText'}}
-    {{t 'hostsPage.new.header.text'}}
   </h1>
 </section>
 {{component "machine/driver-custom"
@@ -10,4 +9,3 @@
     completed=(action "completed")
     goBack=(route-action "goBack")
 }}
-<!-- {{add-host model=model driver="custom" completed=(action "completed") goBack=(route-action "goBack") savedHost=(action "savedHost") showPicker=false}} -->

app/dns/index/template.hbs

@@ -1,6 +1,6 @@
 {{#containers-header tags=tags}}
-  {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'stacksPage.header.importCompose'}}{{/link-to}}
+  {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
-  {{#link-to "dns.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'stacksPage.header.addRecord'}}{{/link-to}}
+  {{#link-to "dns.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addDns'}}{{/link-to}}
 {{/containers-header}}
 
 <section class="stacks-wrap pl-0 pr-0">
@@ -46,9 +46,9 @@
           {{/if}}
         </tr>
       {{else if (eq kind "nomatch")}}
-        <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'containersPage.table.noMatch'}}</td></tr>
+        <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'dnsPage.noMatch'}}</td></tr>
       {{else if (eq kind "norows")}}
-        <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'containersPage.table.noData'}}</td></tr>
+        <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'dnsPage.noData'}}</td></tr>
       {{/if}}
     {{/sortable-table}}
   {{else}}

app/models/project.js

@@ -72,6 +72,8 @@ var Project = Resource.extend(PolledResource, {
     var a = this.get('actionLinks');
 
     var choices = [
+      { label: 'action.setDefault',       icon: 'icon icon-home',         action: 'setAsDefault', enabled: this.get('canSetDefault')},
+      { divider: true },
       { label: 'action.edit',             icon: 'icon icon-edit',         action: 'edit',         enabled: !!a.update },
       { divider: true },
       { label: 'action.activate',         icon: 'icon icon-play',         action: 'activate',     enabled: !!a.activate},

app/signup/controller.js

@@ -2,6 +2,8 @@ import Ember from 'ember';
 import fetch from 'ember-api-store/utils/fetch';
 
 export default Ember.Controller.extend({
+  settings: Ember.inject.service(),
+
   emailSent: false,
   saving: false,
   saveDisabled: true,

app/signup/template.hbs

@@ -6,7 +6,7 @@
   {{#if emailSent}}
     <div class="row" style="max-width: 500px;">
       <div class="col span-12 text-center">
-        <h1>{{t 'signupPage.emailSuccess.header'}}</h1>
+        <h1>{{t 'signupPage.emailSuccess.header' appName=settings.appName}}</h1>
         <p>{{t 'signupPage.emailSuccess.confirm.subtext'}}</p>
       </div>
       {{#if loading}}
@@ -17,7 +17,7 @@
     </div>
   {{else}}
     <div>
-      <h1>{{t 'signupPage.header'}}</h1>
+      <h1>{{t 'signupPage.header' appName=settings.appName}}</h1>
       <form class="form text-left"  {{action "register" on='submit'}}>
         <div class="row">
           <label for="login-user-name">{{t 'signupPage.form.labels.loginUsername'}}{{field-required}}</label>

app/templates/host/add-common.hbs

@@ -3,7 +3,7 @@
     {{form-name-description
       name=prefix
       nameRequired=true
-      namePlaceholder="hostPartial.host.addCommon.new.form.name.placeholder"
+      namePlaceholder="hostsPage.new.name.placeholder"
       nameHelpText=nameCountLabel
       descriptionShown=true
       rowClass=""