diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
index 7d6cb01327..72b965bd54 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
@@ -18,6 +18,9 @@ export default ['i18n', function(i18n) {
name: 'inventory_script',
basePath: 'inventory_scripts',
stateTree: 'inventoryScripts',
+ // I18N for "CREATE INVENTORY_SCRIPT"
+ // on /#/inventory_scripts/add
+ breadcrumbName: i18n._('INVENTORY SCRIPT'),
showActions: true,
fields: {
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index 5adaa8ebde..a4ad990fa2 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -8,7 +8,7 @@
diff --git a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
index 006b500c62..5781c920ad 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
+++ b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
@@ -8,9 +8,9 @@
+ 'btn-default' : activeFilter != 'user' }" ng-click='filterUser()' class="btn btn-xs" translate>My Jobs
+ 'btn-default' : activeFilter != 'all'}" ng-click='filterAll()' class="btn btn-xs" translate>All Jobs
+
ITEMS
{{dataRange}}
- of {{dataCount()}}
+ of {{dataCount()}}
diff --git a/awx/ui/po/ansible-tower-ui.pot b/awx/ui/po/ansible-tower-ui.pot
index 99c21feda4..71df584d50 100644
--- a/awx/ui/po/ansible-tower-ui.pot
+++ b/awx/ui/po/ansible-tower-ui.pot
@@ -233,6 +233,7 @@ msgstr ""
#: client/src/lists/AllJobs.js:16
#: client/src/portal-mode/portal-mode-jobs.partial.html:7
+#: client/src/portal-mode/portal-mode-layout.partial.html:12
msgid "All Jobs"
msgstr ""
@@ -253,7 +254,7 @@ msgstr ""
msgid "An SCM update does not appear to be running for project: %s. Click the %sRefresh%s button to view the latest status."
msgstr ""
-#: client/src/controllers/Credentials.js:102
+#: client/src/controllers/Credentials.js:105
msgid "Are you sure you want to delete the credential below?"
msgstr ""
@@ -277,7 +278,7 @@ msgstr ""
msgid "Are you sure you want to delete the user below?"
msgstr ""
-#: client/src/controllers/Credentials.js:576
+#: client/src/controllers/Credentials.js:579
#: client/src/controllers/Projects.js:687
msgid "Are you sure you want to remove the %s below from %s?"
msgstr ""
@@ -624,12 +625,12 @@ msgstr ""
msgid "Credentials"
msgstr ""
-#: client/src/controllers/Credentials.js:346
+#: client/src/controllers/Credentials.js:349
msgid "Credentials are only shared within an organization. Assign credentials to an organization to delegate credential permissions. The organization cannot be edited after credentials are assigned."
msgstr ""
-#: client/src/inventory-scripts/inventory-scripts.form.js:50
-#: client/src/inventory-scripts/inventory-scripts.form.js:60
+#: client/src/inventory-scripts/inventory-scripts.form.js:53
+#: client/src/inventory-scripts/inventory-scripts.form.js:63
msgid "Custom Script"
msgstr ""
@@ -637,8 +638,8 @@ msgstr ""
msgid "DASHBOARD"
msgstr ""
-#: client/src/controllers/Credentials.js:104
-#: client/src/controllers/Credentials.js:578
+#: client/src/controllers/Credentials.js:107
+#: client/src/controllers/Credentials.js:581
#: client/src/controllers/Projects.js:689
#: client/src/controllers/Users.js:104
#: client/src/notifications/notification-templates-list/list.controller.js:189
@@ -651,8 +652,8 @@ msgstr ""
msgid "DETAILS"
msgstr ""
-#: client/src/controllers/Credentials.js:101
-#: client/src/controllers/Credentials.js:575
+#: client/src/controllers/Credentials.js:104
+#: client/src/controllers/Credentials.js:578
#: client/src/controllers/Projects.js:201
#: client/src/controllers/Projects.js:686
#: client/src/controllers/Users.js:101
@@ -738,7 +739,7 @@ msgstr ""
#: client/src/forms/Users.js:143
#: client/src/forms/Users.js:168
#: client/src/forms/Workflows.js:41
-#: client/src/inventory-scripts/inventory-scripts.form.js:32
+#: client/src/inventory-scripts/inventory-scripts.form.js:35
#: client/src/inventory-scripts/inventory-scripts.list.js:25
#: client/src/lists/Credentials.js:34
#: client/src/lists/PortalJobTemplates.js:29
@@ -799,7 +800,7 @@ msgstr ""
msgid "Download Output"
msgstr ""
-#: client/src/inventory-scripts/inventory-scripts.form.js:58
+#: client/src/inventory-scripts/inventory-scripts.form.js:61
msgid "Drag and drop your custom inventory script file here or create one in the field to import your custom inventory."
msgstr ""
@@ -1309,6 +1310,10 @@ msgstr ""
msgid "INVENTORIES"
msgstr ""
+#: client/src/inventory-scripts/inventory-scripts.form.js:23
+msgid "INVENTORY SCRIPT"
+msgstr ""
+
#: client/src/helpers/ActivityStream.js:44
#: client/src/inventory-scripts/main.js:66
msgid "INVENTORY SCRIPTS"
@@ -1330,11 +1335,11 @@ msgstr ""
msgid "IRC Server Port"
msgstr ""
-#: client/src/shared/paginate/paginate.partial.html:39
+#: client/src/shared/paginate/paginate.partial.html:43
msgid ""
"ITEMS \n"
"
{{dataRange}}\n"
-"
of {{dataCount()}}"
+"
of {{dataCount()}}"
msgstr ""
#: client/src/login/authenticationServices/timer.factory.js:157
@@ -1694,6 +1699,7 @@ msgid "Module Args"
msgstr ""
#: client/src/portal-mode/portal-mode-jobs.partial.html:4
+#: client/src/portal-mode/portal-mode-layout.partial.html:10
msgid "My Jobs"
msgstr ""
@@ -1738,7 +1744,7 @@ msgstr ""
#: client/src/forms/Users.js:165
#: client/src/forms/Users.js:190
#: client/src/forms/Workflows.js:34
-#: client/src/inventory-scripts/inventory-scripts.form.js:25
+#: client/src/inventory-scripts/inventory-scripts.form.js:28
#: client/src/inventory-scripts/inventory-scripts.list.js:20
#: client/src/lists/AllJobs.js:45
#: client/src/lists/CompletedJobs.js:43
@@ -1979,7 +1985,7 @@ msgstr ""
#: client/src/forms/Users.js:59
#: client/src/forms/Workflows.js:47
#: client/src/forms/Workflows.js:53
-#: client/src/inventory-scripts/inventory-scripts.form.js:37
+#: client/src/inventory-scripts/inventory-scripts.form.js:40
#: client/src/inventory-scripts/inventory-scripts.list.js:30
#: client/src/lists/Inventories.js:52
#: client/src/lists/Teams.js:35
@@ -2206,7 +2212,7 @@ msgstr ""
msgid "Please save before adding users"
msgstr ""
-#: client/src/controllers/Credentials.js:158
+#: client/src/controllers/Credentials.js:161
#: client/src/forms/Inventories.js:138
#: client/src/forms/Inventories.js:91
#: client/src/forms/JobTemplates.js:409
@@ -2397,11 +2403,14 @@ msgstr ""
msgid "RECENTLY RUN JOBS"
msgstr ""
-#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:4
#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:52
msgid "RECENTLY USED JOB TEMPLATES"
msgstr ""
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:4
+msgid "RECENTLY USED TEMPLATES"
+msgstr ""
+
#: client/src/lists/JobEvents.js:89
#: client/src/lists/Projects.js:70
#: client/src/lists/Schedules.js:62
@@ -2512,7 +2521,7 @@ msgstr ""
#: client/src/configuration/auth-form/sub-forms/auth-ldap.form.js:88
#: client/src/configuration/auth-form/sub-forms/auth-radius.form.js:33
#: client/src/configuration/auth-form/sub-forms/auth-saml.form.js:82
-#: client/src/configuration/jobs-form/configuration-jobs.form.js:67
+#: client/src/configuration/jobs-form/configuration-jobs.form.js:63
#: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:25
#: client/src/configuration/system-form/sub-forms/system-logging.form.js:52
#: client/src/configuration/system-form/sub-forms/system-misc.form.js:29
@@ -2723,7 +2732,7 @@ msgstr ""
msgid "Schedules"
msgstr ""
-#: client/src/inventory-scripts/inventory-scripts.form.js:59
+#: client/src/inventory-scripts/inventory-scripts.form.js:62
msgid "Script must begin with a hashbang sequence: i.e.... %s"
msgstr ""
@@ -3083,7 +3092,7 @@ msgstr ""
msgid "The number of parallel or simultaneous processes to use while executing the playbook. 0 signifies the default value from the %sansible configuration file%s."
msgstr ""
-#: client/src/job-results/job-results.controller.js:538
+#: client/src/job-results/job-results.controller.js:479
msgid "The output is too large to display. Please download."
msgstr ""
@@ -3564,10 +3573,6 @@ msgstr ""
msgid "name"
msgstr ""
-#: client/src/shared/paginate/paginate.partial.html:41
-msgid "of {{dataCount()}}"
-msgstr ""
-
#: client/src/access/rbac-multiselect/permissionsTeams.list.js:25
msgid "organization"
msgstr ""