External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-03 12:28:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 169-v1

Browse Source
This commit is contained in:
Jake McDermott
2018-02-09 11:32:40 -05:00
committed by GitHub
parent e57d200d6e 7c95cd008f
commit e8e6f50573
225 changed files with 5823 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/lib/services/base-string.service.js
View File

@@ -67,6 +67,7 @@ function BaseStringService (namespace) {
this.OFF = t.s('OFF');
this.YAML = t.s('YAML');
this.JSON = t.s('JSON');
this.deleteResource = {
HEADER: t.s('Delete'),
USED_BY: resourceType => t.s('The {{ resourceType }} is currently being used by other resources.', { resourceType }),