summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-08-23 03:13:05 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-08-23 03:13:05 +0000
commit25329d4f9c1b8bb16131dd2dada45a46b90a95c1 (patch)
tree3461b0122712cc484e0731d283e1b45cd08535f0
parent3f819b20a7f8ee1a6349d61a6c0552bddd41d41a (diff)
downloaddrakx-25329d4f9c1b8bb16131dd2dada45a46b90a95c1.tar
drakx-25329d4f9c1b8bb16131dd2dada45a46b90a95c1.tar.gz
drakx-25329d4f9c1b8bb16131dd2dada45a46b90a95c1.tar.bz2
drakx-25329d4f9c1b8bb16131dd2dada45a46b90a95c1.tar.xz
drakx-25329d4f9c1b8bb16131dd2dada45a46b90a95c1.zip
protocol names, trademark and acronyms should be upcase
-rw-r--r--perl-install/network/adsl.pm10
-rw-r--r--perl-install/network/adsl_consts.pm2
-rw-r--r--perl-install/network/netconnect.pm4
-rw-r--r--perl-install/share/po/DrakX.pot30
-rwxr-xr-xperl-install/standalone/drakTermServ16
-rwxr-xr-xperl-install/standalone/drakbackup2
-rwxr-xr-xperl-install/standalone/drakconnect2
-rwxr-xr-xperl-install/standalone/drakpxe4
-rw-r--r--perl-install/standalone/drakvpn6
9 files changed, 38 insertions, 38 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 197635e5d..00354e186 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -16,9 +16,9 @@ sub get_wizard {
my $netc = $wiz->{var}{netc};
my %l = (
- 'pppoe' => N("use pppoe"),
- 'pptp' => N("use pptp"),
- 'dhcp' => N("use dhcp"),
+ 'pppoe' => N("use PPPoE"),
+ 'pptp' => N("use PPTP"),
+ 'dhcp' => N("use DHCP"),
'speedtouch' => N("Alcatel Speedtouch USB") . if_($netc->{autodetect}{adsl}{speedtouch}, N(" - detected")),
'sagem' => N("Sagem (using PPPOA) USB") . if_($netc->{autodetect}{adsl}{sagem}, N(" - detected")),
'sagem_dhcp' => N("Sagem (using DHCP) USB") . if_($netc->{autodetect}{adsl}{sagem}, N(" - detected")),
@@ -34,8 +34,8 @@ sub get_wizard {
adsl_old => {
name => N("Connect to the Internet") . "\n\n" .
N("The most common way to connect with adsl is pppoe.
-Some connections use pptp, a few use dhcp.
-If you don't know, choose 'use pppoe'"),
+Some connections use PPTP, a few use DHCP.
+If you don't know, choose 'use PPPoE'"),
data => [
{
label => N("ADSL connection type:"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] },
diff --git a/perl-install/network/adsl_consts.pm b/perl-install/network/adsl_consts.pm
index ee81efbf4..f4818eedd 100644
--- a/perl-install/network/adsl_consts.pm
+++ b/perl-install/network/adsl_consts.pm
@@ -22,7 +22,7 @@ our %adsl_data = (
# 5 RFC2364 PPPoA LLC,
# 6 RFC2364 PPPoA VCmux
# dns are provided for when !usepeerdns in peers config file
- # method : pppoa, pppoe or static
+ # method : PPPoA, pppoe or static
# please forward updates to http://forum.eagle-usb.org
# order alphabetically by country (in English) / ISP (local language)
N("Austria") . "|Any" =>
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e3ff84104..8a5fe8ae0 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -754,8 +754,8 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n
},
name => N("Connect to the Internet") . "\n\n" .
N("The most common way to connect with adsl is pppoe.
-Some connections use pptp, a few use dhcp.
-If you don't know, choose 'use pppoe'"),
+Some connections use PPTP, a few use DHCP.
+If you don't know, choose 'use PPPoE'"),
data => [
{ text => N("ADSL connection type:"), val => \$adsl_type, type => "list",
list => [ sort { $adsl_types{$a} cmp $adsl_types{$b} } keys %adsl_types ],
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index a536b4354..7af5a072c 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -7666,17 +7666,17 @@ msgstr ""
#: network/adsl.pm:19
#, c-format
-msgid "use pppoe"
+msgid "use PPPoE"
msgstr ""
#: network/adsl.pm:20
#, c-format
-msgid "use pptp"
+msgid "use PPTP"
msgstr ""
#: network/adsl.pm:21
#, c-format
-msgid "use dhcp"
+msgid "use DHCP"
msgstr ""
#: network/adsl.pm:22
@@ -7708,8 +7708,8 @@ msgstr ""
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
msgstr ""
#: network/adsl.pm:41 network/netconnect.pm:761
@@ -13221,7 +13221,7 @@ msgid ""
"\n"
" This wizard routine will:\n"
" \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
"\t\n"
"After doing these steps, the wizard will:\n"
"\t\n"
@@ -13327,11 +13327,11 @@ msgid ""
" of client-specific configuration files that ClusterNFS provides.\n"
"\t\t\t\n"
" Note: The '#type' entry is only used by drakTermServ. Clients can either be 'thin'\n"
-" or 'fat'. Thin clients run most software on the server via xdmcp, while fat clients run \n"
+" or 'fat'. Thin clients run most software on the server via XDMCP, while fat clients run \n"
" most software on the client machine. A special inittab, %s is\n"
" written for thin clients. System config files xdm-config, kdmrc, and gdm.conf are \n"
-" modified if thin clients are used, to enable xdmcp. Since there are security issues in \n"
-" using xdmcp, hosts.deny and hosts.allow are modified to limit access to the local\n"
+" modified if thin clients are used, to enable XDMCP. Since there are security issues in \n"
+" using XDMCP, hosts.deny and hosts.allow are modified to limit access to the local\n"
" subnet.\n"
"\t\t\t\n"
" Note: The '#hdw_config' entry is also only used by drakTermServ. Clients can either \n"
@@ -13400,7 +13400,7 @@ msgid ""
" \tby mkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up the boot image to \n"
" \teach diskless client.\n"
"\n"
-" \tA typical tftp configuration file looks like:\n"
+" \tA typical TFTP configuration file looks like:\n"
" \t\t\n"
" \tservice tftp\n"
"\t\t\t{\n"
@@ -13899,7 +13899,7 @@ msgstr ""
#: standalone/drakbackup:153
#, c-format
-msgid "Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention."
+msgid "Expect is an extension to the TCL scripting language that allows interactive sessions without user intervention."
msgstr ""
#: standalone/drakbackup:154
@@ -15971,7 +15971,7 @@ msgstr ""
#: standalone/drakconnect:695
#, c-format
-msgid "No Ip"
+msgid "No IP"
msgstr ""
#: standalone/drakconnect:696
@@ -18666,7 +18666,7 @@ msgstr ""
#, c-format
msgid ""
"specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation. address, fqdn,\n"
+"type to use in the phase 1 negotiation. address, FQDN,\n"
"user_fqdn, keyid and asn1dn can be used as an idtype.\n"
"they are used like:\n"
"\tmy_identifier address [address];\n"
@@ -18675,7 +18675,7 @@ msgid ""
"\tmy_identifier user_fqdn string;\n"
"\t\tthe type is a USER_FQDN (user fully-qualified\n"
"\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
"\t\tthe type is a FQDN (fully-qualified domain name).\n"
"\tmy_identifier keyid file;\n"
"\t\tthe type is a KEY_ID.\n"
@@ -18706,7 +18706,7 @@ msgid ""
"phase 1 negotiation. This directive must be defined. \n"
"algorithm is one of following: \n"
"\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
"\n"
"For other transforms, this statement should not be used."
msgstr ""
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 4bb77b562..cc696b0fd 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -322,7 +322,7 @@ sub start_wizard() {
text_view(N("
This wizard routine will:
1) Ask you to select either 'thin' or 'fat' clients.
- 2) Setup dhcp.
+ 2) Setup DHCP.
After doing these steps, the wizard will:
@@ -520,11 +520,11 @@ N(" While you can use a pool of IP addresses, rather than setup a specifi
of client-specific configuration files that ClusterNFS provides.
Note: The '#type' entry is only used by drakTermServ. Clients can either be 'thin'
- or 'fat'. Thin clients run most software on the server via xdmcp, while fat clients run
+ or 'fat'. Thin clients run most software on the server via XDMCP, while fat clients run
most software on the client machine. A special inittab, %s is
written for thin clients. System config files xdm-config, kdmrc, and gdm.conf are
- modified if thin clients are used, to enable xdmcp. Since there are security issues in
- using xdmcp, hosts.deny and hosts.allow are modified to limit access to the local
+ modified if thin clients are used, to enable XDMCP. Since there are security issues in
+ using XDMCP, hosts.deny and hosts.allow are modified to limit access to the local
subnet.
Note: The '#hdw_config' entry is also only used by drakTermServ. Clients can either
@@ -570,7 +570,7 @@ N(" - /etc/xinetd.d/tftp:
by mkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up the boot image to
each diskless client.
- A typical tftp configuration file looks like:
+ A typical TFTP configuration file looks like:
service tftp
{
@@ -1078,7 +1078,7 @@ sub client_X_keyboard() {
sub client_set {
my ($default) = @_;
# we need to change some system files to allow the thin clients
- # to access the server - enabling xdmcp and modify hosts.deny/hosts.allow for some security
+ # to access the server - enabling XDMCP and modify hosts.deny/hosts.allow for some security
# we also need to set runlevel to 5 and restart the display manager
if ($conf{ALLOW_THIN} == 1) {
if (-f "/etc/sysconfig/autologin") {
@@ -1091,10 +1091,10 @@ sub client_set {
substInFile { s/id:3:initdefault:/id:5:initdefault:/ } "/etc/inittab";
substInFile { s/! DisplayManager.requestPort:/DisplayManager.requestPort:/ } "/etc/X11/xdm/xdm-config";
substInFile { s/Enable=false/Enable=true/ } "/usr/share/config/kdm/kdmrc";
- # This file had 2 "Enable=" entries, one for xdmcp and one for debug
+ # This file had 2 "Enable=" entries, one for XDMCP and one for debug
change_gdm_xdmcp("true");
log::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf");
- # just xdmcp in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either
+ # just XDMCP in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either
update_hosts_allow("enable");
if ($default eq "all") {
my $inittab = '/etc/initab$$CLIENT$$';
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index eddb685bd..77bd6af30 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -150,7 +150,7 @@ foreach (@ARGV) {
sub setup_tooltips() {
%help = (
- 'use_expect' => N("Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention."),
+ 'use_expect' => N("Expect is an extension to the TCL scripting language that allows interactive sessions without user intervention."),
'remember_pass' => N("Store the password for this system in drakbackup configuration."),
'erase_cdrw' => N("For a multisession CD, only the first session will erase the cdrw. Otherwise the cdrw is erased before each backup."),
'use_incr_decr' => N("This option will save files that have changed. Exact behavior depends on whether incremental or differential mode is used."),
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index c1488c893..6017a11aa 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -692,7 +692,7 @@ sub get_intf_ip {
my ($ip, $state, $mask);
if (-x "/sbin/ifconfig") {
local $_ = `LC_ALL=C LANGUAGE=C /sbin/ifconfig $interface`;
- $ip = /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No Ip");
+ $ip = /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No IP");
$mask = /Mask:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/mso ? $1 : N("No Mask");
$state = /inet/ ? N("up") : N("down");
} else {
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 1d2ca35ce..5e374faff 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -364,7 +364,7 @@ class "Etherboot" {
match if substring (option vendor-class-identifier, 0, 9) = "Etherboot";
# filename define the file retrieve by the client, there nbgrub
-# our tftp is chrooted so is just the path to the file
+# our TFTP is chrooted so is just the path to the file
filename "/etherboot/nbgrub";
#Used by etherboot to detect a valid pxe dhcp server
@@ -388,7 +388,7 @@ class "PXE" {
match if substring(option vendor-class-identifier, 0, 9) = "PXEClient";
# filename define the file retrieve by the client, there pxelinux.0
-# our tftp is chrooted so is just the path to the file
+# our TFTP is chrooted so is just the path to the file
# If you prefer use grub, use pxegrub compiled for your ethernet card.
#filename "/PXEClient/pxegrub";
filename "/PXEClient/pxelinux.0";
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index 7cabd07c7..08de64e3e 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -1092,7 +1092,7 @@ server.") },
some reason, set this to off. The default is on.") },
{ label => N("My identifier"), val => \$main_remote_section->{8}[1], type => 'entry',
help => N("specifies the identifier sent to the remote host and the
-type to use in the phase 1 negotiation. address, fqdn,
+type to use in the phase 1 negotiation. address, FQDN,
user_fqdn, keyid and asn1dn can be used as an idtype.
they are used like:
my_identifier address [address];
@@ -1101,7 +1101,7 @@ they are used like:
my_identifier user_fqdn string;
the type is a USER_FQDN (user fully-qualified
domain name).
- my_identifier fqdn string;
+ my_identifier FQDN string;
the type is a FQDN (fully-qualified domain name).
my_identifier keyid file;
the type is a KEY_ID.
@@ -1118,7 +1118,7 @@ my_identifier user_fqdn \"myemail\@mydomain.com\"") },
phase 1 negotiation. This directive must be defined.
algorithm is one of following:
-des, 3des, blowfish, cast128 for oakley.
+DES, 3DES, blowfish, cast128 for oakley.
For other transforms, this statement should not be used.") },
{ label => N("Hash algorithm"), val => \$proposal_remote_section->{3}[1], type => 'entry' },