[yast-commit] r67951 - /trunk/ncurses-pkg/src/

Author: gs Date: Tue Apr 17 12:17:22 2012 New Revision: 67951 URL: http://svn.opensuse.org/viewcvs/yast?rev=67951&view=rev Log: merged text from proof-read Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgFilterLocale.cc trunk/ncurses-pkg/src/NCPkgFilterMain.cc trunk/ncurses-pkg/src/NCPkgFilterPattern.cc trunk/ncurses-pkg/src/NCPkgFilterRepo.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgMenuAction.cc trunk/ncurses-pkg/src/NCPkgMenuDeps.cc trunk/ncurses-pkg/src/NCPkgMenuExtras.cc trunk/ncurses-pkg/src/NCPkgMenuFilter.cc trunk/ncurses-pkg/src/NCPkgMenuHelp.cc trunk/ncurses-pkg/src/NCPkgMenuView.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPatchSearch.cc trunk/ncurses-pkg/src/NCPkgPopupDeps.cc trunk/ncurses-pkg/src/NCPkgStrings.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Apr 17 12:17:22 2012 @@ -973,7 +973,7 @@ } case Summary: { - inst_summary = new NCPkgFilterInstSummary( replPoint, _("&Packages with Status"), this ); + inst_summary = new NCPkgFilterInstSummary( replPoint, _( "&Packages with Status" ), this ); inst_summary->setSize( oldSize.Sze.W, oldSize.Sze.H ); inst_summary->Redraw(); inst_summary->setKeyboardFocus(); @@ -1158,8 +1158,8 @@ NCPopupInfo * spaceMsg = new NCPopupInfo( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), NCPkgStrings::ErrorLabel(), NCPkgStrings::DiskSpaceError() + "<br>" + message + - _("You can choose to install anyway, but you risk getting a corrupted system."), - _("&Continue anyway"), + _( "You can choose to install anyway, but you risk getting a corrupted system." ), + _( "&Continue anyway" ), NCPkgStrings::CancelLabel() ); spaceMsg->setPreferredSize( 50, 10 ); @@ -1353,7 +1353,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), // headline of a popup showing the package license - _("End User License Agreement"), + _( "End User License Agreement" ), "<i>" + pkgName + "</i><br><br>" + html_text, NCPkgStrings::AcceptLabel(), @@ -1557,7 +1557,7 @@ YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); + helpMenu = new NCPkgMenuHelp (ll, _( "&Help" ), this); YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); @@ -1593,7 +1593,7 @@ //Add only if requested by `opt(`repoMgr) flag - #381956 if (isRepoMgrEnabled()) - configMenu = new NCPkgMenuConfig( menu_buttons, _("C&onfiguration"), this); + configMenu = new NCPkgMenuConfig( menu_buttons, _( "C&onfiguration" ), this); extrasMenu = new NCPkgMenuExtras( menu_buttons, NCPkgStrings::Extras(), this); @@ -1660,7 +1660,7 @@ //Bottom button bar YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); + helpMenu = new NCPkgMenuHelp (ll, _( "&Help" ), this); YUI_CHECK_NEW( helpMenu ); //right-alignment for OK-Cancel Modified: trunk/ncurses-pkg/src/NCPkgFilterLocale.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocale.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.cc Tue Apr 17 12:17:22 2012 @@ -173,7 +173,7 @@ ostringstream s; //Translators: %s is a locale code, e.g. en_GB - s << boost::format( _( "Translations, dictionaries and other language related files for <b>%s</b> locale")) % myLocale.locale().code(); + s << boost::format( _( "Translations, dictionaries and other language-related files for <b>%s</b> locale" )) % myLocale.locale().code(); packager->FilterDescription()->setText( s.str() ); packageList->setCurrentItem( 0 ); Modified: trunk/ncurses-pkg/src/NCPkgFilterMain.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterMain.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterMain.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterMain.cc Tue Apr 17 12:17:22 2012 @@ -63,23 +63,23 @@ void NCPkgFilterMain::createLayout() { - patterns = new YItem( _("Patterns") ); + patterns = new YItem( _( "Patterns" ) ); items.push_back( patterns ); - languages = new YItem( _("Languages") ); + languages = new YItem( _( "Languages" ) ); items.push_back( languages ); - rpmgroups = new YItem( _("RPM Groups") ); + rpmgroups = new YItem( _( "RPM Groups" ) ); items.push_back( rpmgroups ); - repositories = new YItem( _("Repositories") ); + repositories = new YItem( _( "Repositories" ) ); items.push_back( repositories ); - search = new YItem( _("Search") ); + search = new YItem( _( "Search" ) ); search->setSelected(); items.push_back( search ); - inst_summary = new YItem( _("Installation Summary") ); + inst_summary = new YItem( _( "Installation Summary" ) ); items.push_back( inst_summary ); addItems( items ); Modified: trunk/ncurses-pkg/src/NCPkgFilterPattern.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterPattern.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterPattern.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterPattern.cc Tue Apr 17 12:17:22 2012 @@ -177,7 +177,7 @@ ostringstream s; - s << boost::format( _("%d of %d package installed", "%d of %d packages installed", total )) % installed % total; + s << boost::format( _( "%d of %d package installed", "%d of %d packages installed", total )) % installed % total; packager->PatternLabel()->setLabel ( s.str() ); Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRepo.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRepo.cc Tue Apr 17 12:17:22 2012 @@ -191,10 +191,10 @@ string ret = ""; if ( r.isSystemRepo()) - ret = _("<b>@System</b>: local RPM database"); + ret = _( "<b>@System</b>: local RPM database" ); else { - string label = _("<b>Repository URL:</b>"); + string label = _( "<b>Repository URL:</b>" ); zypp::Url srcUrl; if ( ! r.info().baseUrlsEmpty() ) srcUrl = *(r).info().baseUrlsBegin(); Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearch.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Tue Apr 17 12:17:22 2012 @@ -130,13 +130,13 @@ } NCAlignment *left2 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); - searchMode = new NCComboBox (left2, _("Search &Mode"), false); + searchMode = new NCComboBox (left2, _( "Search &Mode" ), false); - searchMode->addItem( _("Contains"), false); - searchMode->addItem( _("Begins with"), false); - searchMode->addItem( _("Exact Match"), false); - searchMode->addItem( _("Use Wildcards"), false); - searchMode->addItem( _("Use RegExp"), false); + searchMode->addItem( _( "Contains" ), false); + searchMode->addItem( _( "Begins with" ), false); + searchMode->addItem( _( "Exact Match" ), false); + searchMode->addItem( _( "Use Wildcards" ), false); + searchMode->addItem( _( "Use RegExp" ), false); new NCSpacing( vSplit, YD_VERT, true, 0.5 ); } @@ -243,7 +243,7 @@ NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2 ), "", - _("Searching...") + _( "Searching..." ) ); info->setPreferredSize( 18, 4 ); info->popup(); @@ -264,7 +264,7 @@ NCPkgStrings::ErrorLabel(), // Popup informs the user that the query string // entered for package search isn't correct - _("Query Error:") + ("<br>") + e.what(), + _( "Query Error:" ) + ("<br>") + e.what(), NCPkgStrings::OKLabel() ); info->setPreferredSize( 50, 10 ); info->showInfoPopup(); @@ -277,7 +277,7 @@ int found_pkgs = packageList->getNumLines(); ostringstream s; - s << boost::format( _( "%d packages found")) % found_pkgs; + s << boost::format( _( "%d packages found" )) % found_pkgs; packager->PatternLabel()->setText( s.str() ); // show the package list Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuAction.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuAction.cc Tue Apr 17 12:17:22 2012 @@ -88,7 +88,7 @@ installAllItem = new YMenuItem( allItem, _( "&Install All" ) ); deleteAllItem = new YMenuItem( allItem, _( "&Delete All" ) ); keepAllItem = new YMenuItem( allItem, _( "&Keep All" ) ); - updateAllItem = new YMenuItem( allItem, _( "U&pdate All Unconditionally") ); + updateAllItem = new YMenuItem( allItem, _( "U&pdate All Unconditionally" ) ); // end: submenu items: actions concerning all packages updateNewerItem = new YMenuItem( allItem, _( "&Update If Newer Version Available" ) ); Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Tue Apr 17 12:17:22 2012 @@ -75,21 +75,21 @@ void NCPkgMenuDeps::createLayout() { - autoCheckDeps = new YMenuItem( CHECK_BOX + _("&Automatic Dependency Check") ); + autoCheckDeps = new YMenuItem( CHECK_BOX + _( "&Automatic Dependency Check" ) ); items.push_back( autoCheckDeps ); setSelected( autoCheckDeps, pkg->isAutoCheck() ); - checkNow = new YMenuItem( NO_CHECK_BOX + _("&Check Dependencies Now") ); + checkNow = new YMenuItem( NO_CHECK_BOX + _( "&Check Dependencies Now" ) ); items.push_back( checkNow ); - verifySystem = new YMenuItem( NO_CHECK_BOX + _("&Verify System Now") ); + verifySystem = new YMenuItem( NO_CHECK_BOX + _( "&Verify System Now" ) ); items.push_back( verifySystem ); - ignoreAlreadyRecommendedOpt = new YMenuItem( CHECK_BOX + _("&Ignore Recommended Packages for Already Installed Packages") ); + ignoreAlreadyRecommendedOpt = new YMenuItem( CHECK_BOX + _( "&Ignore Recommended Packages for Already Installed Packages" ) ); items.push_back( ignoreAlreadyRecommendedOpt ); setSelected( ignoreAlreadyRecommendedOpt, pkg->isIgnoreAlreadyRecommended() ); - verifySystemOpt = new YMenuItem( CHECK_BOX + _("&System Verification Mode") ); + verifySystemOpt = new YMenuItem( CHECK_BOX + _( "&System Verification Mode" ) ); items.push_back( verifySystemOpt ); cleanDepsOnRemove = new YMenuItem( CHECK_BOX + _( "&Cleanup when deleting packages" ) ); @@ -100,7 +100,7 @@ items.push_back ( allowVendorChange ); setSelected( allowVendorChange, pkg->isAllowVendorChange() ); - testCase = new YMenuItem( NO_CHECK_BOX + _("&Generate Dependency Solver Testcase") ); + testCase = new YMenuItem( NO_CHECK_BOX + _( "&Generate Dependency Solver Testcase" ) ); items.push_back( testCase ); addItems( items ); @@ -170,7 +170,7 @@ { NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), "", - _("Dependency resolver test case written to ") + "<br>" + _( "Dependency resolver test case written to " ) + "<br>" + testCaseDir ); info->setPreferredSize( 40, 8 ); Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuExtras.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuExtras.cc Tue Apr 17 12:17:22 2012 @@ -73,13 +73,13 @@ void NCPkgMenuExtras::createLayout() { - exportFile = new YMenuItem( _("&Export Package List to File") ); + exportFile = new YMenuItem( _( "&Export Package List to File" ) ); items.push_back( exportFile ); - importFile = new YMenuItem( _("&Import Package List from File") ); + importFile = new YMenuItem( _( "&Import Package List from File" ) ); items.push_back( importFile ); - diskSpace = new YMenuItem( _("&Show Available Disk Space") ); + diskSpace = new YMenuItem( _( "&Show Available Disk Space" ) ); items.push_back( diskSpace ); addItems( items ); @@ -186,7 +186,7 @@ { //Ask for file to save into string filename = YUI::app()->askForSaveFileName( DEFAULT_EXPORT_FILE_NAME, "*.xml", - _("Export List of All Packages and Patterns to File" )); + _( "Export List of All Packages and Patterns to File" )); if ( ! filename.empty() ) { @@ -219,7 +219,7 @@ //present error popup to the user NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), NCPkgStrings::ErrorLabel(), - _("Error exporting list of packages and patterns to ") + _( "Error exporting list of packages and patterns to " ) // FIXME: String addition is evil for translators! + filename, NCPkgStrings::OKLabel(), @@ -241,7 +241,7 @@ //ask for file to open string filename = YUI::app()->askForExistingFile( DEFAULT_EXPORT_FILE_NAME, "*.xml", - _("Import List of All Packages and Patterns from File")); + _( "Import List of All Packages and Patterns from File" )); if ( ! filename.empty() ) { NCPkgTable * packageList = pkg->PackageList(); @@ -305,7 +305,7 @@ NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , NCPkgStrings::ErrorLabel(), - _("Error importing list of packages and patterns from ") + _( "Error importing list of packages and patterns from " ) // FIXME: String addition is evil for translators! + filename, NCPkgStrings::OKLabel(), Modified: trunk/ncurses-pkg/src/NCPkgMenuFilter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuFilter.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuFilter.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuFilter.cc Tue Apr 17 12:17:22 2012 @@ -68,7 +68,7 @@ // and use unique hotkeys from begin: to end: // begin: needed = new YMenuItem( _( "&Needed Patches" ) ); - // _( "Re&levant Patches") + // _( "Re&levant Patches" ) // _( "&Satisfied Patches" ) ); unneeded = new YMenuItem( _( "&Unneeded Patches" ) ); allPatches = new YMenuItem( _( "&All Patches" ) ); Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.cc Tue Apr 17 12:17:22 2012 @@ -67,20 +67,20 @@ { if ( !pkg->isYouMode()) { - generalHelp = new YMenuItem( _("&General Help") ); + generalHelp = new YMenuItem( _( "&General Help" ) ); items.push_back( generalHelp ); - statusHelp = new YMenuItem( _("&Package Status and Symbols") ); + statusHelp = new YMenuItem( _( "&Package Status and Symbols" ) ); items.push_back( statusHelp ); - filterHelp = new YMenuItem( _("&How To Use the Filters") ); + filterHelp = new YMenuItem( _( "&How to Use the Filters" ) ); items.push_back( filterHelp ); - menuHelp = new YMenuItem( _("&Useful Functions in Menu") ); + menuHelp = new YMenuItem( _( "&Useful Functions in Menu" ) ); items.push_back( menuHelp ); } else { - patchHelp = new YMenuItem( _("&Patch Status and Patch Installation")); + patchHelp = new YMenuItem( _( "&Patch Status and Patch Installation" )); items.push_back ( patchHelp ); } Modified: trunk/ncurses-pkg/src/NCPkgMenuView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuView.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuView.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuView.cc Tue Apr 17 12:17:22 2012 @@ -67,12 +67,12 @@ { // begin: menu items of the view (package information) menu // please note: use unique hotkeys until end: - technical = new YMenuItem( _("&Technical data") ); - description = new YMenuItem( _("&Package Description") ); - versions = new YMenuItem( _("Package &Versions") ); - files = new YMenuItem( _("&File List") ); + technical = new YMenuItem( _( "&Technical Data" ) ); + description = new YMenuItem( _( "&Package Description" ) ); + versions = new YMenuItem( _( "Package &Versions" ) ); + files = new YMenuItem( _( "&File List" ) ); // end: menu items of the view menu - deps = new YMenuItem( _("&Dependencies") ); + deps = new YMenuItem( _( "&Dependencies" ) ); items.push_back( technical ); items.push_back( description ); @@ -90,7 +90,7 @@ patchDescription = new YMenuItem( _( "&Long Description" ) ); patchPackages = new YMenuItem( _( "&Package List" ) ); // end: menu items of the view menu - patchPkgVersions = new YMenuItem( _("&Versions") ); + patchPkgVersions = new YMenuItem( _( "&Versions" ) ); items.push_back( patchDescription ); items.push_back( patchPackages ); Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDetails.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Apr 17 12:17:22 2012 @@ -213,7 +213,7 @@ text += "<br>"; // name of the source package - text += "<b>" + _("Source Package: ") + "</b>"; + text += "<b>" + _( "Source Package: " ) + "</b>"; text += package->sourcePkgName(); text += "-"; text += package->sourcePkgEdition().asString(); @@ -254,7 +254,7 @@ } else - text = _("<i>This information is available for installed packages only</i>"); + text = _( "<i>This information is available for installed packages only.</i>" ); setValue(text); } @@ -429,7 +429,7 @@ descr += html_text; - descr += _("References:<br>"); + descr += _( "References:<br>" ); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); rit != patchPtr->referencesEnd(); ++rit ) Modified: trunk/ncurses-pkg/src/NCPkgPatchSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPatchSearch.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPatchSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPatchSearch.cc Tue Apr 17 12:17:22 2012 @@ -70,7 +70,7 @@ , searchExpr( 0 ) , packager( pkger ) { - createLayout( _("Search for Patches") ); + createLayout( _( "Search for Patches" ) ); } /////////////////////////////////////////////////////////////////// Modified: trunk/ncurses-pkg/src/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDeps.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDeps.cc Tue Apr 17 12:17:22 2012 @@ -169,7 +169,7 @@ left->setWeight(YD_VERT, 30 ); // the list containing the problems (the unresolved package dependencies) - problemw = new NCProblemSelectionBox( left, _("&Problems"), this); + problemw = new NCProblemSelectionBox( left, _( "&Problems" ), this); problemw->setStretchable( YD_HORIZ, true ); NCAlignment * left1 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); @@ -186,7 +186,7 @@ left2->setWeight( YD_VERT, 30 ); // the list containing the solutions of a dependency problem - solutionw = new NCSolutionSelectionBox ( left2, _("Possible &Solutions"), this); + solutionw = new NCSolutionSelectionBox ( left2, _( "Possible &Solutions" ), this); if ( this->preferredHeight() > 25 ) new NCSpacing( vSplit, YD_VERT, false, 1 ); @@ -353,7 +353,7 @@ if ( !((*ii)->details().empty()) ) // hint for the user: more information below - description += _(" see below"); + description += _( " see below" ); if ( showDetails ) { @@ -538,7 +538,7 @@ if ( details.empty() ) // hint for the user: there isn't any additional information // (for the currently selected solution of a dependency problem) - text = _("No further solution details available"); + text = _( "No further solution details available" ); else text = details; Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?rev=67951&r1=67950&r2=67951&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Tue Apr 17 12:17:22 2012 @@ -118,7 +118,7 @@ const string NCPkgStrings::HelpPkgGen1() { // part1 of help text package installation - static const string value = _( "<h3>Welcome to package selector</h3><p>This tool will help you to manage software installed on your system. You can install, update or remove single packages, as well as patterns (sets of packages serving certain purpose) or languages. Usually, you don't need to care about package dependencies when installing or removing anything - solver will do it for you. Package selector consists of three main parts: <b>filters, package table<b> and <b>menu</b>.</p>" ); + static const string value = _( "<h3>Welcome to the package selector</h3><p>This tool will help you to manage\nthe software on your system. You can install, update or remove single\npackages, as well as patterns (sets of packages serving certain purpose) or\nlanguages. Usually, you do not need to care about package dependencies when\ninstalling or removing anything, the solver will do it for you. The package selector consists of three main parts: <b>filters, package table<b> and <b>menu</b>.</p>" ); return value; } @@ -126,21 +126,21 @@ const string NCPkgStrings::HelpPkgGen2() { // part of help text package installation - static const string value = _( "<p><b>Filters</b> (left panel) are designed to make orientation in great amount of packages easier. They enable displaying e.g. only packages from certain repository, or in a selected pattern (for example, Games or C/C++ Development) as well as searching for particular keywords. More information on filters can be found in <i>How to use filters</i>.</p>" ); + static const string value = _( "<p><b>Filters</b> (left panel) are designed for easy orientation in a large\namount of packages. Use filters to display only packages from a certain\nrepository or in a selected pattern (for example, Games or C/C++ Development)\nor to search for particular keywords. More information on filters can be found in <i>How to use filters</i>.</p>" ); return value; } const string NCPkgStrings::HelpPkgGen3() { // additional help text for post installation - static const string value = _( "<p><b>Package table</b> is the main component of package selector. You will see a list of packages matching current filter (for example, selected RPM group or search result) there. Each line of package table has several columns:</p>" ); + static const string value = _( "<p><b>Package table</b> is the main component of the package selector. You\nwill see a list of packages matching the current filter (for example, the\nselected RPM group or search result). Each line of the package table has several columns:</p>" ); return value; } const string NCPkgStrings::HelpPkgGen4 () { // part2 of help text package installation - static const string value = _( "<ol><li>Package status ( for more information see <i>Package Status and Symbols</i> )</li><li>Package name</li><li>Package summary</li><li>Available version ( on some of the configured repositories )</li><li>Installed version( empty for not yet installed packages )</li><li>Package size</li></ol>" ); + static const string value = _( "<ol><li>Package status (for more information see <i>Package Status and\nSymbols</i>)</li> <li>Package name</li><li>Package summary</li><li>Available\nversion (in some of the configured repositories)</li> <li>Installed\nversion(empty for not yet installed packages)</li> <li>Package size</li></ol>" ); return value; } @@ -148,14 +148,14 @@ const string NCPkgStrings::HelpPkgGen5() { // part3 of help text package installation - static const string value = _( "<p><b>Actions</b> menu just below the table provides the possibilities to change the status of selected package (or all packages in the list), for example, to delete a package or select an additional package for installation. The status change can also be done directly by pressing the key specified in the menu item (for detailed information about the package status, see <i>Package Status and Symbols</i>).</p>" ); + static const string value = _( "<p>The <b>Actions</b> menu below the table allows you to change the status of a selected package (or all packages in the list), for example, to delete a package or select an additional package for installation. The status change can also be done directly by pressing the key specified in the menu item (for detailed information about the package status, see <i>Package Status and Symbols</i>).</p>" ); return value; } const string NCPkgStrings::HelpPkgGen6() { // part4 of help text package installation - static const string value = _( "<p><b>Menu</b> provides functions related to package dependencies handling, displaying relevant information on packages and several other useful actions, such as opening repository editor. For more information, see <i>Useful Functions in Menu</i>.</p>" ); + static const string value = _( "<p><b>Menu</b> provides functions related to the handling of package\ndependencies. Display relevant information on packages or perform actions like\nopening the repository editor. For more information, see <i>Useful Functions in Menu</i>.</p>" ); return value; } @@ -169,14 +169,14 @@ const string NCPkgStrings::HelpOnStatus1() { // part 1 of help text package status - static const string value = _( "<p>The package status can be changed using the <i>Actions</i> menu or the keys specified in the menu items. For example, use '+' to install an additional package.</p><p>The \"Taboo\" status means the package should never be installed. Similarly \"Locked\" status means that installed version of this package should always be kept.</p>" ); + static const string value = _( "<p>The package status can be changed using the <i>Actions</i> menu or the keys\nspecified in the menu items. For example, use '+' to install an additional\npackage.</p><p>The \"Taboo\" status means the package should never be\ninstalled. On the contrary, the \"Locked\" status means that the installed version of a package should always be kept.</p>" ); return value; } const string NCPkgStrings::HelpOnStatus2() { // part 2 of help text package status - static const string value = _( "<p>You can also use <b>RET</b> or <b>SPACE</b> to toggle the package status.The <i>Actions</i> menu also provides the possibility to change the status for all packages in the list (select 'All Listed Packages').</p>" ); + static const string value = _( "<p>You can also use <b>RET</b> or <b>SPACE</b> to toggle the package\nstatus. The <i>Actions</i> menu also allows you to change the status for all packages in the list (select 'All Listed Packages').</p>" ); return value; } const string NCPkgStrings::HelpOnStatus3() @@ -210,35 +210,35 @@ const string NCPkgStrings::HelpOnFilters1() { // help text package status - static const string value = _( "<p>Out of all available packages, <b>Filters</b> allow you to filter out only those you are interested in. Package filters are based on package properties (repository, RPM group), package \"containers\" (patterns, languages) or search results. Select the desired filter from the drop-down menu. Specific filters are described below.</p>" ); + static const string value = _( "<p><b>Filters</b> allow you to filter all available packages according to\nthe selected criteria. Package filters are based on package properties (repository, RPM group), package \"containers\" (patterns, languages) or search results. Select the desired filter from the drop-down menu. Specific filters are described below.</p>" ); return value; } const string NCPkgStrings::HelpOnFilters2() { // help text package status - static const string value = _( "<p><b>Patterns</b> describe the features and functions system should have (for example, X server or Console tools). Each pattern contains a set of packages it requires (must have), recommends (should have) and suggests (may have). If you trigger pattern for installation (update, deletion), solver will be run and change the status of subordinate packages accordingly.</p>" ); + static const string value = _( "<p><b>Patterns</b> describe the features and functions a system should have\n(for example, X server or Console tools). Each pattern contains a set of\npackages it requires (must have), recommends (should have) and suggests (may\nhave). If you select a pattern for installation, update, or deletion, the solver will run and change the status of subordinate packages accordingly.</p>" ); return value; } const string NCPkgStrings::HelpOnFilters3() { // help text package status - static const string value = _( "<p><b>Languages</b> are package containers very much like patterns. They contain packages with translations, dictionaries and other language-specific files for selected language. <b>RPM Groups</b> are however not package containers that can be installed. Instead, membership in certain RPM group is a property of package itself. They have hierarchical (tree) structure. <b>Repositories</b> filter enables displaying packages coming only from specific repository. </p>" ); + static const string value = _( "<p><b>Languages</b> are package containers very much like patterns. They\ncontain packages with translations, dictionaries and other language-specific\nfiles for a selected language. <b>RPM Groups</b> are not package containers\nthat can be installed. Instead, membership in a certain RPM group is a\nproperty of the package itself. They have a hierarchical (tree) structure. The\n<b>Repositories</b> filter displays packages available from a specific repository. </p>" ); return value; } const string NCPkgStrings::HelpOnFilters4() { // help text package search - static const string value = _( "<p>To use <b>Search</b> filter, enter a keyword (or part of keyword) for package search. For example, search for all 3D packages using expression \"3d\". It is also possible to search in package descriptions, RPM provides, or requires. Just select the appropriate check box. Start the search by hitting 'Search' button.</p>" ); + static const string value = _( "<p>To use the <b>Search</b> filter, enter a keyword (or part of keyword) for\nthe package search. For example, search for all 3D packages using the\nexpression \"3d\". You can also search in package descriptions, RPM provides or\nrequires. Select the appropriate check box and click the 'Search' button.</p>" ); return value; } const string NCPkgStrings::HelpOnFilters5() { // help text package status -static const string value = _( "<p><b>Installation summary</b> presents a summary of packages, whose status has changed in this session (for example, they were marked for installation, or removal), either by user, or automatically by the solver.</p>" ); +static const string value = _( "The <b>Installation summary</b> presents an overview of packages whose\nstatus has changed during this session (e.g. marked for installation or\nremoval), either by the user or automatically by the solver.</p>" ); return value; } @@ -251,13 +251,13 @@ const string NCPkgStrings::HelpPkgMenu1() { - static const string value = _( "<p><b>Dependencies:</b> This menu offers various actions related to package dependency handling. By default, the package dependencies are checked with every status change (<i>Automatic Dependency Check</i> is on) You will be informed about package conflicts in a dialog proposing possible conflict resolution. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'.</p>" ); + static const string value = _( "<p><b>Dependencies:</b> This menu offers various actions related to the\nhandling of package dependencies. By default, package dependencies are checked with every status change (<i>Automatic Dependency Check</i> is on). You will be informed about package conflicts in a dialog proposing possible conflict resolutions. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'.</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu2() { - static const string value = _( "<p>To disable dependency checking on every status change, toggle <i>Automatic Dependency Check</i> off. In that case, you can check dependencies manually by selecting <i>Check Dependencies Now</i> item. <i>Verify system</i> entry will check package dependencies and resolve conflicts non-interactively, marking missing packages for automatic installation, if necessary. For debugging purpose, you may use <i>Generate Dependency Solver Testcase</i>. It will dump package dependencies data into <tt>/var/log/YaST2/solverTestcase</tt> directory. This is usually what you need when asked for \"solver testcase\" in bugzilla.</p>" ); + static const string value = _( "<p>To disable dependency checking on every status change, toggle <i>Automatic\nDependency Check</i> off. You can check dependencies manually by selecting\n<i>Check Dependencies Now</i>. The <i>Verify system</i> entry will check\npackage dependencies and resolve conflicts non-interactively, marking missing\npackages for automatic installation if necessary. For debugging purposes, use\n<i>Generate Dependency Solver Testcase</i>. It will dump package dependencies\ndata into the directory <tt>/var/log/YaST2/solverTestcase</tt>. This is\nusually what you need when asked for a \"solver testcase\" in Bugzilla.</p>" ); return value; } @@ -268,13 +268,13 @@ } const string NCPkgStrings::HelpPkgMenu3() { - static const string value = _( "<p><b>View:</b> here you have the possibility to choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>" ); + static const string value = _( "<p><b>View:</b> Choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu4() { - static const string value = _("<p><b>Configuration:</b> this menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>"); + static const string value = _( "<p><b>Configuration:</b> this menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu5() @@ -315,19 +315,19 @@ const string NCPkgStrings::LangCode() { - static const string value = _("Code"); + static const string value = _( "Code" ); return value; } const string NCPkgStrings::LangName() { - static const string value = _("Language"); + static const string value = _( "Language" ); return value; } const string NCPkgStrings::RepoURL() { - static const string value = _("URL"); + static const string value = _( "URL" ); return value; } @@ -565,7 +565,7 @@ const string NCPkgStrings::LanguageDescription() { - static const string value = _( "Translations, dictionaries and other language related files for " ); + static const string value = _( "Translations, dictionaries and other language-related files for " ); return value; } @@ -601,14 +601,14 @@ { // help text online udpate // Do NOT translate 'recommended' and 'security'! because the patch kind is always shown as english text. - static const string value = _( "<p>Kind \"recommended\" means you should install the patch. \"security\" is a security patch and it is highly recommended to install it.</p>" ); + static const string value = _( "<p>Kind \"recommended\" means you should install the patch. \"security\" is a security patch and we highly recommend to install it.</p>" ); return value; } const string NCPkgStrings::YouHelp2() { // help text online udpate continue - static const string value = _( "<p>Patches for \"libzypp\" (Package, Patch, Pattern and Product Management) will be always installed first. The other patches must be installed on a second run.</p>" ); + static const string value = _( "<p>Patches for \"libzypp\" (Package, Patch, Pattern and Product Management) will\nalways get installed first. Other patches must be installed on a second run.</p>" ); return value; } @@ -691,7 +691,7 @@ const string NCPkgStrings::CancelText() { // text for a Notify popup - static const string value = _( "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>" ); + static const string value = _( "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" ); return value; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org