Author: jsuchome Date: Wed Aug 15 12:57:25 2007 New Revision: 40282 URL: http://svn.opensuse.org/viewcvs/yast?rev=40282&view=rev Log: - messages from proofread merged back - 2.15.24 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/pkg/NCPkgNames.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=40282&r1=40281&r2=40282&view=diff ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Wed Aug 15 12:57:25 2007 @@ -1 +1 @@ -2.15.23 +2.15.24 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.changes?rev=40282&r1=40281&r2=40282&view=diff ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Aug 15 12:57:25 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 15 12:50:03 CEST 2007 - jsuchome@suse.cz + +- messages from proofread merged back +- 2.15.24 + +------------------------------------------------------------------- Fri Aug 10 17:44:45 CEST 2007 - mvidner@suse.cz - Finished integrating Feature #120292, UI as a namespace callable Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?rev=40282&r1=40281&r2=40282&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Wed Aug 15 12:57:25 2007 @@ -1496,7 +1496,7 @@ const string NCPkgNames::HelpOnStatus2() { // part 1 of help text package status - static const string value = _( "<p>By default, the package dependencies are checked with every status change. You will be informed about package conflicts and additionally required packages will be selected (the menu item <i>Etc.</i>/<i>Dependencies</i> offers different settings). To resolve conflict, select one of the offered solution and press 'OK -- Try Again'.</p>" ); + static const string value = _( "<p>By default, the package dependencies are checked with every status change. You will be informed about package conflicts and additionally required packages will be selected (the menu item <i>Etc.</i>/<i>Dependencies</i> offers different settings). To resolve the conflict, select one of the offered solution and press 'OK -- Try Again'.</p>" ); return value; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org