Author: jfthomps
Date: Mon Aug 17 16:23:44 2015
New Revision: 1696317
URL: http://svn.apache.org/r1696317
Log:
VCL-833 - Improve consistency and grammar of website
computer.php:
-modified addEditDialogHTML: changed "Reason for maintenance" to "Reason for
Maintenance", "No. Cores" to "cores"
-modified validateResourceData: changed "No. Cores" to "Cores"
image.php:
-modified fieldDisplayName: changed
"Available for checkout" to
"Available for Checkout"
-modified addEditDialogHTML: changed
"Available for checkout" to
"Available for Checkout",
"Check for logged in user" to
"Check for Logged in User",
"Users have administrative access" to
"Users Have Administrative Access",
"Set computer hostname" to
"Set Computer Hostname",
"Use sysprep" to
"Use Sysprep",
"Connect methods" to
"Connect Methods"
-modified validateResourceData: changed
"Available for checkout must be Yes or No" to
"Available for Checkout must be Yes or No",
"Check for logged in user must be Yes or No" to
"Check for Logged in User must be Yes or No",
"Users have administrative access must be Yes or No" to
"Users Have Administrative Access must be Yes or No",
"Set computer hostname must be Yes or No" to
"Set Computer Hostname must be Yes or No",
"Use sysprep must be Yes or No" to
"Use Sysprep must be Yes or No"
managementnode.php:
-modified addEditDialogHTML: changed
'SSH Port for this node' to
'SSH Port for this Node',
'Public NIC configuration method' to
'Public NIC Configuration Method',
'Affiliations using Federated Authentication for Linux Images' to
'Affiliations Using Federated Authentication for Linux Images'
-modified validateResourceData: changed
"Invalid data entered for Affiliations using Federated Authentication for Linux
Images" to
"Invalid data entered for Affiliations Using Federated Authentication for Linux
Images"
siteconfig.php:
-modified reconnecttimeout->__construct: changed
'Re-connect To Reservation Timeout' to
'Reconnect To Reservation Timeout'
vcl.po.template, es_MX/vcl.po, fr_CA/vcl.po, pt_PT/vcl.po:
updated English versions of strings corresponding to those listed above (only
capitalization changes and removal of a dash)
Modified:
vcl/trunk/web/.ht-inc/computer.php
vcl/trunk/web/.ht-inc/image.php
vcl/trunk/web/.ht-inc/managementnode.php
vcl/trunk/web/.ht-inc/siteconfig.php
vcl/trunk/web/locale/po_files/es_MX/vcl.po
vcl/trunk/web/locale/po_files/fr_CA/vcl.po
vcl/trunk/web/locale/po_files/pt_PT/vcl.po
vcl/trunk/web/locale/po_files/vcl.po.template
Modified: vcl/trunk/web/.ht-inc/computer.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/computer.php?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/computer.php (original)
+++ vcl/trunk/web/.ht-inc/computer.php Mon Aug 17 16:23:44 2015
@@ -661,7 +661,7 @@ class Computer extends Resource {
# maintenance notes
$h .= "<div id=\"notesspan\">\n";
- $h .= labeledFormItem('notes', i('Reason for maintenance'),
'textarea');
+ $h .= labeledFormItem('notes', i('Reason for Maintenance'),
'textarea');
$h .= "</div>\n";
# VMhost profile
@@ -692,7 +692,7 @@ class Computer extends Resource {
# cores
$extra = array('smallDelta' => 1, 'largeDelta' => 4);
- $h .= labeledFormItem('cores', i('No. Cores') . '*', 'spinner',
'{min:1,max:255,places:0}', 1);
+ $h .= labeledFormItem('cores', i('Cores') . '*', 'spinner',
'{min:1,max:255,places:0}', 1);
# proc speed
$extra = array('smallDelta' => 100, 'largeDelta' => 1000);
@@ -1987,7 +1987,7 @@ class Computer extends Resource {
# cores
if($return['cores'] < 1 || $return['cores'] > 255) {
$return['error'] = 1;
- $errormsg[] = "Invalid value submitted for No. Cores";
+ $errormsg[] = "Invalid value submitted for Cores";
}
# procspeed
if($return['procspeed'] < 500 || $return['procspeed'] > 10000) {
Modified: vcl/trunk/web/.ht-inc/image.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Mon Aug 17 16:23:44 2015
@@ -134,7 +134,7 @@ class Image extends Resource {
case 'lastupdate':
return i("Last Updated");
case 'forcheckout':
- return i("Available for checkout");
+ return i("Available for Checkout");
case 'maxinitialtime':
return i("Max Initial Time");
case 'checkuser':
@@ -406,23 +406,23 @@ class Image extends Resource {
# for checkout
$yesno = array('1' => 'Yes',
'0' => 'No');
- $h .= labeledFormItem('checkout', i('Available for checkout'),
'select', $yesno);
+ $h .= labeledFormItem('checkout', i('Available for Checkout'),
'select', $yesno);
# check user
- $h .= labeledFormItem('checkuser', i('Check for logged in
user'), 'select', $yesno);
+ $h .= labeledFormItem('checkuser', i('Check for Logged in
User'), 'select', $yesno);
# admin access
- $h .= labeledFormItem('rootaccess', i('Users have
administrative access'), 'select', $yesno);
+ $h .= labeledFormItem('rootaccess', i('Users Have
Administrative Access'), 'select', $yesno);
# set hostname
$h .= "<div id=\"sethostnamediv\">\n";
- $h .= labeledFormItem('sethostname', i('Set computer
hostname'), 'select', $yesno);
+ $h .= labeledFormItem('sethostname', i('Set Computer
Hostname'), 'select', $yesno);
$h .= "</div>\n";
# sysprep
if($add) {
$h .= "<div id=\"sysprepdiv\">\n";
- $h .= labeledFormItem('sysprep', i('Use sysprep'),
'select', $yesno);
+ $h .= labeledFormItem('sysprep', i('Use Sysprep'),
'select', $yesno);
$h .= "</div>\n";
}
# connect methods
- $h .= "<label for=\"connectmethodlist\">" . i("Connect
methods:") . "</label>\n";
+ $h .= "<label for=\"connectmethodlist\">" . i("Connect
Methods:") . "</label>\n";
$h .= "<div class=\"labeledform\"><span
id=\"connectmethodlist\"></span><br>\n";
$h .= "<div dojoType=\"dijit.form.DropDownButton\"
id=\"connectmethoddlg\">\n";
$h .= " <span>" . i("Modify Connection Methods") . "</span>\n";
@@ -1615,24 +1615,24 @@ class Image extends Resource {
}
if($return['checkout'] != 0 && $return['checkout'] != 1) {
$return['error'] = 1;
- $errormsg[] = i("Available for checkout must be Yes or
No");
+ $errormsg[] = i("Available for Checkout must be Yes or
No");
}
if($return['checkuser'] != 0 && $return['checkuser'] != 1) {
$return['error'] = 1;
- $errormsg[] = i("Check for logged in user must be Yes
or No");
+ $errormsg[] = i("Check for Logged in User must be Yes
or No");
}
if($return['rootaccess'] != 0 && $return['rootaccess'] != 1) {
$return['error'] = 1;
- $errormsg[] = i("Users have administrative access must
be Yes or No");
+ $errormsg[] = i("Users Have Administrative Access must
be Yes or No");
}
if($return['sethostname'] != 0 && $return['sethostname'] != 1) {
$return['error'] = 1;
- $errormsg[] = i("Set computer hostname must be Yes or
No");
+ $errormsg[] = i("Set Computer Hostname must be Yes or
No");
}
if($return['mode'] == 'add' && $return['sysprep'] != 0 &&
$return['sysprep'] != 1) {
$return['error'] = 1;
- $errormsg[] = i("Use sysprep must be Yes or No");
+ $errormsg[] = i("Use Sysprep must be Yes or No");
}
if(empty($return['desc'])) {
$return['error'] = 1;
Modified: vcl/trunk/web/.ht-inc/managementnode.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/managementnode.php?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/managementnode.php (original)
+++ vcl/trunk/web/.ht-inc/managementnode.php Mon Aug 17 16:23:44 2015
@@ -351,7 +351,7 @@ class ManagementNode extends Resource {
# sshport
$extra = array('smallDelta' => 1, 'largeDelta' => 2);
- $h .= labeledFormItem('sshport', i('SSH Port for this node'),
'spinner', '{min:1,max:65535,places:0}',
+ $h .= labeledFormItem('sshport', i('SSH Port for this Node'),
'spinner', '{min:1,max:65535,places:0}',
1, '22', '', '', $extra, '',
helpIcon('sshporthelp'));
# image library
@@ -387,7 +387,7 @@ class ManagementNode extends Resource {
$vals = array('dynamicDHCP' => 'Dynamic DHCP',
'manualDHCP' => 'Manual DHCP',
'static' => 'Static');
- $h .= labeledFormItem('publicIPconfig', i('Public NIC
configuration method'), 'select', $vals,
+ $h .= labeledFormItem('publicIPconfig', i('Public NIC
Configuration Method'), 'select', $vals,
'', '', '', '', $extra, '',
helpIcon('ipconfighelp'));
# netmask
@@ -413,7 +413,7 @@ class ManagementNode extends Resource {
'', '', '', '', '',
helpIcon('availnetshelp'));
# federated auth
- $h .= labeledFormItem('federatedauth', i('Affiliations using
Federated Authentication for Linux Images'),
+ $h .= labeledFormItem('federatedauth', i('Affiliations Using
Federated Authentication for Linux Images'),
'textarea', '', 1, '', '', '', '', '',
helpIcon('federatedauthhelp'));
# NAT Host
@@ -935,7 +935,7 @@ class ManagementNode extends Resource {
if(count($test) == count($new))
$errormsg[] = "These affiliations do
not exist: " . implode(', ', $new);
else
- $errormsg[] = "Invalid data entered for
Affiliations using Federated Authentication for Linux Images";
+ $errormsg[] = "Invalid data entered for
Affiliations Using Federated Authentication for Linux Images";
$return['error'] = 1;
}
}
Modified: vcl/trunk/web/.ht-inc/siteconfig.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/siteconfig.php?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/siteconfig.php (original)
+++ vcl/trunk/web/.ht-inc/siteconfig.php Mon Aug 17 16:23:44 2015
@@ -635,7 +635,7 @@ class reconnecttimeout extends TimeVaria
/////////////////////////////////////////////////////////////////////////////
function __construct() {
parent::__construct();
- $this->name = i('Re-connect To Reservation Timeout');
+ $this->name = i('Reconnect To Reservation Timeout');
$this->key = 'reconnecttimeout';
$this->desc = i("After disconnecting from a reservation, users
have this long to reconnect to a reserved node before the reservation is timed
out (in minutes, does not apply to Server Reservations).");
$this->domidbase = 'reconnecttimeout';
Modified: vcl/trunk/web/locale/po_files/es_MX/vcl.po
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/es_MX/vcl.po?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/es_MX/vcl.po (original)
+++ vcl/trunk/web/locale/po_files/es_MX/vcl.po Mon Aug 17 16:23:44 2015
@@ -1559,7 +1559,7 @@ msgid "Administrative access has been di
msgstr ""
#: ../.ht-inc/requests.php
-msgid "You cannot create new images from this image because the owner of the
image has set \"Users have administrative access\" to No under the Advanced
Options of the image."
+msgid "You cannot create new images from this image because the owner of the
image has set \"Users Have Administrative Access\" to No under the Advanced
Options of the image."
msgstr ""
#: ../.ht-inc/userpreferences.php:61
@@ -2119,7 +2119,7 @@ msgid "Last Updated"
msgstr ""
#: ../.ht-inc/image.php:137 ../.ht-inc/image.php:407
-msgid "Available for checkout"
+msgid "Available for Checkout"
msgstr ""
#: ../.ht-inc/image.php:139
@@ -2238,23 +2238,23 @@ msgid "Estimated Reload Time"
msgstr ""
#: ../.ht-inc/image.php:409
-msgid "Check for logged in user"
+msgid "Check for Logged in User"
msgstr ""
#: ../.ht-inc/image.php:411
-msgid "Users have administrative access"
+msgid "Users Have Administrative Access"
msgstr ""
#: ../.ht-inc/image.php
-msgid "Set computer hostname"
+msgid "Set Computer Hostname"
msgstr ""
#: ../.ht-inc/image.php:414
-msgid "Use sysprep"
+msgid "Use Sysprep"
msgstr ""
#: ../.ht-inc/image.php:416
-msgid "Connect methods:"
+msgid "Connect Methods:"
msgstr ""
#: ../.ht-inc/image.php:419 ../.ht-inc/image.php:499
@@ -2434,23 +2434,23 @@ msgid "Submitted ID is not valid"
msgstr ""
#: ../.ht-inc/image.php:1584
-msgid "Available for checkout must be Yes or No"
+msgid "Available for Checkout must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1588
-msgid "Check for logged in user must be Yes or No"
+msgid "Check for Logged in User must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1592
-msgid "Users have administrative access must be Yes or No"
+msgid "Users Have Administrative Access must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php
-msgid "Set computer hostname must be Yes or No"
+msgid "Set Computer Hostname must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1597
-msgid "Use sysprep must be Yes or No"
+msgid "Use Sysprep must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1601
Modified: vcl/trunk/web/locale/po_files/fr_CA/vcl.po
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/fr_CA/vcl.po?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/fr_CA/vcl.po (original)
+++ vcl/trunk/web/locale/po_files/fr_CA/vcl.po Mon Aug 17 16:23:44 2015
@@ -1884,7 +1884,7 @@ msgid "Last Updated"
msgstr "Dernière mise à jour"
#: ../.ht-inc/image.php:137 ../.ht-inc/image.php:407
-msgid "Available for checkout"
+msgid "Available for Checkout"
msgstr "Disponible pour check-out"
#: ../.ht-inc/image.php:139
@@ -1975,19 +1975,19 @@ msgid "Estimated Reload Time"
msgstr "Temps de chargement estimé"
#: ../.ht-inc/image.php:409
-msgid "Check for logged in user"
+msgid "Check for Logged in User"
msgstr "Vérifier l'utilisateur connecter"
#: ../.ht-inc/image.php:411
-msgid "Users have administrative access"
+msgid "Users Have Administrative Access"
msgstr "Les utilisateurs ont les droits administrateur"
#: ../.ht-inc/image.php:414
-msgid "Use sysprep"
+msgid "Use Sysprep"
msgstr "Utiliser sysprep"
#: ../.ht-inc/image.php:416
-msgid "Connect methods:"
+msgid "Connect Methods:"
msgstr "Méthodes de connexion"
#: ../.ht-inc/image.php:419 ../.ht-inc/image.php:499
@@ -2151,19 +2151,19 @@ msgid "Submitted ID is not valid"
msgstr "L'ID soumise est non valide"
#: ../.ht-inc/image.php:1584
-msgid "Available for checkout must be Yes or No"
+msgid "Available for Checkout must be Yes or No"
msgstr "Disponible pour le check-out doit être Oui ou Non"
#: ../.ht-inc/image.php:1588
-msgid "Check for logged in user must be Yes or No"
+msgid "Check for Logged in User must be Yes or No"
msgstr "Vérifier l'utilisateur conncté doit être Oui ou Non"
#: ../.ht-inc/image.php:1592
-msgid "Users have administrative access must be Yes or No"
+msgid "Users Have Administrative Access must be Yes or No"
msgstr "Les utilisateur ont les droits administrateur doit être Oui ou Non"
#: ../.ht-inc/image.php:1597
-msgid "Use sysprep must be Yes or No"
+msgid "Use Sysprep must be Yes or No"
msgstr "Utiliser sysprep doit être Oui ou Non"
#: ../.ht-inc/image.php:1601
Modified: vcl/trunk/web/locale/po_files/pt_PT/vcl.po
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/pt_PT/vcl.po?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/pt_PT/vcl.po (original)
+++ vcl/trunk/web/locale/po_files/pt_PT/vcl.po Mon Aug 17 16:23:44 2015
@@ -2219,7 +2219,7 @@ msgid "Last Updated"
msgstr "Ãltima Atualização"
#: ../.ht-inc/image.php:137 ../.ht-inc/image.php:407
-msgid "Available for checkout"
+msgid "Available for Checkout"
msgstr "DisponÃvel para sair"
#: ../.ht-inc/image.php:139
@@ -2364,23 +2364,23 @@ msgid "Estimated Reload Time"
msgstr "Tempo estimado de Carregamento"
#: ../.ht-inc/image.php:409
-msgid "Check for logged in user"
+msgid "Check for Logged in User"
msgstr "Verifique no site para o utilizador"
#: ../.ht-inc/image.php:411
-msgid "Users have administrative access"
+msgid "Users Have Administrative Access"
msgstr "Utilizadores com acesso administrativo"
#: ../.ht-inc/image.php
-msgid "Set computer hostname"
+msgid "Set Computer Hostname"
msgstr "Colocar nome do computador"
#: ../.ht-inc/image.php:414
-msgid "Use sysprep"
-msgstr "Use sysprep"
+msgid "Use Sysprep"
+msgstr "Use Sysprep"
#: ../.ht-inc/image.php:416
-msgid "Connect methods:"
+msgid "Connect Methods:"
msgstr "Formas de conexão:"
#: ../.ht-inc/image.php:419 ../.ht-inc/image.php:499
@@ -2581,24 +2581,24 @@ msgid "Submitted ID is not valid"
msgstr "ID submetido é inválido"
#: ../.ht-inc/image.php:1584
-msgid "Available for checkout must be Yes or No"
+msgid "Available for Checkout must be Yes or No"
msgstr "DisponÃvel para checkout deve ser Sim ou Não"
#: ../.ht-inc/image.php:1588
-msgid "Check for logged in user must be Yes or No"
+msgid "Check for Logged in User must be Yes or No"
msgstr "Verifique no site para os utilizadores deve ser Sim ou Não"
#: ../.ht-inc/image.php:1592
-msgid "Users have administrative access must be Yes or No"
+msgid "Users Have Administrative Access must be Yes or No"
msgstr "Os utilizadores têm acesso administrativo deve ser Sim ou Não"
#: ../.ht-inc/image.php
-msgid "Set computer hostname must be Yes or No"
+msgid "Set Computer Hostname must be Yes or No"
msgstr "Definir hostname do computador deve ser Sim ou Não"
#: ../.ht-inc/image.php:1597
-msgid "Use sysprep must be Yes or No"
-msgstr "Usar sysprep tem que ser Sim ou Não"
+msgid "Use Sysprep must be Yes or No"
+msgstr "Usar Sysprep tem que ser Sim ou Não"
#: ../.ht-inc/image.php:1601
msgid "You must include a description of the image"
Modified: vcl/trunk/web/locale/po_files/vcl.po.template
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/vcl.po.template?rev=1696317&r1=1696316&r2=1696317&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/vcl.po.template (original)
+++ vcl/trunk/web/locale/po_files/vcl.po.template Mon Aug 17 16:23:44 2015
@@ -1353,7 +1353,7 @@ msgid "Administrative access has been di
msgstr ""
#: ../.ht-inc/requests.php
-msgid "You cannot create new images from this image because the owner of the
image has set \"Users have administrative access\" to No under the Advanced
Options of the image."
+msgid "You cannot create new images from this image because the owner of the
image has set \"Users Have Administrative Access\" to No under the Advanced
Options of the image."
msgstr ""
#: ../.ht-inc/userpreferences.php:61
@@ -1892,7 +1892,7 @@ msgid "Last Updated"
msgstr ""
#: ../.ht-inc/image.php:137 ../.ht-inc/image.php:407
-msgid "Available for checkout"
+msgid "Available for Checkout"
msgstr ""
#: ../.ht-inc/image.php:139
@@ -1987,23 +1987,23 @@ msgid "Estimated Reload Time"
msgstr ""
#: ../.ht-inc/image.php:409
-msgid "Check for logged in user"
+msgid "Check for Logged in User"
msgstr ""
#: ../.ht-inc/image.php:411
-msgid "Users have administrative access"
+msgid "Users Have Administrative Access"
msgstr ""
#: ../.ht-inc/image.php
-msgid "Set computer hostname"
+msgid "Set Computer Hostname"
msgstr ""
#: ../.ht-inc/image.php:414
-msgid "Use sysprep"
+msgid "Use Sysprep"
msgstr ""
#: ../.ht-inc/image.php:416
-msgid "Connect methods:"
+msgid "Connect Methods:"
msgstr ""
#: ../.ht-inc/image.php:419 ../.ht-inc/image.php:499
@@ -2167,23 +2167,23 @@ msgid "Submitted ID is not valid"
msgstr ""
#: ../.ht-inc/image.php:1584
-msgid "Available for checkout must be Yes or No"
+msgid "Available for Checkout must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1588
-msgid "Check for logged in user must be Yes or No"
+msgid "Check for Logged in User must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1592
-msgid "Users have administrative access must be Yes or No"
+msgid "Users Have Administrative Access must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php
-msgid "Set computer hostname must be Yes or No"
+msgid "Set Computer Hostname must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1597
-msgid "Use sysprep must be Yes or No"
+msgid "Use Sysprep must be Yes or No"
msgstr ""
#: ../.ht-inc/image.php:1601
