Author: rhafer Date: Fri Apr 1 16:22:11 2011 New Revision: 63695 URL: http://svn.opensuse.org/viewcvs/yast?rev=63695&view=rev Log: Merged bnc#587475 fix from trunk (c62152) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-s... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Fri Apr 1 16:22:11 2011 @@ -282,33 +282,37 @@ term serverTypeWidget = `HSquash( `VBox( - `Heading( _("Please select Server type") ), - `VSpacing(), - `RadioButtonGroup( - `id( `rbg_servertype ), + `Heading( _("Server type") ), + `Frame("", `VBox( - `Left( - `RadioButton( - `id( `rb_standalone ), - _("This will be a standalone server"), - true - ) - ), - `VSpacing(), - `Left( - `RadioButton( - `id( `rb_master ), - _("This server can act as a master server in a replication setup"), - false - ) - ), `VSpacing(), - `Left( - `RadioButton( - `id( `rb_slave ), - _("This will be a replica (slave) server.\n") + - _("All data including configuration will replicated from a remote server."), - false + `RadioButtonGroup( + `id( `rbg_servertype ), + `VBox( + `Left( + `RadioButton( + `id( `rb_standalone ), + _("Stand-alone server"), + true + ) + ), + `VSpacing(), + `Left( + `RadioButton( + `id( `rb_master ), + _("Master server in a replication setup"), + false + ) + ), + `VSpacing(), + `Left( + `RadioButton( + `id( `rb_slave ), + _("Replica (slave) server.\n") + + _("All data, including configuration, is replicated from a remote server."), + false + ) + ) ) ) ) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-s... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Fri Apr 1 16:22:11 2011 @@ -218,11 +218,11 @@ /* 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>Standalone Server</b>: Setup a single standalone OpenLDAP Server with no preparations for + _("<p><b>Stand-alone server</b>: Setup a single standalone OpenLDAP Server with no preparations for replication</p>") + - _("<p><b>Replication Master (Provider)</b>: Create an OpenLDAP setup that is prepared to act as a master server + _("<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><b>Replication Slave (Consumer)</b>: Setup an OpenLDAP slave server that replicates all its data, + _("<p><b>Replica slave server</b>: Setup an OpenLDAP slave server that replicates all its data, including configuration, from a master server.</p>"), /* Configuration Wizard Step 3 */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org