Author: rhafer Date: Wed Sep 10 17:11:53 2008 New Revision: 50980 URL: http://svn.opensuse.org/viewcvs/yast?rev=50980&view=rev Log: merged texts from proofreading Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server.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=50980&r1=50979&r2=50980&view=diff ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Sep 10 17:11:53 2008 @@ -675,7 +675,7 @@ `HBox( `InputField( `id( `te_who_dn ), `opt( `hstretch ), _("Entry DN") ), `Bottom( - `PushButton( `id( `pb_who ), _("Select" ) ) + `PushButton( `id( `pb_who ), _("Select") ) ) ) ), @@ -803,7 +803,7 @@ ), `InputField( `id( `te_dn ), `opt( `hstretch ), _("Entry DN") ), `Bottom( - `PushButton( `id( `pb_dn ), _("Select" ) ) + `PushButton( `id( `pb_dn ), _("Select") ) ) ), `VSpacing(0.5), @@ -826,7 +826,7 @@ `InputField( `id( `te_attrs ), `opt(`hstretch), _("Attributes") ) ), `Bottom( - `PushButton( `id( `pb_attrs ), _("Edit" ) ) + `PushButton( `id( `pb_attrs ), _("Edit") ) ) ) ) @@ -1147,7 +1147,7 @@ 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." ) ); +not supported by this YaST Module. The Access Control Dialog will be disabled.") ); } else { Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=50980&r1=50979&r2=50980&view=diff ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Wed Sep 10 17:11:53 2008 @@ -170,7 +170,7 @@ } else if ( !serviceEnabled || !serviceRunning ) { - symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not running currently."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); + symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not currently running."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { LdapServer::WriteServiceEnabled( true ); @@ -196,9 +196,10 @@ { string caption = "Migrate existing Configuration"; string summary = _("Your system is currently configured to use the configuration -file /etc/openldap/slapd.conf. This YaST module does only support the dynamich +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?"); +existing configuration to the configuration database? +"); term contents = `VBox( `HSquash( @@ -324,7 +325,7 @@ simple authentication.") ) ), `Left( - `Label( `id( `lab_pw ), _("Please set a password of the configuration user (cn=config)") ) + `Label( `id( `lab_pw ), _("Please enter a password for the configuration user (cn=config)") ) ), `Password( `id( `te_rootpw ), _("New &Password") ), `HSpacing( 0.5 ), Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=50980&r1=50979&r2=50980&view=diff ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Sep 10 17:11:53 2008 @@ -110,7 +110,7 @@ if ( !LdapServer::ReadServiceEnabled() ) { if ( name != "daemon" ) { - Popup::Error( _("The LDAP Server is disabled currently, no configuration changes possible.") ); + Popup::Error( _("The LDAP Server is currently disabled, no configuration changes are possible.") ); name = "daemon"; } } Modified: trunk/ldap-server/src/ldap-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.ycp?rev=50980&r1=50979&r2=50980&view=diff ============================================================================== --- trunk/ldap-server/src/ldap-server.ycp (original) +++ trunk/ldap-server/src/ldap-server.ycp Wed Sep 10 17:11:53 2008 @@ -207,7 +207,7 @@ "actions" : $[ "service" : $[ "handler" : serviceHandler, - "help" : _("Enable/disable the service") + "help" : _("Enable/Disable the service") ], "addDatabase" : $[ "handler" : addDatabaseHandler, Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=50980&r1=50979&r2=50980&view=diff ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Wed Sep 10 17:11:53 2008 @@ -275,7 +275,7 @@ `VBox( `Heading( _("Edit Database") ), `VSpacing( 1 ), - `Label( _("Databasetype not supported currently") ) + `Label( _("Database type not currently supported.") ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org