This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new aa0625e Removed duplicate keys in messages.js (#819)
aa0625e is described below
commit aa0625ecee10768115e2894a26c1697b927e19ef
Author: Jason Golieb <[email protected]>
AuthorDate: Wed Mar 28 20:45:24 2018 -0400
Removed duplicate keys in messages.js (#819)
---
ambari-web/app/messages.js | 58 ++++++----------------------------------------
1 file changed, 7 insertions(+), 51 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 56925c8..2ace68a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -119,12 +119,14 @@ Em.I18n.translations = {
'common.configGroup': 'Config Group',
'common.configs': "Configs",
'common.configuration': "Configuration",
+ 'common.confirm.password': 'Confirm Password',
'common.confirm': 'Confirm',
'common.continueAnyway': 'Continue Anyway',
'common.copy':'Copy',
'common.cores.cpu': 'Cores (CPU)',
'common.cores': 'Cores',
'common.cpu':'CPU',
+ 'common.critical.error': 'Critical',
'common.critical': 'Critical',
'common.csv': 'Save as CSV',
'common.current': 'Current',
@@ -180,6 +182,7 @@ Em.I18n.translations = {
'common.filters': 'Filters',
'common.finalize': "Finalize",
'common.free': 'free',
+ 'common.freeStorage': 'Free Storage',
'common.from.version': 'From Version',
'common.fullLogPopup.clickToCopy': 'Click to Copy',
'common.generate.blueprint':'Generate Blueprint',
@@ -230,18 +233,18 @@ Em.I18n.translations = {
'common.message':'Message',
'common.metrics':'Metrics',
'common.milliseconds': "Milliseconds",
+ 'common.minute.ago': 'less than a minute ago',
'common.minutes': "Minutes",
'common.misc': 'Misc',
'common.more': 'More...',
'common.move':'Move',
'common.mpack': 'Management Pack',
- 'common.freeStorage': 'Free Storage',
- 'common.noHostsFound': 'No Hosts found.',
'common.na': 'n/a',
'common.name':'Name',
'common.new': 'New',
'common.next': 'Next',
'common.noData': 'No Data',
+ 'common.noHostsFound': 'No Hosts found.',
'common.noLink': 'No Links',
'common.notAvailable': 'Not Available',
'common.notes': 'Notes',
@@ -298,6 +301,7 @@ Em.I18n.translations = {
'common.retry':'Retry',
'common.reUpgrade': 'Retry Upgrade',
'common.revert': 'Revert',
+ 'common.review': 'Review',
'common.rollBack':'Rollback',
'common.rolling.downgrade': 'Rolling Downgrade',
'common.rolling': 'Rolling',
@@ -315,41 +319,6 @@ Em.I18n.translations = {
'common.serviceAccounts': 'Service Accounts',
'common.serviceGroups': 'Service Groups',
'common.services': 'Services',
- 'common.password': 'Password',
- 'common.confirm.password': 'Confirm Password',
- 'common.username': 'Username',
- 'common.url': 'URL',
- 'common.advanced': 'Advanced',
- 'common.download': 'Download',
- 'common.current': 'Current',
- 'common.additional': 'Additional',
- 'common.time.start': 'Start Time',
- 'common.time.end': 'End Time',
- 'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/', // TODO,
this hardcoded path needs to be removed.
- 'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
- 'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
- 'common.maintenance.task': ' Toggle Maintenance Mode',
- 'common.installRepo.task': ' Install Packages',
- 'common.used': 'used',
- 'common.free': 'free',
- 'common.type.string': 'string',
- 'common.type.number': 'number',
- 'common.author': 'Author',
- 'common.notes': 'Notes',
- 'common.view': 'View',
- 'common.compare': 'Compare',
- 'common.latest': 'Latest',
- 'common.custom': 'Custom',
- 'common.continueAnyway': 'Continue Anyway',
- 'common.property.undefined': "Undefined",
- 'common.summary': "Summary",
- 'common.configs': "Configs",
- 'common.configuration': "Configuration",
- 'common.unknown': "Unknown",
- 'common.install': "Install",
- 'common.alertDefinition': "Alert Definition",
- 'common.prerequisites': 'Prerequisites',
- 'common.finalize': "Finalize",
'common.severity': "Severity",
'common.show':'Show',
'common.showDetails':'Show Details',
@@ -399,6 +368,7 @@ Em.I18n.translations = {
'common.use': 'Use',
'common.used': 'used',
'common.user': 'User',
+ 'common.username': 'Username',
'common.users': 'Users',
'common.userSettings': 'User Settings',
'common.value': 'Value',
@@ -410,22 +380,8 @@ Em.I18n.translations = {
'common.views': 'Views',
'common.warn.message': '<div class="alert alert-warning">{0}</div>',
'common.warning': 'Warning',
- 'common.start.time': 'Start Time',
- 'common.end.time': 'End Time',
- 'common.rolling': 'Rolling',
- 'common.express': 'Express',
- 'common.hostOrdered': 'Host Ordered',
- 'common.repository': 'Repository',
- 'common.repositoryType': 'Repository Type',
- 'common.rolling.downgrade': 'Rolling Downgrade',
- 'common.express.downgrade': 'Express Downgrade',
- 'common.minute.ago': 'less than a minute ago',
- 'common.views': 'Views',
- 'common.review': 'Review',
- 'common.critical.error': 'Critical',
'common.with': 'with',
'common.zookeeper':'ZooKeeper',
- 'common.critical.error': 'Critical',
'models.alert_instance.tiggered.verbose': "Occurred on {0} <br> Checked on
{1}",
'models.alert_definition.triggered.verbose': "Occurred on {0}",
--
To stop receiving notification emails like this one, please contact
[email protected].
