Author: rhafer Date: Wed Jan 27 17:03:33 2010 New Revision: 60581 URL: http://svn.opensuse.org/viewcvs/yast?rev=60581&view=rev Log: merged Proofreading results Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp?rev=60581&r1=60580&r2=60581&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Wed Jan 27 17:03:33 2010 @@ -1694,7 +1694,7 @@ + "\n\n\"" + (string)err["summary"]:"" + "\"\n\"" + (string)err["description"]:"" + "\"\n\n" + - _("Do you want to still want to continue?")); + _("Do you still want to continue?")); } if(!(boolean)SCR::Execute( .ldapserver.remoteLdapSyncCheck, testparm ) ) { @@ -1706,7 +1706,7 @@ + "\n\"" + (string)err["summary"]:""+ "\"\n\"" + (string)err["description"]:"" + "\"\n\n" + - _("Do you want to still want to continue?")); + _("Do you still want to continue?")); } } return true; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp?rev=60581&r1=60580&r2=60581&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Wed Jan 27 17:03:33 2010 @@ -913,7 +913,7 @@ } if ( ! setupok ) { - Popup::Error( _("The Replication Configuration on the master server indicates that\nis already acting as a Repliation Consumer.\n") + + 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.") ); ret = `cancel; break; @@ -1034,7 +1034,7 @@ `HSquash( `VSquash( `VBox( - `Heading( _("Repliation Master setup") ), + `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)") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org