Author: rhafer
Date: Mon Nov 21 14:13:34 2011
New Revision: 66879
URL: http://svn.opensuse.org/viewcvs/yast?rev=66879&view=rev
Log:
merged texts from proofreading
- Dese und die folgenden Zeilen werden ignoriert --
M src/LdapServer.pm
M src/ldap-server_proposal.ycp
M src/LdapDatabase.ycp
M src/widgets.ycp
M src/complex.ycp
M src/YaPI/LdapServer.pm
M src/helps.ycp
M src/mirrormode-wizard.ycp
M src/tree_structure.ycp
M src/dialogs.ycp
Modified:
trunk/ldap-server/src/LdapDatabase.ycp
trunk/ldap-server/src/LdapServer.pm
trunk/ldap-server/src/YaPI/LdapServer.pm
trunk/ldap-server/src/complex.ycp
trunk/ldap-server/src/dialogs.ycp
trunk/ldap-server/src/helps.ycp
trunk/ldap-server/src/ldap-server_proposal.ycp
trunk/ldap-server/src/mirrormode-wizard.ycp
trunk/ldap-server/src/tree_structure.ycp
trunk/ldap-server/src/widgets.ycp
Modified: trunk/ldap-server/src/LdapDatabase.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapDatabase.ycp (original)
+++ trunk/ldap-server/src/LdapDatabase.ycp Mon Nov 21 14:13:34 2011
@@ -251,7 +251,7 @@
foreach(map db, dblist, {
if ( suffix == db["suffix"]:"" )
{
- Popup::Error( _("A database with that Base DN already exists.") );
+ Popup::Error( _("A database with this Base DN already exists.") );
exists = true;
break;
}
@@ -638,7 +638,7 @@
map whatString2Label = $[
"*" : _("All Entries"),
- "subtree" : _("All Entries in the subtree"),
+ "subtree" : _("All Entries in the Subtree"),
"base" : _("The Entry with the DN")
];
@@ -724,8 +724,8 @@
),
`RadioButtonGroup(`id(`rbg_aclcontrol),
`VBox(
- `Left(`RadioButton(`id( "stop" ), _("Stop Access Control evaluation here (default)"), true )),
- `Left(`RadioButton(`id( "break" ), _("Continue with next Access Control rule (\"break\")") )),
+ `Left(`RadioButton(`id( "stop" ), _("Stop access control evaluation here (default)"), true )),
+ `Left(`RadioButton(`id( "break" ), _("Continue with next access control rule (\"break\")") )),
`Left(`RadioButton(`id( "continue" ), _("Continue evaluation of this rule (\"continue\")") ))
)
),
@@ -771,7 +771,7 @@
res["value"] = UI::QueryWidget( `id( `te_who_dn), `Value );
if ( res["value"]:"" == "" )
{
- Popup::Error(_("Please enter a DN into the Textfield") );
+ Popup::Error(_("Please enter a DN in the textfield") );
continue;
}
else
@@ -868,7 +868,7 @@
),
`VSpacing(0.5),
`Left(
- `CheckBox( `id( `cb_attrs ), `opt( `notify ), _("Apply this rule only to the listed Attribute") )
+ `CheckBox( `id( `cb_attrs ), `opt( `notify ), _("Apply this rule only to the listed attribute") )
),
`HBox(
`Left(
@@ -1019,7 +1019,7 @@
}
else
{
- Popup::Error(_("Please enter a List of valid Attributes into the \"Attributes\" textfield") );
+ Popup::Error(_("Enter a list of valid attributes in the <b>Attributes</b> textfield") );
continue;
}
}
@@ -1032,13 +1032,13 @@
}
else
{
- Popup::Error(_("Please enter valid LDAP Filter into textfield") );
+ Popup::Error(_("Enter valid a LDAP filter in the textfield") );
continue;
}
}
if ( size(accesslist) == 0 )
{
- Popup::Error(_("You must add at least one item to the \"Access Level\" list") );
+ Popup::Error(_("You must add at least one item to the \"Access Level\" list.") );
continue;
}
@@ -1210,8 +1210,9 @@
UI::ChangeWidget( `id(`pb_add), `Enabled, false) ;
UI::ChangeWidget( `id(`pb_del), `Enabled, false) ;
UI::ChangeWidget( `id(`pb_edit), `Enabled, false) ;
- Popup::Error(_("The selected Database contains Access Control Rules that are currently
-not supported by this YaST Module. The Access Control Dialog will be disabled.") );
+ Popup::Error(_("The selected database contains access control rules that are currently
+not supported by YaST. The Access Control Dialog will be disabled.
+") );
}
else
{
@@ -1433,7 +1434,7 @@
`VBox(
`VSpacing(0.5),
`Left(
- `CheckBox( `id( `cb_syncrepl ), `opt(`notify), _("This database is a Replication Consumer"), false )
+ `CheckBox( `id( `cb_syncrepl ), `opt(`notify), _("This database is a Replication Consumer."), false )
),
`VSpacing(0.3),
`VBox( `id( `f_synccons ),
@@ -1719,7 +1720,7 @@
integer secs = (integer)UI::QueryWidget( `if_sync_int_s, `Value );
if(days == 0 && hours == 0 && mins == 0 && secs == 0 )
{
- Popup::Error( _("Invalid Replication Interval specified") );
+ Popup::Error( _("Invalid replication interval specified") );
return false;
}
}
@@ -1748,7 +1749,7 @@
if(!(boolean)SCR::Execute( .ldapserver.remoteBindCheck, testparm ) )
{
map err = SCR::Error(.ldapserver);
- return Popup::ContinueCancelHeadline( _("Checking LDAP connectivity to the provider failed"),
+ return Popup::ContinueCancelHeadline( _("Checking LDAP connectivity to the provider failed."),
_("The test returned the following error messages:")
+ "\n\n\"" +
(string)err["summary"]:"" + "\"\n\"" + (string)err["description"]:""
@@ -1758,7 +1759,7 @@
if(!(boolean)SCR::Execute( .ldapserver.remoteLdapSyncCheck, testparm ) )
{
map err = SCR::Error(.ldapserver);
- return Popup::ContinueCancelHeadline( _("Checking the LDAPsync capabilities of the provider failed"),
+ return Popup::ContinueCancelHeadline( _("Checking the LDAPsync capabilities of the provider failed."),
_("Please verify that the target server is enabled to be a LDAPsync provider")
+ "\n\n" +
_("The test returned the following error messages:")
@@ -1845,7 +1846,7 @@
`HSpacing( `opt(`hstretch))
),
`VSpacing(0.5),
- `Frame( `id( `f_sync_settings ), _("Checkpoint settings"),
+ `Frame( `id( `f_sync_settings ), _("Checkpoint Settings"),
`VBox(
`HBox(
`HSquash(
@@ -1864,11 +1865,11 @@
)
),
`VSpacing(0.5),
- `Frame( `id( `f_sync_slog ), _("Session log"),
+ `Frame( `id( `f_sync_slog ), _("Session Log"),
`VBox(
`Left(
`CheckBox( `id( `cb_sync_slog ), `opt(`notify),
- _("Enable Session log") )
+ _("Enable Session Log") )
),
`Left(
`HSquash(
@@ -1967,7 +1968,7 @@
define symbol DbPpolicy()
{
- string caption = _("Password Policy settings");
+ string caption = _("Password Policy Settings");
term contents = editPolicy;
Wizard::SetContentsButtons(caption, contents, HELPS["ppolicy_edit"]:"",
Label::BackButton(), Label::FinishButton());
@@ -2005,7 +2006,7 @@
define symbol DbSyncRepl()
{
- string caption = _("Replication settings");
+ string caption = _("Replication Settings");
term contents = GetSyncConsWidget();
Wizard::SetContentsButtons(caption, contents, HELPS["synccons_edit"]:"",
Label::BackButton(), Label::NextButton());
Modified: trunk/ldap-server/src/LdapServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapServer.pm (original)
+++ trunk/ldap-server/src/LdapServer.pm Mon Nov 21 14:13:34 2011
@@ -257,7 +257,9 @@
if ( ! SCR->Execute('.ldapserver.init' ) )
{
my $err = SCR->Error(".ldapserver");
- $self->SetError( _("Error while initializing the configuration.\nIs the LDAPI listener enabled?"), $err->{'description'} );
+ $self->SetError( _("Error while initializing configuration.
+Is the LDAPI listener enabled?
+"), $err->{'description'} );
return 0;
}
my $rc = SCR->Read('.ldapserver.databases');
@@ -1010,8 +1012,8 @@
y2milestone("slapd might be running a background task, waiting for completion");
if (! SCR->Execute('.ldapserver.waitForBackgroundTasks') ) {
y2error("Error while waiting for background task.");
- $self->SetError( _("An error happend while waiting for waiting for the OpenLDAP database indexer to finish.\n").
- _("Please restart OpenLDAP manually.") );
+ $self->SetError( _("An error occurred while waiting for the OpenLDAP database indexer to finish.\n").
+ _("Restart OpenLDAP manually.") );
Progress->Finish();
return 0;
}
@@ -1254,7 +1256,7 @@
if ( $dbDefaults{'serviceEnabled'}->value )
{
- $string .= '<h2>'._("Create initial Database with the following Parameters").'</h2>'
+ $string .= '<h2>'._("Create initial database with the following parameters:").'</h2>'
.'<p>'._("Database Suffix: ").'<code>'.$dbDefaults{'suffix'}.'</code></p>'
.'<p>'._("Administrator DN: ").'<code>'.$dbDefaults{'rootdn'}.'</code></p>';
}
@@ -1507,7 +1509,7 @@
{
if ( SCR->Read(".target.size", $tls->{"caCertFile"}) <= 0)
{
- $self->SetError( _("CA Certificate File does not exist"), "");
+ $self->SetError( _("CA Certificate file does not exist."), "");
return 0;
}
if ( SCR->Read(".target.size", $tls->{"certFile"}) <= 0)
@@ -1517,14 +1519,14 @@
}
if ( SCR->Read(".target.size", $tls->{"certKeyFile"}) <= 0)
{
- $self->SetError( _("Certificate Key File does not exist"), "");
+ $self->SetError( _("Certificate key file does not exist."), "");
return 0;
}
if ( SCR->Execute(".target.bash",
"/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}) )
{
- $self->SetError(_("Can not set a filesystem acl on the private key"),
+ $self->SetError(_("Can not set a filesystem ACL on the private key."),
"setfacl -m u:ldap:r ".$tls->{'certKeyFile'}." failed.\n".
"Do you have filesystem acl support disabled?" );
return 0;
@@ -1556,7 +1558,7 @@
my $ret = SCR->Execute(".target.bash",
"/usr/bin/setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem");
if($ret != 0) {
- $self->SetError(_("Can not set a filesystem acl on the private key"),
+ $self->SetError(_("Can not set a filesystem ACL on the private key."),
"setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem failed.\n".
"Do you have filesystem acl support disabled?" );
return 0;
@@ -1832,7 +1834,7 @@
my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP');
$ret = SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$database->{directory});
if ( $ret ) {
- $self->SetError(_("Could adjust ownership of database directory."), "");
+ $self->SetError(_("Could not adjust ownership of database directory."), "");
return $ret;
}
}
@@ -1877,8 +1879,8 @@
my $hostname = $self->ReadHostnameFQ();
if ( $hostname eq "" )
{
- $self->SetError( _("Could not determine own full qualified hostname"),
- _("A master server for replication cannot work correctly without knowing the own full qualified hostname") );
+ $self->SetError( _("Could not determine own fully qualified hostname."),
+ _("A master server for replication cannot work correctly without knowing its own fully qualified hostname.") );
return 0;
}
my $syncrepl = {
@@ -2562,7 +2564,7 @@
if(!defined $attr[0] || !defined $val)
{
y2error("Error while extracting RDN values");
- $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", can't extract RDN values"));
+ $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", cannot extract RDN values"));
return -1;
}
if( (lc($attr[0]) eq "ou") || ( lc($attr[0]) eq "o") || ( lc($attr[0]) eq "l") ||
@@ -2570,7 +2572,7 @@
return 0;
} elsif( lc($attr[0]) eq "c") {
if($val !~ /^\w{2}$/) {
- $self->SetError( _("The value of the \"c\" Attribute must contain a valid ISO-3166 country 2-letter code."), "");
+ $self->SetError( _("The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code."), "");
y2error("The countryName must be an ISO-3166 country 2-letter code.");
return -1;
}
@@ -2594,7 +2596,7 @@
}
elsif ( $suffix_object->hasMultivaluedRDNs() )
{
- $self->SetError( _("Base DN") ." \"". $db->{'suffix'} ."\" ". _("has multivalued RDNs. This is not supported in this YaST Module."), "");
+ $self->SetError( _("Base DN") ." \"". $db->{'suffix'} ."\" ". _("has multivalued RDNs (not supported by YaST)."), "");
return 0;
}
@@ -2609,7 +2611,7 @@
elsif ( $object->hasMultivaluedRDNs() )
{
$self->SetError(_("Root DN"). " \"". $db->{'rootdn'} ."\" ".
- _("has multivalued RDNs. This is not supported in this YaST Module."), "");
+ _("has multivalued RDNs (not supported by YaST)."), "");
return 0;
}
@@ -2643,7 +2645,7 @@
my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP');
$ret = SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$db->{directory});
if ( $ret ) {
- $self->SetError(_("Could adjust ownership of database directory."), "");
+ $self->SetError(_("Could not adjust ownership of database directory."), "");
return 0;
}
}
@@ -3420,7 +3422,7 @@
my $rc = SCR->Execute( '.target.bash_output', $ssl_check_command." \"".$remoteuri."\" ".$tls->{"caCertFile"} );
if ( $rc->{'exit'} != 0 )
{
- $self->SetError( _("Error while trying to verify the Server Certificate of the Provider server.\n").
+ $self->SetError( _("Error while trying to verify the server certificate of the provider server.\n").
_("Please make sure that \"".$tls->{"caCertFile"}."\" contains the correct\nCA file to verify the remote Server Certificate."),
$rc->{'stderr'} );
return 0;
Modified: trunk/ldap-server/src/YaPI/LdapServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/YaPI/LdapServer.pm?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/YaPI/LdapServer.pm (original)
+++ trunk/ldap-server/src/YaPI/LdapServer.pm Mon Nov 21 14:13:34 2011
@@ -495,7 +495,7 @@
my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP');
if ( SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$data->{directory}) )
{
- return $self->SetError( summary => _("Could adjust ownership of database directory."),
+ return $self->SetError( summary => _("Could not adjust ownership of database directory."),
description => "",
code => "DIR_CHOWN_FAILED" );
}
Modified: trunk/ldap-server/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/complex.ycp (original)
+++ trunk/ldap-server/src/complex.ycp Mon Nov 21 14:13:34 2011
@@ -130,10 +130,10 @@
symbol MigrationMainDialog()
{
string caption = "Migrate existing Configuration";
- string summary = _("Your system is currently configured to use the configuration
-file /etc/openldap/slapd.conf. This YaST module only supports the dynamic
-configuration database of OpenLDAP (back-config). Do you want to migrate your
-existing configuration to the configuration database?
+ string summary = _("Your system is currently configured to use the configuration file
+/etc/openldap/slapd.conf. YaST only supports the dynamic configuration
+database of OpenLDAP (back-config). Do you want to migrate your existing
+configuration to the configuration database?
");
term contents =
`VBox(
Modified: trunk/ldap-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Mon Nov 21 14:13:34 2011
@@ -275,7 +275,7 @@
term serverTypeWidget =
`HSquash(
`VBox(
- `Heading( _("Server type") ),
+ `Heading( _("Server Type") ),
`Frame("",
`VBox(
`VSpacing(),
@@ -334,8 +334,10 @@
{
if ( size( LdapServer::ReadHostnameFQ() ) == 0 )
{
- Popup::Notify(_("YaST was not able to determine the full qualified hostname of this\ncomputer. ") +
- _("Setting up a replication master it not possible currently.") );
+ Popup::Notify(_("YaST was not able to determine the fully qualified hostname of this
+computer.
+") +
+ _("Setting up a replication master is currently not possible.") );
UI::ChangeWidget( `rb_master, `Enabled, false );
UI::ChangeWidget( `rbg_servertype, `CurrentButton, `rb_standalone );
continue;
@@ -627,14 +629,14 @@
)
),
`Left(
- `CheckBox( `id( `cb_random_pw ), _("Generate a random password"), true)
+ `CheckBox( `id( `cb_random_pw ), _("Generate a Random Password"), true)
)
)
)
),
`VSpacing(0.3),
`Left(
- `RadioButton( `id( `rb_useconfig ), `opt(`notify), _("Use the \"cn=config\" account for replication") )
+ `RadioButton( `id( `rb_useconfig ), `opt(`notify), _("Use the \"cn=config\" Account for Replication") )
)
)
)
@@ -728,7 +730,7 @@
string verifypw = (string)UI::QueryWidget( `te_valid_pw, `Value );
if ( size(pw) == 0 )
{
- Popup::Error( _("Please enter a password") );
+ Popup::Error( _("Enter a password") );
UI::ChangeWidget( `te_pw, `Value, "" );
UI::ChangeWidget( `te_valid_pw, `Value, "" );
}
@@ -739,7 +741,7 @@
}
else
{
- Popup::Error( _("The passwords you have enter do not match. Please try again") );
+ Popup::Error( _("The passwords you have entered do not match. Try again.") );
UI::ChangeWidget( `te_pw, `Value, "" );
UI::ChangeWidget( `te_valid_pw, `Value, "" );
}
@@ -771,7 +773,7 @@
term widget =
`HSquash(
`VBox(
- `Heading( _("Provider details") ),
+ `Heading( _("Provider Details") ),
`VSpacing(0.3),
`VSpacing(),
`VSquash(
@@ -849,7 +851,7 @@
{
if ( cacert == "" || cacert == nil )
{
- Popup::Error( _("Please select a valid CA Certificate File") );
+ Popup::Error( _("Select a Valid CA Certificate File") );
continue;
}
@@ -884,8 +886,10 @@
if (!(boolean) LdapServer::InitRemoteConnection( testparm ) )
{
map err = LdapServer::ReadError();
- Popup::ErrorDetails( _("Failed to open connection to the \"cn=config\" Database on the Provider Server.\n") +
- _("Please verify that the Provider Server allows remote connections to the \"cn=config\" Database\nand that you entered the correct password"),
+ Popup::ErrorDetails( _("Failed to open connection to the \"cn=config\" database on the provider server.\n") +
+ _("Verify that the provider server allows remote connections to the
+\"cn=config\" database and that you entered the correct password.
+"),
_("The following error messages were returned:") + "\n\n\"" +
(string)err["msg"]:"" + "\"\n\"" +
(string)err["details"]:"" + "\"" );
@@ -894,7 +898,7 @@
if (!(boolean) LdapServer::VerifyTlsSetup( testparm["target"]:$[] ) )
{
map err = LdapServer::ReadError();
- Popup::ErrorDetails( _("Error while verifying the TLS/SSL configuration"),
+ Popup::ErrorDetails( _("An error occurred while verifying the TLS/SSL configuration."),
(string)err["msg"]:"" + "\n" + (string)err["details"]:"" + "\n" );
if (Popup::YesNo( _("Do you want to import a different CA/Server Certificate?") ) )
{
@@ -907,7 +911,7 @@
map syncrepl = srl[0]:$[];
if ( size(syncrepl) == 0 )
{
- if (Popup::ContinueCancel( _("The Replication Configuration on the Provider Server is missing.\n") +
+ if (Popup::ContinueCancel( _("The replication configuration on the provider server is missing.\n") +
_("Click Continue to create it now.") ) )
{
syncrepl = $[
@@ -953,8 +957,10 @@
}
if ( ! setupok )
{
- Popup::Error( _("The Replication Configuration on the master server indicates that\nit is already acting as a Replication Consumer.\n") +
- _("Setting up cascaded replication of the cn=config is not supported currently.") );
+ Popup::Error( _("The replication configuration on the master server indicates that
+it is already acting as a replication consumer.
+") +
+ _("Setting up cascaded replication of the cn=config is currently not supported.") );
ret = `cancel;
break;
}
@@ -971,12 +977,12 @@
if(!(boolean)SCR::Execute( .ldapserver.remoteBindCheck, bindtestparm ) )
{
map err = SCR::Error(.ldapserver);
- if ( Popup::ContinueCancel( _("Checking the Authentication credentials defined in the Replication Configuration on the Provider Server failed.\n") +
+ if ( Popup::ContinueCancel( _("Checking the authentication credentials defined in the replication configuration on the provider server failed.\n") +
_("The test returned the following error messages:")
+ "\n\n\"" +
(string)err["summary"]:"" + "\"\n\"" + (string)err["description"]:""
+ "\"\n\n" +
- _("Click Continue to correct that now.") ) )
+ _("Click \"Continue\" to correct this now.") ) )
{
syncrepl = SyncreplAccountConfig( syncrepl );
if ( syncrepl["binddn"]:"" == "cn=config" )
@@ -1078,8 +1084,13 @@
`VBox(
`Heading( _("Replication Master setup") ),
`VSpacing( 0.5 ),
- `Label( _("In order to act as a Master Server for Replication, the Configuration database needs\nto be remotely accessible. Please set a password for the Configuration database." ) +
- _("\n(Remote access to the Configuration database will be restricted to encrypted\nLDAP Connections)")
+ `Label( _("To act as a master server for replication, the configuration database needs
+to be remotely accessible. Set a password for the configuration database.
+") +
+ _("
+(Remote access to the Configuration database will be restricted to encrypted
+LDAP Connections.)
+")
),
`VSpacing( 0.5 ),
`Password( `id( `te_rootpw ), `opt( `hstretch ), _("Enter new &Password") ),
@@ -1107,13 +1118,13 @@
string verifypw = (string)UI::QueryWidget( `te_valid_rootpw, `Value );
if ( size(pw) == 0 )
{
- Popup::Error( _("Please enter a password") );
+ Popup::Error( _("Enter a password") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
}
else if ( pw != verifypw )
{
- Popup::Error( _("The passwords you have enter do not match. Please try again") );
+ Popup::Error( _("The passwords you have entered do not match. Try again.") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
pw = "";
Modified: trunk/ldap-server/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/helps.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/helps.ycp (original)
+++ trunk/ldap-server/src/helps.ycp Mon Nov 21 14:13:34 2011
@@ -21,30 +21,33 @@
_("<h4>Start LDAP Server</h4>") +
_("<p>Select <b>Yes</b> if the LDAP server should be started automatically as
part of the boot process. Select <b>No</b> if the LDAP server should not be started. Note:
-After selecting <b>No</b> you will not be able to make any changes to the OpenLDAP
-configuration.</p>") +
+After selecting <b>No</b>, you cannot change the OpenLDAP configuration.</p>
+") +
_("<h4>Protocol Listeners</h4>") +
- _("<p>Here you can enable and disable the various protocol listeners of OpenLDAP</p>") +
+ _("<p>Enable and disable the various protocol listeners of OpenLDAP.</p>") +
_("<p><b>LDAP</b> is the standard LDAP interface on Port 389. TLS/SSL secured communication
is possible with the StartTLS operation when you have a server certificate configured.</p>") +
_("<p><b>LDAPS</b> enables the \"LDAP over SSL (ldaps)\" interface for SSL protected
-connections on port 636. You need to have a Server Certificate configured to make this working
-correctly. (See \"Global Settings\"/\"TLS Settings\" for that)") +
- _("<p><b>LDAPI</b> enables the \"LDAP over IPC\" interface. By this you can access the
-LDAP Server through a Unix Domain Socket. You should not disable the LDAPI interface as this YaST
-Module uses it to communicate with the server.</p>") +
+connections on port 636. This only works if you have a server certificate configured (see \"Global Settings\"/\"TLS Settings\").
+") +
+ _("<p><b>LDAPI</b> enables the \"LDAP over IPC\" interface for accessing the
+LDAP server via a Unix Domain Socket. Do not disable the LDAPI interface
+as YaST uses it to communicate with the server.</p>
+") +
_("<h4>Firewall Settings</h4>") +
- _("<p>Here you can select whether SuSEFirewall should allow access on the LDAP related
-network ports or not.</p>"),
+ _("<p>Select whether SuSEFirewall should allow access on the LDAP-related
+network ports or not.</p>
+"),
/* First part of the Add Database Widget */
"database_basic" :
_("<h3>Basic Database Settings</h3>") +
- _("<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a
-variant of the <b>bdb</b> backend that uses a hierarchical database layout and
-supports subtree renames. It is otherwise identical to <b>bdb</b>. A <b>hdb</b>-Database
-needs a larger <b>idlcachesize</b> for good search performance than a <b>bdb</b>-Database.
-</p>")+
+ _("<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a
+variant of the <b>bdb</b> backend that uses a hierarchical database layout and
+supports subtree renames. Otherwise it is identical to <b>bdb</b>. A
+<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a
+<b>bdb</b>-Database for a good search performance.</p>
+")+
_("<p>The <b>Base DN</b> option specifies the name of the root entry
of the database being created.</p>") +
_("<p>The <b>Administrator DN</b> along with a <b>LDAP Administrator Password</b>
@@ -56,40 +59,49 @@
_("<p>If this wizard was started during installation, the
<b>LDAP Administrator Password</b> is initially set to the system's root password
entered earlier in the installation process.</p> ") +
- _("<p>To use this database as the default database for the OpenLDAP client tools
-(e.g. ldapsearch) check <b>Use this database as the default for OpenLDAP clients</b>. This
-will result in the hostname \"localhost\" and the above entered <b>Base DN</b> being written
-to the OpenLDAP client configuration file <tt>/etc/openldap/ldap.conf</tt>. This checkbox
-is selected by default when creating the first database on a Server.</p>"),
+ _("<p>To use this database as default for the OpenLDAP client tools
+(e.g. ldapsearch), check <b>Use this database as the default for OpenLDAP
+clients</b>. This will result in the hostname \"localhost\" and the above
+entered <b>Base DN</b> being written to the OpenLDAP client configuration
+file <tt>/etc/openldap/ldap.conf</tt>. This checkbox is selected by default
+when creating the first database on a server.</p>
+"),
"database_detail_unsupported" :
- _("This database is currently not supported by the YaST Module, you can not
-change any configuration settings here.") ,
+ _("YaST currently does not support this database. You can not
+change any configuration settings here.
+") ,
"database_detail_config" :
_("<p>To enable or disable plaintext authentication (LDAP Simple Bind)
-for the configuration database click the associated checkbox. Plaintext authentication
-to the configuration database will only be allowed when using sufficiently protected
-(e.g. SSL/TLS encrypted) connections.</p>")+
- _("<p>To change the Administration password for the configuration database, click <b>Change Password</b>.
-A Popup will open where you can enter the new password and select the <b>Password Encryption</b>.
-The password fields are initially empty, even if a password is already set in the configuration.</p>"),
+for the configuration database, click the associated checkbox. Plaintext
+authentication to the configuration database will only be allowed when
+using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>
+")+
+ _("<p>To change the administration password for the configuration database,
+click <b>Change Password</b>.
+A Popup will prompt you to enter the new password and select the
+<b>Password Encryption</b>.
+The password fields are initially empty even if a password has already been
+set in the configuration.</p>
+"),
"database_detail" :
_("<h3>Edit BDB Database</h3>") +
- _("<p>Here you can change some basic settings of BDB and HDB Databases.</p>") +
+ _("<p>Change basic settings of BDB and HDB Databases.</p>") +
_("<p>Enter the complete DN or only the first part and append the base DN automatically
with <b>Append Base DN</b>.</p>")+
- _("<p>To change the password for the Administrator account, click <b>Change Password</b>.
-A Popup will open where you can enter the new password and select the <b>Password Encryption</b>.
-The password fields are initially empty, even if a password is already set in the configuration.</p>") +
+ _("<p>To change the password for the administrator account, click <b>Change Password</b>.
+A Popup will prompt you to enter the new password and select the <b>Password Encryption</b>.
+The password fields are initially empty even if a password has already been set in the configuration.</p>
+") +
_("<p>With the <b>Entry Cache</b> and <b>Index Cache (IDL cache)</b> you can adjust
the sizes of OpenLDAP's internal caches. The <b>Entry Cache</b> defines the number of entries
that are kept in OpenLDAP's in-memory entry cache. If it is possible (enough RAM) this number
should be large enough to keep the whole database in memory. The <b>Index Cache (IDL cache)</b>
is used to speed up searches on indexed attributes. In general especially HDB-Databases require a
large IDL cache for good search performance (three times the size of the entry cache as a rule of
-thumbs).</p>" ),
+thumbs).</p>"),
"ppolicy_edit" :
_("<h3>Password Policy Settings</h3>") +
@@ -100,61 +112,80 @@
in the database. Note that this violates the X.500/LDAP information model, but may be
needed to compensate for LDAP clients that do not use the password modify extended operation
to manage passwords.</p> ") +
- _("<p>If <b>Disclose \"Account Locked\" Status</b> is enabled, users trying to authenticate
-to a locked account get a notification that their account is locked. This notification
-might provide useful information to an attacker. Sites that are sensitive to security issues
-should not enable this option.</p> ") +
+ _("<p>If <b>Disclose \"Account Locked\" Status</b> is enabled, users trying to
+authenticate to a locked account are notified that their account is
+locked. This notification might provide useful information to an
+attacker. Sites sensitive to security issues should not enable this
+option.</p>
+") +
_("<p>Enter the name of the default policy object in <b>Default Policy Object DN</b>.</p>") +
- _("<p>You create or change the default policy by clicking <b>Edit Policy</b>. You might be
-ask to enter the LDAP Administrator password after that, to allow the Policy Object being read
-from the server.</p>"),
+ _("<p>Create or change the default policy by clicking <b>Edit Policy</b>. You may
+be asked to enter the LDAP administrator password afterwards to allow the
+Policy Object being read from the server.</p>
+"),
"index_edit" :
_("<h3>Index Configuration</h3>") +
- _("<p>This dialog allows you to change the indexing options of a hdb of bdb-Database.</p>") +
- _("<p>The table displays a list of attribute which have an index defined currently.</p>") +
- _("<p>Indexes are used by OpenLDAP to improve search performance on specific type of
-searches. Indexes should be configured corresponding to the most common searches that are used
-on a database. This YaST module allows to setup three different types indexes.</p>") +
- _("<p><b>Presence</b>: This index is used for searches using presence filters
-(i.e. <tt>(attributeType=*)</tt> ). Presence indexes should only be configured for attributes
-that occur very rarely in the database</p>")+
- _("<p><b>Equality</b>: This index is used for searches using equality filters (i.e.
-(<tt>(attributeType=<exact values>)</tt>). An <b>Equality</b> index should always be configured of the
-<tt>objectclass</tt> attribute.</p>")+
- _("<p><b>Substring</b>: This index is used for searches using substring filter
-(i.e. <tt>(attributeType=<substring>*)</tt> )</p>")+
- _("<p>Use <b>Add</b> to define indexing options for a new attribute, <b>Delete</b> to
-delete an existing index and <b>Edit</b> to change the indexing options of an already indexed
-Attribute.</p>") +
+ _("<p>Change the indexing options of a hdb of bdb-Database.</p>") +
+ _("<p>The table displays a list of attributes which currently have an index defined.</p>") +
+ _("<p>Indexes are used by OpenLDAP to improve search performance on specific
+types of searches. Indexes should be configured corresponding to the most
+common searches on a database. YaST allows you to setup three different types
+of indexes.</p>
+") +
+ _("<p><b>Presence</b>: This index is used for searches with presence filters
+(i.e. <tt>(attributeType=*)</tt>). Presence indexes should only be configured
+for attributes that occur rarely in the database.</p>
+")+
+ _("<p><b>Equality</b>: This index is used for searches with equality filters
+(i.e.(<tt>(attributeType=<exact values>)</tt>). An <b>Equality</b> index
+should always be configured with the <tt>objectclass</tt> attribute.</p>
+")+
+ _("<p><b>Substring</b>: This index is used for searches with substring filters
+(i.e. <tt>(attributeType=<substring>*)</tt>)</p>
+")+
+ _("<p>Use <b>Add</b> to define indexing options for a new attribute,
+<b>Delete</b> to delete an existing index and <b>Edit</b> to change the
+indexing options of an already indexed attribute.</p>
+") +
_("<p>Note: Depending on the database size it can take a while until newly added
-indexes, will get active on a database. After the configuration has been written to the server.
-a background task will start to generate the indexing information for the database.</p>"),
+indexes will get active on a database. After the configuration has been
+written to the server, a background task will start to generate the indexing
+information for the database.</p>
+"),
"acl_edit" :
_("<h3>Access Control Configuration</h3>") +
- _("<p>The table gives you the overview of all Access Control Rules, that are currently
-configured for the selected database</p>") +
- _("<p>For each rule you can see which target objects that rule matches. To see a more detailed
-view of a rule or to change a rule, select a rule in the table and click <b>Edit</b></p>") +
- _("<p>Use <b>Add</b> to create new Access Control Rules and <b>Delete</b> to delete an
-Access Control Rule</p>") +
- _("<p>As OpenLDAP's access control evaluation stop at the first rule whose target definition
-(DN, filter and Attributes) matches the entry being access. You might need to order the rules according
-to your needs. You can use the <b>Up</b> and <b>Down</b> buttons for that</p>"),
+ _("<p>This table gives you an overview of all Access Control rules that are
+currently configured for the selected database</p>
+") +
+ _("<p>For each rule, you can see which target objects it matches. To see a more
+detailed view of a rule or to change one, select the rule in the table and
+click <b>Edit</b>.</p>
+") +
+ _("<p>Use <b>Add</b> to create new access control rules and <b>Delete</b> to
+delete an access control rule.</p>
+") +
+ _("<p>OpenLDAP's access control evaluation stops at the first rule whose target
+definition (DN, filter and attributes) matches the entry being
+accessed. Therefore you should order the rules according to your needs, using
+the <b>Up</b> and <b>Down</b> buttons.</p>
+"),
"syncprov_edit" :
_("<h3>Replication Provider Settings</h3>") +
_("<p>Select the \"<b>Enable ldapsync provider for this database</b>\" checkbox, if you want to
be able to replicate the currently selected database to another server.</p>") +
_("<h4>Checkpoint Settings</h4>") +
- _("<p>Here you can specify how often the synchronization state indicator (stored in the
-\"<i>contextCSN</i>\"-Attribute) is written to the database. It is synced out to the database if
-\"<i>Operations</i>\" write operations or more than \"<i>Minutes</i>\" have passed since the
-last time the indicator was written. By default (both values are '0') the state indicator is only
-written after a clean shutdown. Writing it more often can result in faster startup times after an
-unclean shutdown but might result in a small performance hit in environments with many LDAP Write
-Operations.</p>")+
+ _("<p>Here you can specify how often the synchronization state indicator (stored
+in the \"<i>contextCSN</i>\"-Attribute) is written to the database. It is synced
+to the database after the number of write \"<i>Operations</i>\" you specify or
+after more than the specified \"<i>Minutes</i>\" have passed since the indicator
+has last been written. By default (both values are '0') the state indicator is
+only written after a clean shutdown. Writing it more often can result in
+a faster startup time after an unclean shutdown but might result in a small
+performance hit in environments with many LDAP write operations.</p>
+")+
_("<h4>Session log</h4>") +
_("<p>Configures an in-memory session log for recording information about write operations
made on the database. Specify how many write operation should be recorded in the session log.
@@ -163,65 +194,81 @@
"synccons_edit" :
_("<h3>Replication Consumer Settings</h3>") +
- _("<p>Select the \"<b>This database is a Replication Consumer</b>\" if you want the database to be a replica
-of a database on another server.</p>") +
+ _("<p>Select \"<b>This database is a Replication Consumer</b>\" if you want the
+database to be a replica of a database on another server.</p>
+") +
_("<h4>Provider</h4>") +
- _("Enter the connection details for the replication connection to the master server here. For that, select the
-protocol to use (<b>ldap</b> or <b>ldaps</b>) and enter the fully qualified hostname of the master server here. It is
-important to use the fully qualified hostname here to be able to verify the master server's TLS/SSL certificate. Adjust
-the port number if the master server is using non-standard ldap ports.") +
+ _("Enter the connection details for the replication connection to the master
+server here. Select the protocol to use (<b>ldap</b> or <b>ldaps</b>) and
+enter the fully qualified hostname of the master server. It is important to
+use the fully qualified hostname to verify the master server's TLS/SSL
+certificate. Adjust the port number if the master server is using non-standard
+ldap ports.
+") +
_("<h4>Replication Type</h4>") +
_("<p>OpenLDAP supports different modes of replication:</p>") +
- _("<p><b>refreshOnly</b>: The slave server will periodically open a new connection, trigger a
-synchronization and close the connection again. The interval how often this synchronization happens can be configured
-through the <b>Replication Interval</b> settings.</p>") +
- _("<p><b>refreshAndPersist</b>: The slave server will open a persistent connection to the master server for
-synchronization. Updated entries on the master server are immediately sent to the slave through that connection.</p>") +
+ _("<p><b>refreshOnly</b>: The slave server will periodically open a new
+connection, trigger a synchronization and close the connection again. The
+interval how often this synchronization happens can be configured via the
+<b>Replication Interval</b> setting.</p>
+") +
+ _("<p><b>refreshAndPersist</b>: The slave server will open a persistent
+connection to the master server for synchronization. Updated entries on the
+master server are immediately sent to the slave via this connection.</p>
+") +
_("<h4>Authentication</h4>") +
- _("<p>Specify a DN and password here that the slave server should use to authenticate against the master.
-The specified DN needs to have read access to all entries in the replicated database on the master.</p>") +
+ _("<p>Specify a DN and password which the slave server should use to authenticate against the master.
+The specified DN needs to have read access to all entries in the replicated database on the master.</p>
+") +
_("<h4>Update Referral</h4>") +
- _("<p>As the slave database is readonly. The slave server will answer write operations with an LDAP referral.
-This referral by default points the client to the master server. You can configure a different update referral here.
-This is e.g. useful in a cascaded replication setup i.e. when the provider for the slave server is as slave server
-itself. </p>"),
+ _("<p>As the slave database is readonly, the slave server will answer write
+operations with an LDAP referral.
+By default, this referral points the client to the master server. You can configure a different update referral here.
+This is e.g. useful in a cascaded replication setup where the provider for the
+slave server is as slave server too. </p>
+"),
/* Read dialog help */
"read" :
- _("<p><b><big>Initializing LDAP Server Configuration</big></b><br>Please wait...<br></p>") +
+ _("<p><b><big>Initializing LDAP Server Configuration</big></b></p>") +
_("<p><b><big>Aborting Initialization:</big></b><br>
Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"),
/* Write dialog help */
"write" :
- _("<p><b><big>Saving LDAP Server Configuration</big></b><br>
-Please wait...<br></p> ") +
+ _("<p><b><big>Saving LDAP Server Configuration</big></b></p>
+") +
_("<p><b><big>Aborting Saving:</big></b><br>
-Abort the save procedure by pressing <b>Abort</b>. An additional dialog informs whether it
-is safe to do so. </p> "),
+Abort the save procedure by pressing <b>Abort</b>. An additional dialog
+informs you whether it is safe to do so.</p>
+"),
/* Summary dialog help 1/3 */
"summary" :
_("<h3>LDAP Server Configuration Summary</h3>") +
- _("<p>This dialog just gives a short summary about the configuration you just
-created. Click <b>Finish</b> to write that configuration and leave the LDAP
-Server module</p>"),
+ _("<p>This dialog provides a short summary about the configuration you have
+created. Click <b>Finish</b> to write the configuration and leave the LDAP
+Server module.</p>
+"),
/* Configuration Wizard Step 1 */
"service_dialog" :
_("<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> ") +
- _("<p>If <b>Yes</b> is selected, you can click <b>Next</b> to start the configuration wizard</p>")+
- _("<p>If the Firewall is enabled you can open the required network ports
-for OpenLDAP by checking the corresponding Checkbox.</p>"),
+ _("<p>If you select <b>Yes</b>, click <b>Next</b> to start the configuration wizard.</p>")+
+ _("<p>If the Firewall is enabled, open the required network ports
+for OpenLDAP by checking the corresponding checkbox.</p>
+"),
/* Configuration Wizard Step 2 */
"server_type" :
- _("<p>Select the type of LDAP Server you want to setup. The following scenarios are available:</p>") +
- _("<p><b>Stand-alone server</b>: Setup a single standalone OpenLDAP Server with no preparations for
-replication</p>") +
- _("<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup that is prepared to act as a master server
-(provider) in a replication setup.</p>") +
+ _("<p>Select the type of LDAP server you want to setup. The following scenarios are available:</p>") +
+ _("<p><b>Stand-alone server</b>: Setup a single stand-alone OpenLDAP server with
+no preparations for replication.</p>
+") +
+ _("<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup
+prepared to act as a master server (provider) in a replication setup.</p>
+") +
_("<p><b>Replica slave server</b>: Setup an OpenLDAP slave server that replicates all its data,
including configuration, from a master server.</p>"),
@@ -230,20 +277,28 @@
_("<h3>TLS Settings</h3>") +
_("<h4>Basic Settings</h4>") +
- _("<p>To enable encryption via TLS/SSL check the <b>Enabled TLS</b> checkbox. Additionally you
-need to configure a Certificate the Server should use.</p>") +
- _("<p>By checking <b>Enable LDAP over SSL (ldaps) interface</b> you enable the server to
-accept LDAPS connections on port 636. If not checked OpenLDAP will only support TLS encrypted connections
-through the StartTLS extended operation</p>") +
- _("<p>If you already have a Common Server Certificate installed using the corresponding YaST Module,
-you can check <b>Use common Server Certificate</b> to have the OpenLDAP server use that certificate</p>") +
+ _("<p>To enable encryption via TLS/SSL, check the <b>Enabled TLS</b>
+checkbox. Additionally you need to configure a certificate for the Server
+to use.</p>
+") +
+ _("<p>Check <b>Enable LDAP over SSL (ldaps) interface</b>, to enable the server
+to accept LDAPS connections on port 636. If not checked, OpenLDAP will only
+support TLS encrypted connections through the StartTLS extended operation.</p>
+") +
+ _("<p>If you already have a common server certificate installed using the
+corresponding YaST Module, check <b>Use common Server Certificate</b> so that
+the OpenLDAP server uses this certificate.</p>
+") +
_("<h4>Import Certificate</h4>") +
- _("<p>If you have no Common Server Certificate or you want OpenLDAP to use a different certificate
-you can enter the file names of the <b>CA Certificate File</b>, <b>Certificate File</b> and
-<b>Certificate Key File</b> into the corresponding textfields</p>") +
- _("<p>To create a new CA or certificate you can launch the CA-Management Module by clicking
-<b>Launch CA Management Module</b></p>"),
+ _("<p>If you have no common server certificate or you want OpenLDAP to use a
+different certificate, enter the file names of the <b>CA Certificate File</b>,
+<b>Certificate File</b> and <b>Certificate Key File</b> into the corresponding
+textfields.</p>
+") +
+ _("<p>To create a new CA or certificate, launch the CA management module by
+clicking <b>Launch CA Management Module</b>.</p>
+"),
/* Tree Item Dialog "global" 1/1 */
"global" : _("<p>Below this item, configure some global parameters.</p>"),
@@ -256,51 +311,61 @@
/* Tree Item Dialog "loglevel" */
"g_loglevel" :
- _("<p>Please select the subsystems that should log debugging statements and statistics to syslog.</p>"),
+ _("<p>Select the subsystems that should log debugging statements and statistics\nto syslog.</p>"),
/* Tree Item Dialog "allow" 1/1 */
"g_allow" :
_("<p>Select which special features the OpenLDAP Server should allow or disallow:</p>") +
_("<h3>Select Allow Flags</h3>") +
- _("<p><b>LDAPv2 Bind Requests</b>: To let the server accept LDAPv2 bind requests. Note
-that OpenLDAP does not truly implement LDAPv2</p>") +
+ _("<p><b>LDAPv2 Bind Requests</b>: To let the server accept LDAPv2 bind requests.
+Note that OpenLDAP does not truly implement LDAPv2.</p>
+") +
_("<p><b>Anonymous Bind when credentials not empty</b>: To allow anonymous bind when
credentials are not empty (i.e. password is present but bind DN is not present) </p>") +
_("<p><b>Unauthenticated Bind when DN not empty</b>: To allow unauthenticated
(anonymous) binds when DN is not empty</p>") +
_("<p><b>Unauthenticated Update Operations to process</b>: To allow unauthenticated
-(anonymous) update operations to be processed (they are still subject to access controls and
-other administrative limits)</p>") +
+(anonymous) update operations to be processed. They are still subject to
+access controls and other administrative limits.</p>
+") +
_("<h3>Select Disallow Flags</h3>") +
- _("<p><b>Disable acceptance of anonymous Bind Requests</b>: By selecting this the Server will
-no longer accept anonymous bind request. Note, that this does not generally prohibit anonymous
-directory access</p>") +
- _("<p><b>Disable Simple Bind authentication</b>: Complete disable Simple Bind
-authentication</p>") +
- _("<p><b>Disable forcing session to anonymous status upon StartTLS operation receipt</b>:
-After selecting this the server will no longer force an authenticated connection back to the
-anonymous state when receiving the StartTLS operation.</p>") +
+ _("<p><b>Disable acceptance of anonymous Bind Requests</b>: The Server will
+not accept anonymous bind requests. Note that this does not generally
+prohibit anonymous directory access.</p>
+") +
+ _("<p><b>Disable Simple Bind authentication</b>: Completely disable Simple Bind
+authentication</p>
+") +
+ _("<p><b>Disable forcing session to anonymous status upon StartTLS operation
+receipt</b>: The server will no longer force an authenticated connection back
+to the anonymous state when receiving the StartTLS operation.</p>
+") +
_("<p><b>Disallow the StartTLS operation if authenticated</b>:
-By selected this, the server will disallow the StartTLS operation on already authenticated
-connections.</p>") ,
+The server will not allow the StartTLS operation on already authenticated
+connections.</p>
+") ,
/* Tree Item Dialog "databases" */
"databases" :
- _("<p>You can see a list of configured databases. The Databases with the type \"frontend\"
-and \"config\" represent special internal Databases. The \"Frontend\" database is use to configure
-global Access Control restrictions and Overlays that apply to all databases. The \"Config\"
-Database holds the configuration of the LDAP Server itself.</p>") +
+ _("<p>This lists shows all configured databases. The databases with the type
+\"frontend\" and \"config\" represent special internal databases. The \"Frontend\"
+database is use to configure global access control restrictions and overlays
+that apply to all databases. The \"Config\" database holds the configuration of
+the LDAP server itself.</p>
+") +
/* Tree Item Dialog "databases" 2/2 */
_("<p>To add a new database, press <b>Add Database...</b>.</p>") +
- _("<p>To delete a database, select a database from the List and press <b>Delete Database...</b>.
-You can not delete the \"config\" and \"frontend\" databases.</p>"),
+ _("<p>To delete a database, select a database from the list and press <b>Delete Database...</b>.
+You cannot delete the \"config\" and \"frontend\" databases.</p>
+"),
"master_setup_dialog" :
_("<p>Enter a password for the configuration database (\"<i>cn=config</i>\") here. This is required to make
the configuration database accessible remotely.</p>") +
_("<p>If the server is supposed to participate in a MirrorMode setup, select the \"<b>Prepare for MirrorMode replication</b>\"
-checkbox. This will ensure that the serverId Attribute is generated as needed for MirrorMode replication.</p>"),
+checkbox. This will ensure that the serverId attribute is generated as needed for MirrorMode replication.</p>
+"),
"slave_dialog" :
_("<p>To setup a slave server some details need to be queried from the master server. Please enter the master
Modified: trunk/ldap-server/src/ldap-server_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_proposal.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/ldap-server_proposal.ycp (original)
+++ trunk/ldap-server/src/ldap-server_proposal.ycp Mon Nov 21 14:13:34 2011
@@ -245,7 +245,7 @@
}
else
{
- Report::Error( _("OpenLDAP Replication Setup failed. Please reconfigure after the installation finished.") );
+ Report::Error( _("OpenLDAP Replication Setup failed. Reconfigure after the installation has finished.") );
return ret;
}
}
Modified: trunk/ldap-server/src/mirrormode-wizard.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/mirrormode-wizard.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/mirrormode-wizard.ycp (original)
+++ trunk/ldap-server/src/mirrormode-wizard.ycp Mon Nov 21 14:13:34 2011
@@ -111,14 +111,14 @@
map url = URL::Parse( serverids[selected,"uri"]:"" );
if ( (string)url["host"]:"" == LdapServer::ReadHostnameFQ() )
{
- Popup::Error( _("Deleting the Host on which you started this YaST Module is not possible.\n") +
- _("Please start yast2 openldap-mirrormode on a different MirrorMode server.") );
+ Popup::Error( _("Deleting the host on which you started this YaST Module is not possible.\n") +
+ _("Start yast2 openldap-mirrormode on a different MirrorMode server.") );
continue;
}
if( Popup::YesNo( _("Do you really want to remove ") +
"\"" + serverids[ selected, "uri" ]:"" + "\"" +
- _("From the MirrorMode setup?\n" ) +
+ _("from the MirrorMode setup?\n") +
_("Changes will take effect immediately after clicking \"Yes\"") ) )
{
LdapServer::RemoveMMSyncrepl( serverids[ selected, "uri" ]:"" );
Modified: trunk/ldap-server/src/tree_structure.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/tree_structure.ycp (original)
+++ trunk/ldap-server/src/tree_structure.ycp Mon Nov 21 14:13:34 2011
@@ -371,17 +371,17 @@
];
if ( (string)tlsSettings["caCertFile"]:"" == "" )
{
- callback_error = _("Please select a valid CA Certificate File");
+ callback_error = _("Select a Valid CA Certificate File");
return false;
}
if ( (string)tlsSettings["certFile"]:"" == "" )
{
- callback_error = _("Please select a valid Certificate File");
+ callback_error = _("Select a valid Certificate File");
return false;
}
if ( (string)tlsSettings["certKeyFile"]:"" == "" )
{
- callback_error = _("Please select a valid Certificate Key File");
+ callback_error = _("Select a valid Certificate Key File");
return false;
}
if ( ! LdapServer::WriteTlsConfig( tlsSettings ) )
@@ -454,7 +454,7 @@
UI::ChangeWidget( `te_key_file, `Value, "/etc/ssl/servercerts/serverkey.pem");
UI::ChangeWidget( `fr_import_cert, `Enabled, false );
} else {
- Popup::Error( _("A common server certificate is not available") );
+ Popup::Error( _("A common server certificate is not available.") );
UI::ChangeWidget( `cb_use_common_cert, `Value, false );
UI::ChangeWidget( `cb_use_common_cert, `Enabled, false );
}
@@ -597,11 +597,11 @@
y2milestone("Trying to delete datbase %1 %2", db["suffix"]:"", db["type"]:"" );
if (db["type"]:"" == "frontend" )
{
- Popup::Error(_("Can not delete Frontend database") );
+ Popup::Error(_("Cannot delete Frontend database") );
}
else if (db["type"]:"" == "config" )
{
- Popup::Error( _("Can not delete Config database") );
+ Popup::Error( _("Cannot delete Config database") );
}
else
{
@@ -746,14 +746,14 @@
string hashAlgo = (string)UI::QueryWidget( `cb_cryptmethod, `Value );
if ( size(pw) == 0 )
{
- Popup::Error( _("Please enter a password") );
+ Popup::Error( _("Enter a password") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
return false;
}
else if ( pw != verifypw )
{
- Popup::Error( _("The passwords you have enter do not match. Please try again") );
+ Popup::Error( _("The passwords you have entered do not match. Try again.") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
pw = "";
@@ -1187,7 +1187,7 @@
"name" : _("Databases"),
"widget" : `VBox(
`MinSize( 60, 7,
- `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) )
+ `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database Type") ) )
),
`Left(
`HBox(
Modified: trunk/ldap-server/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=66879&r1=66878&r2=66879&view=diff
==============================================================================
--- trunk/ldap-server/src/widgets.ycp (original)
+++ trunk/ldap-server/src/widgets.ycp Mon Nov 21 14:13:34 2011
@@ -250,7 +250,7 @@
`VSpacing( 0.5 ),
`VBox(
`Left(
- `Label( _("Checkpoint settings") )
+ `Label( _("Checkpoint Settings") )
),
`HBox(
`HSquash(
@@ -276,7 +276,7 @@
`Heading( _("Change Configuration Database Settings") ),
`VSpacing( 1 ),
`CheckBox( `id( `cb_conf_ldapsimplebind), `opt(`notify),
- _("Allow Plaintext Authentication (Simple Bind) for this Database. " ) +
+ _("Allow Plaintext Authentication (Simple Bind) for this Database. ") +
_("(Remote Connection needs to be encrypted)"), false ),
`VSpacing( 0.3 ),
`ReplacePoint( `id( `rp_confpw ),
@@ -339,7 +339,7 @@
string hashAlgo = (string)UI::QueryWidget( `cb_cryptmethod, `Value );
if ( size(pw) == 0 )
{
- Popup::Error( _("Please enter a password") );
+ Popup::Error( _("Enter a password") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
}
@@ -352,7 +352,7 @@
}
else
{
- Popup::Error( _("The passwords you have enter do not match. Please try again") );
+ Popup::Error( _("The passwords you have entered do not match. Try again.") );
UI::ChangeWidget( `te_rootpw, `Value, "" );
UI::ChangeWidget( `te_valid_rootpw, `Value, "" );
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
