November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66833 - /trunk/libyui/yast2-libyui.spec.in
by tgoettlicher＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: tgoettlicher Date: Wed Nov 16 14:54:30 2011 New Revision: 66833 URL: http://svn.opensuse.org/viewcvs/yast?rev=66833&view=rev Log: fixed license string Modified: trunk/libyui/yast2-libyui.spec.in Modified: trunk/libyui/yast2-libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/yast2-libyui.spec.in?rev=… ============================================================================== --- trunk/libyui/yast2-libyui.spec.in (original) +++ trunk/libyui/yast2-libyui.spec.in Wed Nov 16 14:54:30 2011 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66832 - in /trunk/libyui: VERSION package/yast2-libyui.changes src/YDialog.cc
by tgoettlicher＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: tgoettlicher Date: Wed Nov 16 14:07:05 2011 New Revision: 66832 URL: http://svn.opensuse.org/viewcvs/yast?rev=66832&view=rev Log: Fixed bnc#713343: YaST ncurses help screen is too small (2.21.2) Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YDialog.cc Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=66832&r1=6683… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Wed Nov 16 14:07:05 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Wed Nov 16 14:07:05 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 14:06:41 CET 2011 - tgoettlicher(a)suse.de + +- Fixed bnc#713343: YaST ncurses help screen is too small +- Version: 2.21.2 + +------------------------------------------------------------------- Tue Apr 19 12:09:27 CEST 2011 - tgoettlicher(a)suse.de - Don't allow recursive selection for non-multiselection widgets Modified: trunk/libyui/src/YDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YDialog.cc?rev=66832&… ============================================================================== --- trunk/libyui/src/YDialog.cc (original) +++ trunk/libyui/src/YDialog.cc Wed Nov 16 14:07:05 2011 @@ -631,10 +631,23 @@ void YDialog::showText( const string & text, bool useRichText ) { + + // set help text dialog size to 80% of topmost dialogi, respectively 45x15 (default) + + unsigned int dialogWidth = 45; + unsigned int dialogHeight = 15; + + if ( ! _dialogStack.empty() ) + { + YDialog * dialog = _dialogStack.top(); + dialogWidth = (unsigned int) ( (float) dialog->preferredWidth() * 0.8 ); + dialogHeight = (unsigned int) ( (float) dialog->preferredHeight() * 0.8 ); + } + try { YDialog * dialog = YUI::widgetFactory()->createPopupDialog(); - YAlignment * minSize = YUI::widgetFactory()->createMinSize( dialog, 45, 15 ); + YAlignment * minSize = YUI::widgetFactory()->createMinSize( dialog, dialogWidth, dialogHeight ); YLayoutBox * vbox = YUI::widgetFactory()->createVBox( minSize ); YUI::widgetFactory()->createRichText( vbox, text, ! useRichText ); YButtonBox * buttonBox = YUI::widgetFactory()->createButtonBox( vbox ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66831 - /tags/stable-2_22_0/installation/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 13:19:55 2011 New Revision: 66831 URL: http://svn.opensuse.org/viewcvs/yast?rev=66831&view=rev Log: Created tag stable-2_22_0 for installation Added: tags/stable-2_22_0/installation/ - copied from r66830, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66830 - in /trunk/installation: ./ doc/proposal/ package/ src/clients/ src/include/ src/inst_finish/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 13:19:46 2011 New Revision: 66830 URL: http://svn.opensuse.org/viewcvs/yast?rev=66830&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/installation/VERSION trunk/installation/doc/proposal/dummy_proposal.ycp trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/deploy_image_auto.ycp trunk/installation/src/clients/deploying_proposal.ycp trunk/installation/src/clients/inst_addon_update_sources.ycp trunk/installation/src/clients/inst_automatic_configuration.ycp trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_congratulate.ycp trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/clients/inst_initialization.ycp trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/inst_proposal.ycp trunk/installation/src/clients/inst_release_notes.ycp trunk/installation/src/clients/inst_scenarios.ycp trunk/installation/src/clients/inst_suseconfig.ycp trunk/installation/src/clients/inst_system_analysis.ycp trunk/installation/src/clients/inst_upgrade_urls.ycp trunk/installation/src/clients/inst_welcome.ycp trunk/installation/src/clients/release_notes_popup.ycp trunk/installation/src/include/inst_inc_all.ycp trunk/installation/src/include/inst_inc_second.ycp trunk/installation/src/include/misc.ycp trunk/installation/src/include/scr_switch_debugger.ycp trunk/installation/src/inst_finish/ldconfig_finish.ycp trunk/installation/src/inst_finish/yast_inf_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=66830&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Nov 16 13:19:46 2011 @@ -1 +1 @@ -2.21.28 +2.22.0 Modified: trunk/installation/doc/proposal/dummy_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/doc/proposal/dummy_… ============================================================================== --- trunk/installation/doc/proposal/dummy_proposal.ycp (original) +++ trunk/installation/doc/proposal/dummy_proposal.ycp Wed Nov 16 13:19:46 2011 @@ -66,9 +66,9 @@ ret = $[ // this is a heading - "rich_text_title" : _( "Dummy" ), + "rich_text_title" : _("Dummy"), // this is a menu entry - "menu_title" : _( "&Dummy" ), + "menu_title" : _("&Dummy"), "id" : "dummy_stuff" ]; } Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Nov 16 13:19:46 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 13:18:40 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Nov 10 14:27:55 UTC 2011 - fcrozat(a)suse.com - Disable routing initscript commands through systemd, prevent Modified: trunk/installation/src/clients/deploy_image_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/deploy_… ============================================================================== --- trunk/installation/src/clients/deploy_image_auto.ycp (original) +++ trunk/installation/src/clients/deploy_image_auto.ycp Wed Nov 16 13:19:46 2011 @@ -111,7 +111,7 @@ `VSpacing (0.5), `Left(`RadioButton ( `id (`dont_inst_from_images), `opt(`notify), - _("&Do Not Install from Images"), + _("&Do not Install from Images"), (Installation::image_installation != true) )) )) @@ -151,10 +151,11 @@ `HStretch () ), // TRANSLATORS: help text - _("Installation from Images is used to speed the installation up. -Images contain compressed snapshots of installed system matching your selection -of patterns. The rest of packages which are not in images will be installed from -packages the standard way.") + _("Creating own Images is used if you + _("Installation from Images is used to speed the installation up. +Images contain compressed snapshots of an installed system matching your +selection of patterns. The rest of the packages which are not contained in the +images will be installed from packages the standard way. +") + _("Creating own Images is used if you want to skip the complete step of RPM installation. Instead AutoYaST will dump an image on the harddisk which is a lot faster and can be pre-configured already. Everything else than RPM installation is done like during a normal auto-installation."), Modified: trunk/installation/src/clients/deploying_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/deployi… ============================================================================== --- trunk/installation/src/clients/deploying_proposal.ycp (original) +++ trunk/installation/src/clients/deploying_proposal.ycp Wed Nov 16 13:19:46 2011 @@ -36,14 +36,14 @@ ret = ret + "<li>" + sformat ( // TRANSLATORS: Installation overview // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Installation from images is enabled (<a href=\"%1\">disable</a>)"), + _("Installation from images is enabled (<a href=\"%1\">disable</a>)."), im_do_disable ) + "</li>"; } else { ret = ret + "<li>" + sformat ( // TRANSLATORS: Installation overview // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Installation from images is disabled (<a href=\"%1\">enable</a>)"), + _("Installation from images is disabled (<a href=\"%1\">enable</a>)."), im_do_enable ) + "</li>"; } @@ -80,9 +80,9 @@ "links" : [ im_do_enable, im_do_disable ], // TRANSLATORS: help text "help" : _("Installation from Images is used to speed the installation up. -Images contain compressed snapshots of an installed system matching your selection -of patterns. The rest of packages which are not in images will be installed from -packages the standard way. +Images contain compressed snapshots of an installed system matching your +selection of patterns. The rest of the packages which are not contained in the +images will be installed from packages the standard way. ") + // TRANSLATORS: help text _("Installation from images is disabled by default if the current @@ -91,7 +91,7 @@ } else { y2error ("Installation from images should be used for new installation only!"); ret = $[ - "preformatted_proposal" : sformat (_("Error: Images should not be used for mode: %1"), Mode::mode()), + "preformatted_proposal" : sformat (_("Error: Images should not be used for mode: %1."), Mode::mode()), "warning_level" : `error, ]; } @@ -116,7 +116,7 @@ CallProposalScript(); if (old_status == false && old_status == Installation::image_installation) { - Report::Message (_("Unable to enable installation from images. + Report::Message (_("Cannot enable installation from images. Currently selected patterns do not fit the images stored on the installation media. Modified: trunk/installation/src/clients/inst_addon_update_sources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ad… ============================================================================== --- trunk/installation/src/clients/inst_addon_update_sources.ycp (original) +++ trunk/installation/src/clients/inst_addon_update_sources.ycp Wed Nov 16 13:19:46 2011 @@ -62,7 +62,7 @@ // feedback heading -string heading = _("Add-On Product Installation"); +string heading = _("Add-on Product Installation"); // feedback message string message = _("Reading packages available in the repositories..."); Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au… ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Wed Nov 16 13:19:46 2011 @@ -190,7 +190,7 @@ 0 ) ), - _("Installation is currently writing the automatic configuration. Please wait..."), + _("Writing automatic configuration..."), false, false ); } Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Wed Nov 16 13:19:46 2011 @@ -160,9 +160,10 @@ // help text, continued // Describes the #ICW_B1 button _(" -License has to be accepted before continuing the installation. +The license must be accepted before the installation continues. Use License Translations... to show the license in all available translations. -") + + +") + // help text, continued _(" Modified: trunk/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_congratulate.ycp (original) +++ trunk/installation/src/clients/inst_congratulate.ycp Wed Nov 16 13:19:46 2011 @@ -85,7 +85,8 @@ // TRANSLATORS: help text, see #ZMD turnoff_zmd_help = _("Select Disable ZMD Service to stop and disable -the ZMD service during the system start."); +the ZMD service during system start. +"); } else { y2milestone ("ZMD Turnoff check-box will be invisible"); } @@ -161,7 +162,7 @@ string help = _("Your system is ready for use.") + // help 2/4 for dialog "Congratulation Dialog" - _("Finish will close the YaST installation and continue + _("Finish will close the YaST installation and take you to the login screen. ") + Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de… ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Wed Nov 16 13:19:46 2011 @@ -319,8 +319,9 @@ // BNC #444209 // false == error if (dep_ret == false) { - Report::Error (_("Deploying from images has failed. -Aborting the installation...")); + Report::Error (_("Deploying images has failed. +Aborting the installation... +")); y2milestone ("Aborting..."); return `abort; // nil == aborted Modified: trunk/installation/src/clients/inst_initialization.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_in… ============================================================================== --- trunk/installation/src/clients/inst_initialization.ycp (original) +++ trunk/installation/src/clients/inst_initialization.ycp Wed Nov 16 13:19:46 2011 @@ -26,7 +26,7 @@ } // TRANSLATORS: dialog help -string helptext = _("Please wait while the installation is being initialized."); +string helptext = _("Installation is being initialized."); // TRANSLATORS: dialog progress message string label = _("Initializing the installation..."); Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mo… ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Wed Nov 16 13:19:46 2011 @@ -156,7 +156,7 @@ `Left (`CheckBox ( `id (`add_on), `opt(`notify), // check box - _("In&clude Add-On Products from Separate Media"), + _("In&clude Add-on Products from Separate Media"), Installation::add_on_selected )), (InstData::enable_autoconfiguration == true ? @@ -183,8 +183,9 @@ _(" Select New Installation if there is no existing Linux system on your machine or if you want to replace an existing Linux system completely, -abandoning all its configuration data. -") + +discarding all its configuration data. + +") + // help text for installation method _(" @@ -201,7 +202,8 @@ // help text for installation method _(" To install an add-on product from separate media together with &product;, select -Include Add-On Products from Separate Media.") + +Include Add-on Products from Separate Media. +") + // help text for installation method (InstData::enable_autoconfiguration == true ? _(" Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Wed Nov 16 13:19:46 2011 @@ -173,7 +173,7 @@ `Label (_("Probing network cards...")) ), // TRANSLATORS: dialog help - _("Please wait while the installation is probing the network cards..."), + _("Network cards are being probed now."), false, false ); @@ -275,7 +275,8 @@ // TRANSLATORS: pop-up error message Report::Error (_("No network card has been selected. -Please select a network card to configure it later.")); +Select a network card to configure it later. +")); return false; // Checking whether the netcard link is active @@ -292,7 +293,7 @@ selected_netcard ), // TRANSLATORS: popup dialog button - _("&Yes, Use It"), + _("&Yes, Use it"), Label::NoButton(), `no_button )) { @@ -320,7 +321,7 @@ // TRANSLATORS: dialog caption _("Network Setup"), `VBox ( - `Left (`Label (_("Please, select a network card to be configured"))), + `Left (`Label (_("Select a network card to be configured."))), `VWeight (3, `Table ( `id ("netcard_selection"), `opt (`notify, `immediate), @@ -346,7 +347,8 @@ // TRANSLATORS: dialog help 3/3 _("To configure a network card, select it from the list and click the Next button. -Otherwise,clickCancel."), +Otherwise, click Cancel. +"), Label::BackButton(), Label::NextButton() ); @@ -625,7 +627,7 @@ `Left (`Label (sformat( // TRANSLATORS: dialog label, %1 is replaced with a selected network device name, e.g, eth3 // See *2 - _("Please, select your network setup type for %1"), + _("Select your network setup type for %1"), // TRANSLATORS: a fallback card name for *2 network_settings["network_device"]:_("Unknown Network Card") ))), @@ -671,9 +673,9 @@ `HSquash (`MinWidth (6, `ComboBox (`id ("proxy_port"), `opt (`editable), _("&Port"), [ "", "3128", "8080" ]))) )), `Left (`HBox ( - `HSquash (`MinWidth (14, `InputField (`id ("proxy_user"), _("Us&er (Optional)")))), + `HSquash (`MinWidth (14, `InputField (`id ("proxy_user"), _("Us&er (optional)")))), `HSpacing (0.5), - `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (Optional)")))) + `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (optional)")))) )) ) )) @@ -692,15 +694,17 @@ ), // TRANSLATORS: dialog help 1/2 _("<big>Network Setup</big> - Here you can configure your network card. + Configure your network card. Select either DHCP or static setup. DHCP fits for most cases. For details contact your Internet provider or your network -administrator.") + +administrator. +") + // TRANSLATORS: dialog help 2/2 _("<big>Proxy</big> Proxy is a server-based cache for accessing the web. In most cases, if you have a direct connection to the Internet, -it doesn't need to be used."), +you do not need to use one. +"), Label::BackButton(), Label::OKButton() ); @@ -1348,7 +1352,7 @@ Progress::NewProgressIcons ( // TRANSLATORS: dialog caption - _("Writing Network Setup"), + _("Writing Network Setup..."), " ", size (actions_todo), actions_todo, @@ -1383,7 +1387,8 @@ y2warning ("Writing has failed, returning to the previous dialog"); Report::Error (_("Writing the network settings failed. You will be returned to the previous dialog to either -change the settings, or cancel the network setup.")); +change the settings or cancel the network setup. +")); return `back; } Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Wed Nov 16 13:19:46 2011 @@ -803,7 +803,7 @@ vbox = `VBox( // Help message between headline and installation proposal / settings summary. // May contain newlines, but don't make it very much longer than the original. - `Left( `Label( _("Click any headline to make changes or use the \"Change...\" menu below.") ) ), + `Left( `Label( _("Click a headline to make changes or use the \"Change...\" menu below.") ) ), rt, menu_box ); @@ -992,7 +992,7 @@ // Help text for installation proposal, continued help_text_string = help_text_string + _(" -Your hard disk has not been modified in any way, so you can still safely abort. +Your hard disk has not been modified yet. You can still safely abort. "); } @@ -1014,7 +1014,7 @@ // Help text for installation proposal, continued help_text_string = help_text_string + _(" -Your hard disk has not been modified in any way, so you can still safely abort. +Your hard disk has not been modified yet. You can still safely abort. "); } @@ -1075,8 +1075,9 @@ { // help text help_text_string = help_text_string + _("Some proposals might be -locked by the system administrator, so cannot be changed. To change -a proposal that is locked, ask your system administrator."); +locked by the system administrator and therefore cannot be changed. If a +locked proposal needs to be changed, ask your system administrator. +"); } foreach (string submod, submodules_presentation, { Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Wed Nov 16 13:19:46 2011 @@ -215,8 +215,9 @@ term contents = `VBox (`VSpacing (0.5), relnoteslayout, `VSpacing (0.5)); /* help text for dialog "Release Notes" */ - string help = _("Here are the release notes for the installed -Linux system. They provide a brief summary of new features and changes."); + string help = _("The release notes for the installed Linux system provide a brief +summary of new features and changes. +"); // in normal mode no BackAbortNext-button layout // bugzilla #262440 Modified: trunk/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sc… ============================================================================== --- trunk/installation/src/clients/inst_scenarios.ycp (original) +++ trunk/installation/src/clients/inst_scenarios.ycp Wed Nov 16 13:19:46 2011 @@ -182,8 +182,9 @@ } // TRANSLATORS: help text - string dialog_help = _("Select a scenario that matches your needs the best. -Additional software can be selected later in software proposal."); + string dialog_help = _("Select the scenario that meets your needs best. +Additional software can be selected later in software proposal. +"); // Adjust dialog Wizard::SetContents ( Modified: trunk/installation/src/clients/inst_suseconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_su… ============================================================================== --- trunk/installation/src/clients/inst_suseconfig.ycp (original) +++ trunk/installation/src/clients/inst_suseconfig.ycp Wed Nov 16 13:19:46 2011 @@ -139,7 +139,7 @@ if (! automatic_configuration && !Mode::commandline ()) { Wizard::SetContents( // Dialog title for SuSEconfig dialog - _("Writing the system configuration"), + _("Writing the system configuration..."), contents, help, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::DisableAbortButton(); } @@ -160,7 +160,7 @@ // prior to calling any SuSEconfig module. // - logStep( _("Setting up linker cache") ); + logStep( _("Setting up linker cache...") ); runStep( "/sbin/ldconfig" ); // This is the same as: Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Wed Nov 16 13:19:46 2011 @@ -245,9 +245,9 @@ visible_icons = add (visible_icons, "32x32/apps/yast-firewire.png"); // TRANSLATORS: progress step - actions_todo = add (actions_todo, _("Probe floppy disks devices")); + actions_todo = add (actions_todo, _("Probe floppy disk devices")); // TRANSLATORS: progress step - actions_doing = add (actions_doing, _("Probing floppy disks devices...")); + actions_doing = add (actions_doing, _("Probing floppy disk devices...")); actions_functions = add (actions_functions, ActionFloppyDisks); visible_icons = add (visible_icons, "32x32/apps/yast-floppy.png"); } @@ -313,7 +313,7 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("Please wait while computer hardware and installed systems are being probed..."), + _("YaST is probing computer hardware and installed systems now."), [visible_icons] ); Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Wed Nov 16 13:19:46 2011 @@ -558,7 +558,7 @@ `Label (_("Adding and removing repositories...")) ), // TRANSLATORS: help text - _("Please wait while repositories are being added and removed."), + _("Repositories are being added and removed."), false, false ); @@ -604,7 +604,7 @@ actions_todo, actions_doing, // TRANSLATORS: help text - _("Please wait while repositories are being added and removed.") + _("Repositories are being added and removed.") ); } @@ -701,7 +701,8 @@ sformat(_("Make sure that media with label %1 is in the CD/DVD drive. -If you skip it, repository will not be added."), name), +If you skip it, the repository will not be added. +"), name), Label::OKButton(), Label::SkipButton(), `yes @@ -797,9 +798,10 @@ Report::Error (sformat ( // TRANSLATORS: error report // %1 is replaced with repo-name, %2 with repo-URL - _("An error occurred when enabling repository + _("An error occurred while enabling repository Name: %1 -URL: %2"), +URL: %2 +"), repo_name, one_url )); Modified: trunk/installation/src/clients/inst_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_we… ============================================================================== --- trunk/installation/src/clients/inst_welcome.ycp (original) +++ trunk/installation/src/clients/inst_welcome.ycp Wed Nov 16 13:19:46 2011 @@ -53,7 +53,7 @@ // help ttext -string help = _("Click Next to go through the +string help = _("Click Next to perform the basic configuration of the system. "); Modified: trunk/installation/src/clients/release_notes_popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/release… ============================================================================== --- trunk/installation/src/clients/release_notes_popup.ycp (original) +++ trunk/installation/src/clients/release_notes_popup.ycp Wed Nov 16 13:19:46 2011 @@ -112,10 +112,11 @@ text = // beginning of the rich text with the release notes -_("These are the release notes made for the first initial release. They are +_("These are the release notes for the initial release. They are part of the installation media. During installation, if a connection to the Internet is available, you can download updated release notes -from the SUSE Linux Web server.") + text; +from the SUSE Linux Web server. +") + text; // bugzilla #221222, #213239 map display_info = UI::GetDisplayInfo(); Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Wed Nov 16 13:19:46 2011 @@ -65,7 +65,7 @@ if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step || ret == `abort) { // TRANSLATORS: busy message - UI::OpenDialog (`Label(_("Writing YaST Configuration..."))); // #2 + UI::OpenDialog (`Label(_("Writing YaST configuration..."))); // #2 } else { // FATE #304395: Disabling (or handling) screensaver during installation // Enabling screen-saver on exit @@ -125,10 +125,10 @@ // Somehow the graphical frontend failed and we're running in // text mode. Inform the user about this fact. x11_msg = sformat(_("Your computer does not fulfill all requirements for -a graphical installation. There is less than %1 MB +a graphical installation. There is either less than %1 MB memory or the X server could not be started. -As a fallback, the text front-end of YaST2 will guide you +As fallback, the text front-end of YaST2 will guide you through the installation. This front-end offers the same functionality as the graphical one, but the screens differ from those in the manual. @@ -145,10 +145,10 @@ // text mode. Inform the user about this fact. x11_msg = _("The graphical interface could not be started. -The required packages were not installed (minimal installation) or -the graphics card is not properly supported. +Either the required packages were not installed (minimal installation) +or the graphics card is not properly supported. -As a fallback, the text front-end of YaST2 will guide you +As fallback, the text front-end of YaST2 will guide you through the installation. This front-end offers the same functionality as the graphical one, but the screens differ from those in the manual. Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Wed Nov 16 13:19:46 2011 @@ -233,7 +233,7 @@ start_service, starting_service, // TRANSLATORS: dialog help - _("Please wait while network settings are being adjusted...") + _("Network settings are being adjusted.") ); Wizard::SetTitleIcon ("yast-network"); Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Wed Nov 16 13:19:46 2011 @@ -137,7 +137,7 @@ heading = HTML::Heading(_("Confirm Installation")); // Text for confirmation popup before the installation really starts 1/3 - body = _("All information required for the base installation is now complete."); + body = _("Information required for the base installation is now complete."); boolean some_destructive = find(map info, Storage::GetCommitInfos(), { return info[`destructive]:false; @@ -171,7 +171,7 @@ body = // Text for confirmation popup before the update really starts 1/3 - _("All information required to perform an update is now complete.") + _("Information required to perform an update is now complete.") // Text for confirmation popup before the update really starts 2/3 + _(" If you continue now, data on your hard disk will be overwritten Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_swi… ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Wed Nov 16 13:19:46 2011 @@ -105,12 +105,13 @@ // %2 - link to our bugzilla // %3 - directory where YaST logs are stored // %4 - link to the Yast Bug Reporting HOWTO Web page - _("Switching to the installed system has failed -More information can be found near the end of the '%1' file. + _("Switching to the installed system has failed. +Find more information near the end of the '%1' file. This is worth reporting a bug at %2. -Please, attach also all YaST logs stored in the '%3' directory. -See %4 for more information about YaST logs."), +Please, attach all YaST logs stored in the '%3' directory. +See %4 for more information about YaST logs. +"), "/var/log/YaST2/y2log", "http://bugzilla.novell.com/", "/var/log/YaST2/", @@ -163,7 +164,8 @@ // %1 - link to our bugzilla // %2 - directory where YaST logs are stored _("This is worth reporting a bug at %1. -Please, attach also all YaST logs stored in the '%2' directory."), +Please, attach all YaST logs stored in the '%2' directory. +"), "http://bugzilla.novell.com/", "/var/log/YaST2/" ) + @@ -540,7 +542,7 @@ // YaST got killed } else if (regexpmatch (one_line, " got signal ")) { // Print just the last line - ReportLine (_("YaST process got killed")); + ReportLine (_("YaST process got killed.")); PrintLinesFromTo (current_line, current_line); ret = false; break; @@ -670,7 +672,7 @@ integer new_SCR = WFM::SCROpen ("chroot=" + new_SCR_path + ":scr", false); if (new_SCR < 0) { y2error("Cannot conenct to SCR %1", new_SCR_path); - Popup::Error(_("Connecting to the inst-sys failed, debugger cannot continue.")); + Popup::Error(_("Connecting to the inst-sys failed. Debugger cannot continue.")); return; } // Set the new SCR as a defalt one Modified: trunk/installation/src/inst_finish/ldconfig_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/ldc… ============================================================================== --- trunk/installation/src/inst_finish/ldconfig_finish.ycp (original) +++ trunk/installation/src/inst_finish/ldconfig_finish.ycp Wed Nov 16 13:19:46 2011 @@ -36,7 +36,7 @@ return (any)$[ "steps" : 1, // progress step title - "title" : _("Setting up linker cache"), + "title" : _("Setting up linker cache..."), "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } Modified: trunk/installation/src/inst_finish/yast_inf_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/yas… ============================================================================== --- trunk/installation/src/inst_finish/yast_inf_finish.ycp (original) +++ trunk/installation/src/inst_finish/yast_inf_finish.ycp Wed Nov 16 13:19:46 2011 @@ -147,7 +147,7 @@ return (any)$[ "steps" : 1, // progress step title - "title" : _("Writing YaST Configuration..."), + "title" : _("Writing YaST configuration..."), "when" : [ `installation, `update, `autoinst ], ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66829 - /tags/stable-2_22_0/vm/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:51:00 2011 New Revision: 66829 URL: http://svn.opensuse.org/viewcvs/yast?rev=66829&view=rev Log: Created tag stable-2_22_0 for vm Added: tags/stable-2_22_0/vm/ - copied from r66828, trunk/vm/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66828 - in /trunk/vm: VERSION package/yast2-vm.changes src/VM_XEN.ycp
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:50:50 2011 New Revision: 66828 URL: http://svn.opensuse.org/viewcvs/yast?rev=66828&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/VM_XEN.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=66828&r1=66827&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Wed Nov 16 12:50:50 2011 @@ -1 +1 @@ -2.21.5 +2.22.0 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Wed Nov 16 12:50:50 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:49:08 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Tue Nov 1 12:04:05 MDT 2011 - carnold(a)novell.com - bnc#727523 - yast2 xen should be modified for 32bit Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=66828&r1=6… ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Wed Nov 16 12:50:50 2011 @@ -168,9 +168,9 @@ // xen domain0 installation help text - 2/4 _("The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.") + // xen domain0 installation help text - 3/4 - _("GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.") + + _("GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.") + // xen domain0 installation help text - 4/4 - _("When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu."); + _("When the configuration has finished successfully, you can boot the VM Server from the boot loader menu."); // error popup string abortmsg = _("The installation will be aborted."); @@ -178,7 +178,7 @@ // Generate a pop dialog to allow user selection of Xen or KVM UI::OpenDialog( `VBox( - `Label(_("Please select the virtualization platform to install")), + `Label(_("Select the virtualization platform to install.")), `Left(`CheckBox(`id(`xen), "Xen")), `Left(`CheckBox(`id(`kvm), "KVM")), `ButtonBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66827 - /tags/stable-2_22_0/apparmor/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:38:03 2011 New Revision: 66827 URL: http://svn.opensuse.org/viewcvs/yast?rev=66827&view=rev Log: Created tag stable-2_22_0 for apparmor Added: tags/stable-2_22_0/apparmor/ (props changed) - copied from r66826, trunk/apparmor/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66826 - in /trunk/apparmor: ./ package/ src/agents/ src/clients/ src/include/apparmor/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:37:48 2011 New Revision: 66826 URL: http://svn.opensuse.org/viewcvs/yast?rev=66826&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/agents/ag_genprof trunk/apparmor/src/clients/AA_AddProfile.ycp trunk/apparmor/src/clients/AA_EditProfile.ycp trunk/apparmor/src/clients/apparmor.ycp trunk/apparmor/src/include/apparmor/aa-config.ycp trunk/apparmor/src/include/apparmor/apparmor_profile_check.ycp trunk/apparmor/src/include/apparmor/apparmor_ycp_utils.ycp trunk/apparmor/src/include/apparmor/capabilities.ycp trunk/apparmor/src/include/apparmor/config_complain.ycp trunk/apparmor/src/include/apparmor/profile_dialogs.ycp trunk/apparmor/src/include/apparmor/report_helptext.ycp trunk/apparmor/src/include/apparmor/reporting_archived_dialogs.ycp trunk/apparmor/src/include/apparmor/reporting_dialogues.ycp Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=66826&r1=66… ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Wed Nov 16 12:37:48 2011 @@ -1 +1 @@ -2.21.5 +2.22.0 Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Wed Nov 16 12:37:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:36:51 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Fri Sep 30 11:57:42 UTC 2011 - jsrain@site - fixed enabling/disabling apparmor Modified: trunk/apparmor/src/agents/ag_genprof URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_genprof?r… ============================================================================== --- trunk/apparmor/src/agents/ag_genprof (original) +++ trunk/apparmor/src/agents/ag_genprof Wed Nov 16 12:37:48 2011 @@ -85,14 +85,15 @@ my $f = { description => -__("This wizard will help you create a new AppArmor security +__("This wizard will assist you in creating a new AppArmor security profile for an application, or you can use it to enhance an existing profile by allowing AppArmor to learn new application behavior. -Please enter the application name for which you would like -to create a profile, or select Browse to find the -application on your system.") , +Enter the application name for which you would like +to create a profile or select Browse to find the +application on your system. +") , file_label => __("&Application to Profile"), okay_label => __("&Create"), cancel_label => __("&Abort"), @@ -117,16 +118,18 @@ unless(-x $fqdbin) { UI_Important( __("The specified file is not executable. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } elsif(-d $profiling) { UI_Important( __("The specified pathname is a directory. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } else { if($profiling !~ /\//) { my $which = which($profiling); @@ -138,9 +141,10 @@ unless(-f $fqdbin) { UI_Important( __("The specified file does not exist. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } @@ -149,9 +153,10 @@ UI_Important( __("You have not entered or selected an application to profile. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } until($fqdbin && -x $fqdbin); @@ -194,15 +199,16 @@ my $q = { }; $q->{headers} = [ __("Profiling"), $fqdbin ]; - $q->{explanation} = __("Please start the application to be profiled in + $q->{explanation} = __("Start the application to be profiled in another window and exercise its functionality now. Once completed, select the 'Scan' option below in order to scan the system logs for AppArmor events. For each AppArmor event, you will be given the -opportunity to choose whether the access should be -allowed or denied."); +opportunity to choose whether access should be +allowed or denied. +"); $q->{functions} = [ "CMD_SCAN", "CMD_FINISHED" ]; $q->{default} = "CMD_SCAN"; Modified: trunk/apparmor/src/clients/AA_AddProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/AA_AddProfi… ============================================================================== --- trunk/apparmor/src/clients/AA_AddProfile.ycp (original) +++ trunk/apparmor/src/clients/AA_AddProfile.ycp Wed Nov 16 12:37:48 2011 @@ -22,7 +22,7 @@ define boolean CreateNewProfile() { string selectfilename = ""; while ( true ) { - selectfilename = UI::AskForExistingFile( "/", "", _("Select File To Generate A Profile for") ); + selectfilename = UI::AskForExistingFile( "/", "", _("Select File to Generate a Profile for") ); // Check for cancel in the file choose dialog if ( selectfilename == nil ) { return false; Modified: trunk/apparmor/src/clients/AA_EditProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/AA_EditProf… ============================================================================== --- trunk/apparmor/src/clients/AA_EditProfile.ycp (original) +++ trunk/apparmor/src/clients/AA_EditProfile.ycp Wed Nov 16 12:37:48 2011 @@ -36,7 +36,7 @@ map aliases = $[ "showProfile" : ``(DisplayProfileForm(Settings["CURRENT_PROFILE"]:"", false)), "showHat" : ``(DisplayProfileForm(Settings["CURRENT_HAT"]:"", true)), - "chooseProfile" : ``(SelectProfileForm(profiles, _("Please make a selection from the listed profiles and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )), + "chooseProfile" : ``(SelectProfileForm(profiles, _("Selection a listed profile and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )), "reread" : ``(Reread()), ]; Modified: trunk/apparmor/src/clients/apparmor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/apparmor.yc… ============================================================================== --- trunk/apparmor/src/clients/apparmor.ycp (original) +++ trunk/apparmor/src/clients/apparmor.ycp Wed Nov 16 12:37:48 2011 @@ -13,8 +13,9 @@ string caption = _("AppArmor Configuration"); /* AppArmor dialog help */ - string help = _("Choose one of the available apparmor modules to configure - the corresponding action and press Launch."); + string help = _("Choose one of the available AppArmor modules to configure + the corresponding action and press Launch. +"); /* AppArmor dialog contents */ term contents = `HBox( @@ -33,7 +34,7 @@ // and so was Reports.pm // `item(`id("AA_Report"), _("Reports")), `item(`id("AA_EditProfile"), _("Manage Existing Profiles")), - `item(`id("AA_AddProfile"), _("Add Manually Profile"))//, + `item(`id("AA_AddProfile"), _("Manually Add Profile"))//, // merged with EditProfile `item(`id("AA_DeleteProfile"), _("Delete Profile")) ]), `VSpacing(3) Modified: trunk/apparmor/src/include/apparmor/aa-config.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/aa… ============================================================================== --- trunk/apparmor/src/include/apparmor/aa-config.ycp (original) +++ trunk/apparmor/src/include/apparmor/aa-config.ycp Wed Nov 16 12:37:48 2011 @@ -31,7 +31,7 @@ if ( error != nil && is(error, string) ) { string errorMsg = (string) error; - string popError = _("This operation generated the following error. Please check your installation and AppArmor profile settings."); + string popError = _("This operation generated the following error. Check your installation and AppArmor profile settings."); Popup::Message( popError+ "\n[" + errorMsg + "]"); aaEnabled = ! aaEnabled; Modified: trunk/apparmor/src/include/apparmor/apparmor_profile_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/ap… ============================================================================== --- trunk/apparmor/src/include/apparmor/apparmor_profile_check.ycp (original) +++ trunk/apparmor/src/include/apparmor/apparmor_profile_check.ycp Wed Nov 16 12:37:48 2011 @@ -36,16 +36,11 @@ errmsg = _("These problems must be corrected before AppArmor can be \ started or the profile management tools can be used. ") + "" + errmsg + "" - + _("You can find a description of AppArmor profile syntax by \ -running ") + + _("Find a description of the AppArmor profile syntax by running ") + "<code>man apparmor.d</code>" - + _("Comprehensive documentation about AppArmor is available in \ -the Administration guide. This is available in the \ -directory: ") + + _("Comprehensive documentation about AppArmor is available in the Administration guide located in the directory: ") + "" - + "<code>/usr/share/doc/manual/suselinux-manual_LANGUAGE</code>. " - + _("Please refer to this for more detailed information about \ -AppArmor"); + + "<code>/usr/share/doc/manual/suselinux-manual_LANGUAGE</code>. "; Popup::LongText( headline, `RichText(errmsg), 55, 15); } return( syntax_ok ); Modified: trunk/apparmor/src/include/apparmor/apparmor_ycp_utils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/ap… ============================================================================== --- trunk/apparmor/src/include/apparmor/apparmor_ycp_utils.ycp (original) +++ trunk/apparmor/src/include/apparmor/apparmor_ycp_utils.ycp Wed Nov 16 12:37:48 2011 @@ -31,8 +31,8 @@ CMDS["CMD_AUDIT_OFF"] = _("Audi&t off"); CMDS["CMD_AUDIT_FULL"] = _("Audit &All"); CMDS["CMD_OTHER"] = _("&Opts"); - CMDS["CMD_USER_ON"] = _("&Owner permissions on"); - CMDS["CMD_USER_OFF"] = _("&Owner permissions off"); + CMDS["CMD_USER_ON"] = _("&Owner Permissions on"); + CMDS["CMD_USER_OFF"] = _("&Owner Permissions off"); CMDS["CMD_ix"] = _("&Inherit"); CMDS["CMD_px"] = _("&Profile"); CMDS["CMD_px_safe"] = _("&Profile Clean Exec"); @@ -96,7 +96,11 @@ define boolean checkEmailAddress( string emailAddr ) { if ( ! validEmailAddress( emailAddr, false ) ) { - string err_email_format = _("Email address format invalid.\nEmail address must be less than 129 characters \n and of the format \"name@domain\". \n Please enter another address."); + string err_email_format = _("Email address format invalid. +Email address must be less than 129 characters + and of the format \"name@domain\". +Enter a valid address. +"); Popup::Error( err_email_format ); return false; } @@ -258,13 +262,13 @@ ? "y": "n"; if ( username == "" ) { - Popup::Error( _("Username required for registration." )); + Popup::Error( _("Username required for registration.")); } else if ( email == "" ) { - Popup::Error( _("Email address required for registration." )); + Popup::Error( _("Email address required for registration.")); } else if ( password == "" && password_verify == "" ) { - Popup::Error( _("Password is required for registration." )); + Popup::Error( _("Password is required for registration.")); } else if ( password != password_verify ) { - Popup::Error( _("Passwords do not match. Please re-enter." )); + Popup::Error( _("Passwords do not match. Please re-enter.")); } else if ( ! checkEmailAddress( email ) ) { any dummy = nil; } else { @@ -508,7 +512,7 @@ string profile_rules = (string) profiles[first_profile_name]:"MISSING CONTENTS"; string disable_ask_upload_str = - _("&Don't ask again for unselected profiles"); + _("&Do not ask again for unselected profiles"); map ui_capabilities = UI::GetDisplayInfo(); boolean in_ncurses = ui_capabilities["TextMode"]:true;; term profile_contents_text = nil; Modified: trunk/apparmor/src/include/apparmor/capabilities.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/ca… ============================================================================== --- trunk/apparmor/src/include/apparmor/capabilities.ycp (original) +++ trunk/apparmor/src/include/apparmor/capabilities.ycp Wed Nov 16 12:37:48 2011 @@ -41,19 +41,15 @@ "fowner" : $[ "name" : "CAP_FOWNER", - "info" : _("<ul><li>Overrides all restrictions about allowed operations on files, -where file owner ID must be equal to the user ID, except where CAP_FSETID is -applicable. It doesn't override MAC and DAC restrictions. </li></ul>"), + "info" : _("<ul><li>Overrides all restrictions on allowed operations on files, where file +owner ID must be equal to the user ID, except where CAP_FSETID is +applicable. It does not override MAC and DAC restrictions. </li></ul>"), ], "fsetid" : $[ "name" : "CAP_FSETID", - "info" : _("<ul><li>Overrides the following restrictions that the effective user -ID shall match the file owner ID when setting the S_ISUID and S_ISGID bits on that -file; that the effective group ID (or one of the supplementary group IDs) shall match -the file owner ID when setting the S_ISGID bit on that file; that the S_ISUID and -S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li></ul>"), + "info" : _("<ul><li>Overrides the following restrictions: user ID must match the file owner ID when setting the S_ISUID and S_ISGID bits on that file; the effective group ID (or one of the supplementary group IDs) must match the file owner ID when setting the S_ISGID bit on that file; the S_ISUID and S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li></ul>"), ], "kill" : @@ -134,8 +130,8 @@ "ipc_lock" : $[ "name" : "CAP_IPC_LOCK", - "info" : _("<ul><li> Allows locking of shared memory segments</li> -<li> Allows mlock and mlockall (which doesn't really have anything to do with IPC) </li></ul>"), + "info" : _("<ul><li> Allows locking of shared memory segments</li> <li> Allows mlock and +mlockall (which does not really have anything to do with IPC) </li></ul>"), ], "ipc_owner" : Modified: trunk/apparmor/src/include/apparmor/config_complain.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/co… ============================================================================== --- trunk/apparmor/src/include/apparmor/config_complain.ycp (original) +++ trunk/apparmor/src/include/apparmor/config_complain.ycp Wed Nov 16 12:37:48 2011 @@ -38,7 +38,7 @@ } else if ( profile != "" ) { profCmd["profile"] = profile; } else { - Popup::Error( _("Couldn't recognize profile name: ") + profile ); + Popup::Error( _("Could not recognize profile name: ") + profile ); return; } @@ -50,7 +50,7 @@ profCmd["mode"] = "enforce"; } else { error = true; - Popup::Error( _("Couldn't recognize mode: ") + mode ); + Popup::Error( _("Could not recognize mode: ") + mode ); } } else if ( id != `toggle ) { profCmd["mode"] = mode; @@ -211,7 +211,7 @@ } else if ( id == `table ) { - Popup::Message( _("Please select an action to perform from the buttons below.") ); + Popup::Message( _("Select an action to perform.") ); } else { y2error("Unexpected return code: %1", id); Modified: trunk/apparmor/src/include/apparmor/profile_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/pr… ============================================================================== --- trunk/apparmor/src/include/apparmor/profile_dialogs.ycp (original) +++ trunk/apparmor/src/include/apparmor/profile_dialogs.ycp Wed Nov 16 12:37:48 2011 @@ -245,11 +245,11 @@ `HBox( `VSpacing( 10 ), `HSpacing( 0.75 ), - `Frame( _("Profile Entry For ") + profile, + `Frame( _("Profile Entry for ") + profile, `HBox( `HWeight( 60, `VBox( - `TextEntry(`id(`filename), _("Enter or modify Filename")), + `TextEntry(`id(`filename), _("Enter or Modify Filename")), `HCenter(`PushButton(`id(`browse), _("&Browse") )) ) ), @@ -501,7 +501,7 @@ filename = tostring( UI::QueryWidget(`id(`filename), `Value) ); UI::CloseDialog(); if ( filename == "" || newperms == "" ) { - Popup::Error(_("Entry will not added. Entry name or permissions not defined.")); + Popup::Error(_("Entry will not be added. Entry name or permissions not defined.")); results = nil; } else { results = $[ "PERM": newperms, "FILE": filename ]; @@ -696,7 +696,9 @@ `Top( `VBox( `VSpacing(1), - `Left(`Label( _("Please enter the name of the Hat that you would like \nto add to the profile") + " " + parentProfile + ".")), + `Left(`Label( _("Enter the name of the Hat that you would like +to add to the profile +") + " " + parentProfile + ".")), `VSpacing(0.5), `Left( `TextEntry( @@ -728,8 +730,7 @@ Popup::Error(_("You have not given a name for the hat you want to add.\nPlease enter a hat name to create a new hat, or press Abort to cancel this wizard.")); } else if ( haskey( currentHats, hatname ) ) { - Popup::Error(_("The profile already contains the provided hat name. -Please enter a different name to try again, or press Abort to cancel this wizard.")); + Popup::Error(_("The profile already contains the provided hat name. Enter a different name or press Abort to cancel this wizard.")); } else { Settings["CURRENT_HAT"] = hatname; UI::CloseDialog(); @@ -763,8 +764,7 @@ // FIXME: format these texts better /* help text */ - string help1 = _("In this form you can view and modify the contents of an individual profile. -For existing entries you can double click the permissions to access a modification dialog."); + string help1 = _("View and modify the contents of an individual profile. For existing entries double click the permissions to access a modification dialog."); /* help text */ string help2 = _("Permission Definitions: <code> r - read @@ -777,11 +777,11 @@ string help3 = _("Add Entry: Select the type of resource to add from the drop down list."); /* help text - part x1 */ - string help4 = _("<ul><li>File Add a file entry to this profile</li>"); + string help4 = _("<ul><li>File Add a file entry to this profile.</li>"); /* help text - part x2 */ - string help5 = _("<li>Directory Add a directory entry to this profile</li>"); + string help5 = _("<li>Directory Add a directory entry to this profile.</li>"); /* help text - part x3 */ - string help6 = _("<li>Capability Add a capability entry to this profile</li>"); + string help6 = _("<li>Capability Add a capability entry to this profile.</li>"); /* help text - part x4 */ string help7 = _("<li>Include Add an include entry to this profile. This option includes the profile entry contents of another file in this profile at load time.</li>"); @@ -790,11 +790,11 @@ This option will allow you to specify network access privileges for the profile. You may specify a network address family and socket type.</li>"); /* help text - part x6 */ - string helpHat = _("<li>Hat Add a sub-profile for this profile - called a Hat. -This option is analogous to manually creating a new profile, which can selected -during execution only in the context of being asked for by a changehat aware -application. For more information on changehat please see man changehat on your -system or the Novell AppArmor Administration Guide.</li>"); + string helpHat = _("<li>Hat Add a sub-profile for this profile, called a Hat. This +option is analogous to manually creating a new profile, which can be selected +during execution only in the context of being asked for by a changehat +aware application. +For more information on changehat, see man changehat on your system or the Novell AppArmor Administration Guide.</li>"); /* help text - part x7 */ string helpEdit = _("</ul>Edit Entry: Edit the selected entry."); @@ -880,7 +880,7 @@ caps = capabilityEntryPopup( caps, rule, pathname ); profile["allow", "capability"] = caps; } else if ( findinc == 0 ) { - Popup::Error(_("Include entries can not be edited. Please select add or delete to manage Include entries.")); + Popup::Error(_("Include entries can not be edited. Select add or delete to manage Include entries.")); continue; } else if ( findhat == 0 ) { string hatToEdit = substring( rule, 5); @@ -997,7 +997,7 @@ } } else if ( id == `include ) { list <string> customIncludes = (list <string>) SCR::Read(.apparmor, "custom-includes"); - string newInclude = UI::AskForExistingFile( "/etc/apparmor.d/abstractions", "", _("Select File To Include")); + string newInclude = UI::AskForExistingFile( "/etc/apparmor.d/abstractions", "", _("Select File to Include")); if ( newInclude == nil || (string)newInclude == "" ) { continue; } @@ -1054,8 +1054,10 @@ break; } else if ( id == `next ) { if ( ! hat ) { - if (Popup::YesNoHeadline(_("Save changes to the Profile"), - _("Would you like to save the changes to this profile? \n(Note: after saving the changes the AppArmor profiles will be reloaded.)"))) { + if (Popup::YesNoHeadline(_("Save changes to the profile"), + _("Save the changes to this profile? +(Note: after saving, AppArmor profiles will be reloaded.) +"))) { map argmap = $[ "PROFILE_HASH" : Settings["PROFILE_MAP"]:$[], "PROFILE_NAME" : pathname ]; @@ -1131,7 +1133,7 @@ if ( profilename != nil && profilename != "" ) { break; } else { - Popup::Error(_("You must select a profile to edit")); + Popup::Error(_("You must select a profile to edit.")); continue; } } // TODO ELSE POPUP NO ENTRY SELECTED ERROR Modified: trunk/apparmor/src/include/apparmor/report_helptext.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/re… ============================================================================== --- trunk/apparmor/src/include/apparmor/report_helptext.ycp (original) +++ trunk/apparmor/src/include/apparmor/report_helptext.ycp Wed Nov 16 12:37:48 2011 @@ -84,12 +84,6 @@ /* START Help Section ************************************************************/ -string repGenHelpText = _("Generate Reports Help If there were, in fact, -going to be any help for you (which, incidentally, there isn't going to be), -then you would indeed find said help, here.Thank you for your time, -and have a nice day."); - - string schedHelpText = _("The summary of scheduled reports page shows us when reports are scheduled to run. @@ -99,13 +93,8 @@ _("In the Set Schedule section, you can schedule the following three types of security reports: ") + types; -string archHelpText = _("The View Archive Reports form enables you to view -previously generated reports, located in the /var/log/apparmor/reports-archived -directory. The checkboxes at the top of the form enable you to narrow-down -the category of reports shown in the list to the following: SIR Reports, AUD -Reports, or ESS Reports. To see report details, select a report and click the -View button. You can view reports from one or more systems if -you move the reports to the /var/log/apparmor/reports-archived directory."); +string archHelpText = _("The View Archive Reports form enables you to view previously generated +reports located in the /var/log/apparmor/reports-archived directory. Use the checkboxes at the top to narrow-down the category of reports shown in the list to: SIR Reports, AUD Reports or ESS Reports. To see report details, select a report and click the View button. You can view reports from one or more systems if you move the reports to the /var/log/apparmor/reports-archived directory."); string mainHelp = schedHelpText; @@ -114,7 +103,6 @@ term defaultHelp = `RichText ( schedHelpText ); term schedHelp = `RichText ( schedHelpText ); -term repGenHelp = `RichText ( repGenHelpText ); term archHelp = `RichText ( archHelpText ); term otherHelp = `RichText ( archHelpText ); @@ -134,15 +122,7 @@ Select the report from the archive, then View to see the report details."); -string audHelp = _("Applications Audit Report (AUD): An auditing tool -that reports which application servers are running and whether they are confined -by AppArmor. Application servers are applications that accept incoming network -connections. This report provides the host machine's IP Address, the date the -Applications Audit Report ran, the name and path of the unconfined program or -application server, the suggested profile or a placeholder for a profile for an -unconfined program, the process ID number, The state of the program (confined or -unconfined), and the type of confinement that the profile is performing -(enforce/complain)."); +string audHelp = _("Applications Audit Report (AUD): An auditing tool that reports which application servers are running and whether they are confined by AppArmor. Application servers are applications that accept incoming network connections. This report provides the host machine's IP Address, the date the Applications Audit Report ran, the name and path of the unconfined program or application server, the suggested profile or a placeholder for a profile for an unconfined program, the process ID number, the state of the program (confined or unconfined) and the type of confinement that the profile is performing (enforce/complain)."); string essHelp = _("Executive Security Summary (ESS): A combined report, consisting of one or more high-level reports from one or more machines. This Modified: trunk/apparmor/src/include/apparmor/reporting_archived_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/re… ============================================================================== --- trunk/apparmor/src/include/apparmor/reporting_archived_dialogs.ycp (original) +++ trunk/apparmor/src/include/apparmor/reporting_archived_dialogs.ycp Wed Nov 16 12:37:48 2011 @@ -183,12 +183,12 @@ } if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } //////////////////////////////////////////////////////////// Modified: trunk/apparmor/src/include/apparmor/reporting_dialogues.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/apparmor/re… ============================================================================== --- trunk/apparmor/src/include/apparmor/reporting_dialogues.ycp (original) +++ trunk/apparmor/src/include/apparmor/reporting_dialogues.ycp Wed Nov 16 12:37:48 2011 @@ -132,7 +132,7 @@ // de-i18n if ( weekday == _("Mon") ) { weekday = "Mon"; } if ( weekday == _("Tue") ) { weekday = "Tue"; } - if ( weekday == _("Weds") ) { weekday = "Weds"; } + if ( weekday == _("Wed") ) { weekday = "Weds"; } if ( weekday == _("Thu") ) { weekday = "Thu"; } if ( weekday == _("Fri") ) { weekday = "Fri"; } if ( weekday == _("Sat") ) { weekday = "Sat"; } @@ -669,12 +669,12 @@ string end_time = tostring(end_hour) + ":" + tostring(end_min); if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } @@ -710,7 +710,8 @@ }); string help1 = _("AppArmor Security Events - This table displays the events found that match your search criteria."); +This table displays the events that match your search criteria. +"); // DBG y2milestone("in MainReportForm"); @@ -1018,12 +1019,12 @@ string end_time = tostring(end_hour) + ":" + tostring(end_min); if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } @@ -1794,7 +1795,7 @@ // de-i18n if ( weekday == _("Mon") ) { weekday = "Mon"; } if ( weekday == _("Tue") ) { weekday = "Tue"; } - if ( weekday == _("Weds") ) { weekday = "Weds"; } + if ( weekday == _("Wed") ) { weekday = "Weds"; } if ( weekday == _("Thu") ) { weekday = "Thu"; } if ( weekday == _("Fri") ) { weekday = "Fri"; } if ( weekday == _("Sat") ) { weekday = "Sat"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66825 - /tags/stable-2_22_0/ldap-client/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:32:26 2011 New Revision: 66825 URL: http://svn.opensuse.org/viewcvs/yast?rev=66825&view=rev Log: Created tag stable-2_22_0 for ldap-client Added: tags/stable-2_22_0/ldap-client/ - copied from r66824, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66824 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/LdapPopup.ycp src/ui.ycp
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:32:06 2011 New Revision: 66824 URL: http://svn.opensuse.org/viewcvs/yast?rev=66824&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=66824&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Nov 16 12:32:06 2011 @@ -1 +1 @@ -2.21.11 +2.22.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Nov 16 12:32:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:31:32 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 29 12:41:38 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=668… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Nov 16 12:32:06 2011 @@ -1005,11 +1005,11 @@ // error message, more specific description follows "read": _("A problem occurred while reading data from the LDAP server."), // error message, more specific description follows - "users": _("There was a problem with writing LDAP users."), + "users": _("A problem occurred while writing LDAP users."), // error message, more specific description follows - "groups": _("There was a problem with writing LDAP groups."), + "groups": _("A problem occurred while writing LDAP groups."), // error message, more specific description follows - "write": _("There was a problem with writing data to the LDAP server."), + "write": _("A problem occurred while writing data to the LDAP server."), // error message, more specific description follows "schema": _("A problem occurred while reading schema from the LDAP server."), ]; Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed Nov 16 12:32:06 2011 @@ -574,7 +574,7 @@ `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + // help text for pwdMustChange attribute - _("Check User Must Change Password after Reset to force users to change their passwords after the the password is reset or changed by an administrator.") + + _("Check User Must Change Password after Reset to force users to change their passwords after the password is reset or changed by an administrator.") + // help text for pwdAllowUserChange attribute _("Check User Can Change Password to allow users to change their passwords.") + @@ -583,7 +583,7 @@ _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be evaluated. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + // help text for pwdMinLength attribute _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), @@ -595,7 +595,7 @@ _("Maximum Password Age sets how long after modification a password expires.") + // help text for pwdExpireWarning attribute - _("In Time before Password Expiration to Issue Warning set how long before a password is due to expire that an expiration warning messages should be given to an authenticating user.") + + _("In Time before Password Expiration to Issue Warning specify how long\nbefore expiration an authenticating user should be warned.") + // help text for pwdGraceAuthNLimit attribute _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), @@ -607,10 +607,10 @@ _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + // help text for pwdLockoutDuration attribute - _("Set how long the password cannot be used in Password Lock Duration.") + + _("Set for how long the password cannot be used in Password Lock Duration.") + // help text for pwdFailureCountInterval attribute - _("Bind Failures Cache Duration sets how long before password failures are purged from the failure counter even though no successful authentication has occurred."), + _("Bind Failures Cache Duration specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred."), ]; // map of attribute names for each tab @@ -764,7 +764,7 @@ `VSpacing (0.2), `IntField (`id ("pwdGraceAuthNLimit"), // IntField label - _("Allowed Uses of an Expired Password"), 0, max, + _("Allowed Use of an Expired Password"), 0, max, tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") ) ), `HSpacing (0.5))); Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=66824… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Nov 16 12:32:06 2011 @@ -165,8 +165,7 @@ define symbol LdapDialog () { // help text 1/9 - string help_text = _("Here, your machine can be set up as an -LDAP client. + string help_text = _("Set up your machine as an LDAP client. ") + // help text 2/9 @@ -197,20 +196,19 @@ // help text 6/9 _("Some LDAP servers support StartTLS (RFC2830). If your server supports it and it is configured, activate LDAP TLS/SSL -to encrypt your communication with the LDAP server. You may download CA certificate file in PEM format from given URL. +to encrypt your communication with the LDAP server. You may download a CA +certificate file in PEM format from a given URL. ") + // help text 8/9 - _("For configuration of advanced LDAP settings, click + _("To configure advanced LDAP settings, click Advanced Configuration. "); // help text 9/9 (additional) - string autofs_help_text = _("Automounter is a daemon that automatically mounts directories, -such as users' home directories. -It is assumed that its configuration files (auto.*) already exist -locally or over LDAP. -If it is not installed and you want to use it, it is installed -automatically. + string autofs_help_text = _("Automounter is a daemon that automatically mounts directories, such +as users' home directories. Its configuration files (auto.*) should already +exist locally or over LDAP. If the automounter is not installed yet but you +want to use it, it will be installed automatically. "); @@ -460,7 +458,8 @@ '%1' -was copied to '%2' directory"), name, dir)); +has been copied to '%2' directory. +"), name, dir)); Ldap::tls_cacertdir = dir; Ldap::modified = true; @@ -672,7 +671,7 @@ ")) + // help text 2/3 - _("Password Change Protocol refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.") + + _("Password Change Protocol refers to the pam_password attribute of the\n<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.") + // help text 3/3, %1 is attribute name sformat (_("Set the type of LDAP groups to use. @@ -680,7 +679,7 @@ "), "member") + - _("If secure connection requires certificate checking, you may specify where is your certificate file located. It is possible to enter either directory with certificates, or the explicit path to one certificate file.") + + _("If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file.") + // help text 7/9 _("Normally, the LDAP version 3 protocol is used. If you have @@ -695,14 +694,14 @@ // help text 1/4 _("First, set Configuration Base DN. -It is the base for storing your configuration data, which is saved on the LDAP +This is the base for storing your configuration data on the LDAP server. ") + // help text 2/4 _("To access the data stored on the server, enter the Administrator DN. -You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just +You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked. ") + @@ -723,7 +722,7 @@ // help text 1/1 _("If home directories of users should be stored on this machine, check the appropriate option. Changing this value does not cause any direct -action. It is only information for the YaST users module, which can manage +action. It is only information for the YaST users module, which manages user home directories. ") + @@ -731,7 +730,9 @@ _("Password Policy") + // password policy help - _("Configure the selected password policy with Edit. Use Add to add a new password policy. The configuration is only possible,\n if the password policies are already enabled on the LDAP server.") + _("Configure the selected password policy with Edit. Use Add to +add a new password policy. Password policies must be enabled on the LDAP server. +") ]; string bind_dn = Ldap::bind_dn; @@ -1482,8 +1483,8 @@ define map<string,any> TemplateConfigurationDialog (map templ) { // help text 1/3 - string help_text = _("Here, configure the template used for -creating new objects (like users or groups). + string help_text = _("Configure the template used for creating +new objects (like users or groups). ") + // help text 2/3 @@ -1492,8 +1493,8 @@ ") + // help text 3/3 - _("The second table contains a list of default values, used -for new objects. Modify the list by adding new values and editing or + _("The second table contains a list of default values used +for new objects. Modify the list by adding new values, editing or removing current ones. "); @@ -1709,7 +1710,7 @@ define symbol ModuleConfigurationDialog () ``{ // helptext 1/4 - string help_text = _("Here, manage the configuration stored in LDAP directory.") + + string help_text = _("Manage the configuration stored in the LDAP directory.") + // helptext 2/4 _("Each configuration set is called a \"configuration module.\" If there @@ -1929,8 +1930,9 @@ if (available == []) { // message - Popup::Message (_("You currently have configuration modules -of each type, so you cannot add a new one.")); + Popup::Message (_("You currently have a configuration module of each +type, therefore you cannot add a new one. +")); continue; } // get new name and class -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0