Hello Yedidyah Bar David,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18320
to review the following change.
Change subject: packaging: setup: text changes
......................................................................
packaging: setup: text changes
Change-Id: Ic2a50fdb2e3b2281fafa894b8e95c7902ba24380
Signed-off-by: Yedidyah Bar David <[email protected]>
---
M packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
M packaging/setup/plugins/ovirt-engine-setup/apache/root.py
M packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py
M packaging/setup/plugins/ovirt-engine-setup/config/appmode.py
M packaging/setup/plugins/ovirt-engine-setup/distro-rpm/packages.py
M packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
M packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py
M packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py
M packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
9 files changed, 41 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/18320/1
diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
index 248b001..55d6665 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
@@ -55,7 +55,7 @@
def _waitVDSMHostUp(self, engine_api, host):
self.logger.info(_(
- 'Waiting for VDSM host to become operational.'
+ 'Waiting for VDSM host to become operational. '
'This may take several minutes...'
))
tries = self.VDSM_RETRIES
diff --git a/packaging/setup/plugins/ovirt-engine-setup/apache/root.py
b/packaging/setup/plugins/ovirt-engine-setup/apache/root.py
index dc66e53..9c671eb 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/apache/root.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/apache/root.py
@@ -83,8 +83,8 @@
] is None:
self.dialog.note(
_(
- 'Setup can configure the default welcome page of the '
- 'web server to present ovirt-engine application. '
+ 'Setup can configure the default page of the '
+ 'web server to present the application home page. '
'This may conflict with existing applications.'
)
)
@@ -94,8 +94,8 @@
dialog=self.dialog,
name='OVESETUP_APACHE_CONFIG_ROOT_REDIRECTION',
note=_(
- 'Do you wish to set ovirt-engine as default web server '
- 'page? (@VALUES@) [@DEFAULT@]: '
+ 'Do you wish to set the application as the default page '
+ 'of the web server? (@VALUES@) [@DEFAULT@]: '
),
prompt=True,
default=self.environment[
diff --git a/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py
b/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py
index 2e4cf60..e2070e5 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py
@@ -132,7 +132,7 @@
self.dialog.note(
_(
'Setup can configure apache to use SSL using a '
- 'certificate issued from the internal CA'
+ 'certificate issued from the internal CA.'
)
)
self.environment[
@@ -141,8 +141,8 @@
dialog=self.dialog,
name='OVESETUP_APACHE_CONFIG_SSL',
note=_(
- 'Do you wish to setup to configure or prefer to perform '
- 'that manually? (@VALUES@) [@DEFAULT@]: '
+ 'Do you wish Setup to configure that, or prefer to '
+ 'perform that manually? (@VALUES@) [@DEFAULT@]: '
),
prompt=True,
true=_('Automatic'),
@@ -162,9 +162,9 @@
):
self.logger.warning(
_(
- "Apache SSL automatic configuration was requested, "
- "however, SSL configuration file '{file}' was not "
- "found. Disabling configuration."
+ "Automatic Apache SSL configuration was requested. "
+ "However, SSL configuration file '{file}' was not "
+ "found. Disabling automatic Apache SSL configuration."
)
)
self._enabled = False
@@ -189,8 +189,8 @@
if missingParams:
self.logger.warning(
_(
- 'The expected parameters {missingParams} were not '
- 'found in the {file}. The automatic '
+ 'Expected parameter(s) {missingParams} were not '
+ 'found in {file}. Automatic '
'configuration of this file will not be '
'performed.'
).format(
diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/appmode.py
b/packaging/setup/plugins/ovirt-engine-setup/config/appmode.py
index a12a9a9..37bc3f7 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/appmode.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/appmode.py
@@ -74,7 +74,7 @@
osetupcons.ConfigEnv.APPLICATION_MODE
] = self.dialog.queryString(
name='OVESETUP_CONFIG_APPLICATION_MODE',
- note=_('Data center (@VALUES@) [@DEFAULT@]: '),
+ note=_('Application mode (@VALUES@) [@DEFAULT@]: '),
prompt=True,
validValues=(
'Both',
diff --git a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/packages.py
b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/packages.py
index 71089e2..7944cde 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/packages.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/packages.py
@@ -307,14 +307,14 @@
haveRollback = None
if self.environment[osetupcons.RPMDistroEnv.ENABLE_UPGRADE] is None:
- self.logger.info(_('Checking for product upgrade...'))
+ self.logger.info(_('Checking for product updates...'))
(
upgradeAvailable,
haveRollback,
) = self._checkForProductUpdate()
if not upgradeAvailable:
- self.logger.info(_('No product update'))
+ self.logger.info(_('No product updates found'))
else:
self.environment[
osetupcons.RPMDistroEnv.ENABLE_UPGRADE
@@ -322,8 +322,8 @@
dialog=self.dialog,
name='OVESETUP_RPMDISTRO_PACKAGE_UPGRADE',
note=_(
- 'Setup has found packages to be upgraded, '
- 'do you wish to upgrade them now? '
+ 'Setup has found updates for some packages, '
+ 'do you wish to update them now? '
'(@VALUES@) [@DEFAULT@]: '
),
prompt=True,
@@ -333,20 +333,20 @@
)
if self.environment[osetupcons.RPMDistroEnv.ENABLE_UPGRADE]:
- self.logger.info(_('Checking for setup upgrade...'))
+ self.logger.info(_('Checking for an update for Setup...'))
if self._checkForPackagesUpdate(
packages=(osetupcons.Const.ENGINE_PACKAGE_SETUP_NAME,)
):
self.logger.error(
_(
- 'An upgrade for the setup package was found. '
- 'Please upgrade that package and the execute '
- 'setup again. Package name is {package}.'
+ 'An update for the Setup package "{package}" was '
+ 'found. Please update that package, e.g. by running '
+ '"yum update {package}", and then execute Setup again.'
).format(
package=osetupcons.Const.ENGINE_PACKAGE_SETUP_NAME,
)
)
- raise RuntimeError(_('Please update setup package'))
+ raise RuntimeError(_('Please update the Setup package'))
if upgradeAvailable is None:
(
@@ -355,7 +355,7 @@
) = self._checkForProductUpdate()
if not upgradeAvailable:
- self.dialog.note(text=_('No update is available'))
+ self.dialog.note(text=_('No update for Setup found'))
else:
if not haveRollback:
if self.environment[
@@ -368,9 +368,10 @@
name='OVESETUP_RPMDISTRO_REQUIRE_ROLLBACK',
note=_(
'Setup will not be able to rollback new '
- 'packages in case of a failure because these '
- 'are missing at repository, do you want to '
- 'continue? (@VALUES@) [@DEFAULT@]: '
+ 'packages in case of a failure because '
+ 'installed ones are not available in enabled
repositories. '
+ 'Do you want to continue anyway? '
+ '(@VALUES@) [@DEFAULT@]: '
),
prompt=True,
true=_('Yes'),
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
index cbbc5f8..d347fb3 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
@@ -146,8 +146,8 @@
response = self.dialog.queryString(
name='OVESETUP_CONFIG_FIREWALL_MANAGER',
note=_(
- '{manager} was detected on your computer, '
- 'do you wish setup to configure it? '
+ '{manager} was detected on your computer. '
+ 'Do you wish Setup to configure it? '
'(@VALUES@) [@DEFAULT@]: '
).format(
manager=manager,
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py
b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py
index 5ed1551..8a45e8c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/provisioning/postgres.py
@@ -429,11 +429,10 @@
name='OVESETUP_PROVISIONING_POSTGRES_ENABLED',
note=_(
'Setup can configure the local postgresql server '
- 'automatically for engine to run. This may conflict '
- 'with existing applications.\n'
- '\n'
- 'Would you like the setup to automatically configure '
- 'postgresql or prefer to perform that '
+ 'automatically for the engine to run. This may '
+ 'conflict with existing applications.\n'
+ 'Would you like Setup to automatically configure '
+ 'postgresql, or prefer to perform that '
'manually? (@VALUES@) [@DEFAULT@]: '
),
prompt=True,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py
b/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py
index 6d90347..6478763 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py
@@ -61,9 +61,9 @@
] * 0.95:
self.logger.warn(
_(
- 'Warning: Not enough available memory on the Host, '
- 'the minimum requirement is {minimum}MB, and the '
- 'recommended is {recommended}MB).'
+ 'Warning: Not enough memory is available on the host. '
+ 'Minimum requirement is {minimum}MB, and {recommended}MB '
+ 'is recommended.'
).format(
minimum=self.environment[
osetupcons.SystemEnv.MEMCHECK_MINIMUM_MB
@@ -80,7 +80,7 @@
] * 0.95:
self.logger.warn(
_(
- 'There is less than {recommended}MB available memory'
+ 'Less than {recommended}MB of memory is available'
).format(
recommended=self.environment[
osetupcons.SystemEnv.MEMCHECK_RECOMMENDED_MB
@@ -136,8 +136,8 @@
dialog=self.dialog,
name='OVESETUP_MEMORY_CHECK',
note=_(
- 'Do you want to install with memory less than '
- 'recommended? (@VALUES@) [@DEFAULT@]: '
+ 'Do you want Setup to continue, with amount of memory '
+ 'less than recommended? (@VALUES@) [@DEFAULT@]: '
),
prompt=True,
true=_('Yes'),
diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
index 573d155..1047d01 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
@@ -120,7 +120,7 @@
dialog=self.dialog,
name='NFS_CONFIG_ENABLED',
note=_(
- 'Configure NFS share on this server to be used '
+ 'Configure an NFS share on this server to be used '
'as an ISO Domain? '
'(@VALUES@) [@DEFAULT@]: '
),
--
To view, visit http://gerrit.ovirt.org/18320
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2a50fdb2e3b2281fafa894b8e95c7902ba24380
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Yedidyah Bar David <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
