Merge branch 'master' of https://github.com/bdunnette/loopback-angular-admin into bdunnette-master

beeman · beeman · commit 96458df8985f · 2016-01-29T20:46:31.000Z
diff --git a/client/app/js/translations.js b/client/app/js/translations.js
diff --git a/client/app/modules/users/services/user.service.js b/client/app/modules/users/services/user.service.js
@@ -77,7 +77,7 @@
             key: 'firstName',
             type: 'input',
             templateOptions: {
-              label: gettextCatalog.getString('Last name'),
+              label: gettextCatalog.getString('First name'),
               required: true
             }
           },
diff --git a/client/app/modules/users/views/main.html b/client/app/modules/users/views/main.html
@@ -1,5 +1,5 @@
 <section admin-header class="content-header"
          title="{{ 'Users' | translate}}"
-         sub-title="{{ 'Manager your users here!' | translate}}">
+         sub-title="{{ 'Manage your users here!' | translate}}">
 </section>
 <section ui-view class="content"></section>
diff --git a/po/de.po b/po/de.po
@@ -232,7 +232,7 @@ msgid "Manage your settings here!"
 msgstr "Verwalte deine Einstellungen hier"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "Verwalte deine Nutzer hier"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/es_MX.po b/po/es_MX.po
@@ -456,7 +456,7 @@ msgid "Manage your settings here!"
 msgstr "¡Administre sus configuraciones aquí!"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "¡Administre los usuarios aquí!"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/fr.po b/po/fr.po
@@ -435,7 +435,7 @@ msgid "Manage your settings here!"
 msgstr "Gérez vos paramètres ici!"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "Gérez vos utilisateurs ici!"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/nl.po b/po/nl.po
@@ -232,7 +232,7 @@ msgid "Manage your settings here!"
 msgstr "Hier beheer je je instellingen"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "Hier beheer je je gebruikers"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/pt-BR.po b/po/pt-BR.po
@@ -231,7 +231,7 @@ msgid "Manage your settings here!"
 msgstr "Administrar configurações do sistema!"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "Administrar sua conta"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/ru_RU.po b/po/ru_RU.po
@@ -436,7 +436,7 @@ msgid "Manage your settings here!"
 msgstr "Диспетчер ваших настройек здесь!"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "Диспетчер ваших пользователей здесь!"
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/template.pot b/po/template.pot
@@ -350,6 +350,10 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: client/app/modules/users/services/user.service.js:80
+msgid "First name"
+msgstr ""
+
 #: client/app/modules/users/controllers/register.ctrl.js:26
 msgid "First Name"
 msgstr ""
@@ -383,7 +387,6 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
-#: client/app/modules/users/services/user.service.js:80
 #: client/app/modules/users/services/user.service.js:88
 msgid "Last name"
 msgstr ""
@@ -425,7 +428,7 @@ msgid "Manage your settings here!"
 msgstr ""
 
 #: client/app/modules/users/views/main.html:3
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr ""
 
 #: client/app/modules/core/views/elements/small-box.html:8
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -448,7 +448,7 @@ msgid "Manage your settings here!"
 msgstr "在这里管理您的设置！"
 
 #: client/app/modules/users/views/main.html:2
-msgid "Manager your users here!"
+msgid "Manage your users here!"
 msgstr "在这里管理您的用户！"
 
 #: client/app/modules/core/views/elements/small-box.html:8

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`key: 'firstName',`
`78`	`78`	`type: 'input',`
`79`	`79`	`templateOptions: {`
`80`		`- label: gettextCatalog.getString('Last name'),`
	`80`	`+ label: gettextCatalog.getString('First name'),`
`81`	`81`	`required: true`
`82`	`82`	`}`
`83`	`83`	`},`