Author: rhafer Date: Tue Jul 6 12:09:20 2010 New Revision: 62182

URL: http://svn.opensuse.org/viewcvs/yast?rev=62182&view=rev Log: revert r62150-r62152, they didn't endup in 11.3

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp Tue Jul 6 12:09:20 2010 @@ -855,12 +855,10 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `Left( - `HBox( - `PushButton( `id (`pb_add ), Label::AddButton() ), - `PushButton( `id (`pb_edit ), Label::EditButton() ), - `PushButton( `id (`pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id (`pb_add ), _("Add") ), + `PushButton( `id (`pb_del ), _("Delete") ), + `PushButton( `id (`pb_edit ), _("Edit") ) ) ) ), @@ -1149,12 +1147,10 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `Left( - `HBox( - `PushButton( `id (`pb_add ), Label::AddButton() ), - `PushButton( `id (`pb_edit ),Label::EditButton() ), - `PushButton( `id (`pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id (`pb_add ), _("Add") ), + `PushButton( `id (`pb_del ), _("Delete") ), + `PushButton( `id (`pb_edit ), _("Edit") ) ) ) );

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp Tue Jul 6 12:09:20 2010 @@ -282,37 +282,33 @@ term serverTypeWidget = `HSquash( `VBox( - `Heading( _("Server type") ), - `Frame("", + `Heading( _("Please select Server type") ), + `VSpacing(), + `RadioButtonGroup( + `id( `rbg_servertype ), `VBox( + `Left( + `RadioButton( + `id( `rb_standalone ), + _("This will be a standalone server"), + true + ) + ), `VSpacing(), - `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 - ) - ) + `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 ) ) )

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp Tue Jul 6 12:09:20 2010 @@ -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>Stand-alone server</b>: Setup a single standalone OpenLDAP Server with no preparations for + _("<p><b>Standalone 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 + _("<p><b>Replication Master (Provider)</b>: Create an OpenLDAP setup that is 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, + _("<p><b>Replication Slave (Consumer)</b>: Setup an OpenLDAP slave server that replicates all its data, including configuration, from a master server.</p>"),

/* Configuration Wizard Step 3 */

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp Tue Jul 6 12:09:20 2010 @@ -1192,11 +1192,9 @@ `MinSize( 60, 7, `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) ) ), - `Left( - `HBox( - `PushButton( `id( `pb_add ), Label::AddButton() ), - `PushButton( `id( `pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id( `pb_add ), _("A&dd Database...") ), + `PushButton( `id( `pb_del ), _("Delete Database") ) ) ), "cb_read" : ``( cb_read_databases() ),

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp Tue Jul 6 12:09:20 2010 @@ -301,13 +301,11 @@ `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")), [ ] ), - `Left( - `HSquash( - `HBox( - `PushButton( `id( `pb_idx_add ), Label::AddButton() ), - `PushButton( `id( `pb_idx_edit ), Label::EditButton() ), - `PushButton( `id( `pb_idx_del ), Label::DeleteButton() ) - ) + `HSquash( + `HBox( + `PushButton( `id( `pb_idx_add ), _("Add") ), + `PushButton( `id( `pb_idx_edit ), _("Edit") ), + `PushButton( `id( `pb_idx_del ), _("Delete") ) ) ) );