Hello community, here is the log from the commit of package yast2-packager checked in at Wed Aug 15 20:41:17 CEST 2007. -------- --- yast2-packager/yast2-packager.changes 2007-08-13 16:40:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-08-14 17:15:04.329346000 +0200 @@ -1,0 +2,13 @@ +Tue Aug 14 17:10:21 CEST 2007 - jsuchome@suse.cz + +- Merged proofread texts +- 2.15.61 + +------------------------------------------------------------------- +Tue Aug 14 11:00:20 CEST 2007 - jsuchome@suse.cz + +- double-click in the sources table toggles enabled/disabled status + (#299787) +- 2.15.60 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.59.tar.bz2 New: ---- yast2-packager-2.15.61.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.K27216/_old 2007-08-15 20:41:06.000000000 +0200 +++ /var/tmp/diff_new_pack.K27216/_new 2007-08-15 20:41:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.59) +# spec file for package yast2-packager (Version 2.15.61) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.15.59 +Version: 2.15.61 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.59.tar.bz2 +Source0: yast2-packager-2.15.61.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml BuildRequires: yast2 >= 2.15.38 @@ -55,7 +55,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.15.59 +%setup -n yast2-packager-2.15.61 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,13 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Tue Aug 14 2007 - jsuchome@suse.cz +- Merged proofread texts +- 2.15.61 +* Tue Aug 14 2007 - jsuchome@suse.cz +- double-click in the sources table toggles enabled/disabled status + (#299787) +- 2.15.60 * Mon Aug 13 2007 - lslezak@suse.cz - report details when initialization of the installation repository fails (#299716) ++++++ yast2-packager-2.15.59.tar.bz2 -> yast2-packager-2.15.61.tar.bz2 ++++++ ++++ 2931 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/configure.in new/yast2-packager-2.15.61/configure.in --- old/yast2-packager-2.15.59/configure.in 2007-08-13 16:32:43.000000000 +0200 +++ new/yast2-packager-2.15.61/configure.in 2007-08-14 11:13:44.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.15.59, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.60, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.59" +VERSION="2.15.60" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/inst_productsources.ycp new/yast2-packager-2.15.61/src/clients/inst_productsources.ycp --- old/yast2-packager-2.15.59/src/clients/inst_productsources.ycp 2007-08-10 16:23:52.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/inst_productsources.ycp 2007-08-14 17:07:56.000000000 +0200 @@ -423,8 +423,9 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("<p>Please wait, while packager is being initialized -and list of servers dowloaded from web.</p>") + _("<p>Please wait while the packager is being initialized +and the list of servers dowloaded from Web.</p> +") ); Wizard::SetTitleIcon ("yast-network"); @@ -434,7 +435,7 @@ y2warning ("Cannot proceed, no network configured..."); // TRANSLATORS: error report Report::Error (_("Cannot download list of repositories, -no network is configured.")); +no network configured.")); return `nosources; } @@ -879,14 +880,16 @@ (Stage::initial() ? // TRANSLATORS: dialog help 2/3 (version for installation) _("<p>If you want one or more online repositories to be used, -select those you want and click <b>Next</b></p>") +select those you want and click <b>Next</b>.</p> +") : // TRANSLATORS: dialog help 2/3 (version for running system) _("<p>If you want one or more online repositories to be used, -select those you want and click <b>Finish</b></p>") +select those you want and click <b>Finish</b>.</p> +") ) + // TRANSLATORS: dialog help 3/3 - _("<p>To remove a used repository, just unselect it.</p>"), + _("<p>To remove a used repository, just deselect it.</p>"), (Mode::installation() ? GetInstArgs::enable_back():false), (Mode::installation() ? GetInstArgs::enable_next():true) ); @@ -1028,9 +1031,9 @@ y2milestone ("Repos to be deleted: %1", repos_to_be_deleted); // TRANSLATORS: progress step - actions_todo = [_("Delete unselected online repositories")]; + actions_todo = [_("Delete deselected online repositories")]; // TRANSLATORS: progress step - actions_doing = [_("Deleting unselected online repositories...")]; + actions_doing = [_("Deleting deselected online repositories...")]; } if (size (repos_to_be_used) > 12) { @@ -1064,7 +1067,7 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("<p>Please wait, while the repository manager downloads repository details...</p>") + _("<p>Please wait while the repository manager downloads the repository details...</p>") ); Wizard::SetTitleIcon ("yast-sw_source"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.15.61/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.15.59/src/clients/inst_rpmcopy.ycp 2007-08-10 10:47:53.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/inst_rpmcopy.ycp 2007-08-14 17:05:31.000000000 +0200 @@ -206,7 +206,7 @@ if (! Pkg::SourceChangeUrl (cached_source_id, store_original_source_url)) { // error report - Report::Error (_("Error occurred while switching the cached + Report::Error (_("An error occurred while switching the cached repository back to CD.")); } Pkg::SourceSetEnabled (cached_source_id, true); @@ -299,7 +299,8 @@ { Report::Error (sformat ( // error report - _("Error occurred while creating directory %1:\n%2"), + _("An error occurred while creating directory %1: +%2"), Installation::destdir + cache_dir, ta_out["stderr"]:"")); return nil; @@ -313,7 +314,7 @@ { Report::Error (sformat ( // error report - _("Error occurred while getting temporary directory.\n%1"), + _("An error occurred while getting temporary directory. %1"), ta_out["stderr"]:"")); return nil; } @@ -339,7 +340,7 @@ { Report::Error (sformat ( // error report - _("Error occurred while getting temporary directory. %1"), + _("An error occurred while getting temporary directory. %1"), ta_out["stderr"]:"")); return nil; } @@ -433,7 +434,7 @@ { y2error ("Pkg::SourceProvideDir (%1, %2, %3) failed", source_id, media_number, "/"); // error report - Report::Error (_("Error occurred while getting the directory with updated packages")); + Report::Error (_("An error occurred while getting the directory with updated packages")); return; } @@ -456,7 +457,7 @@ UI::CloseDialog (); y2error ("copying media files failed"); // error report - Report::Error (sformat (_("Error occurred while copying packages + Report::Error (sformat (_("An error occurred while copying packages from the source CD to the disk"))); return; } @@ -480,7 +481,7 @@ { UI::CloseDialog (); // error report - Report::Error (sformat (_("Error occurred while copying packages + Report::Error (sformat (_("An error occurred while copying packages from the source CD to the disk cache"))); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/inst_source.ycp new/yast2-packager-2.15.61/src/clients/inst_source.ycp --- old/yast2-packager-2.15.59/src/clients/inst_source.ycp 2007-08-08 17:04:00.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/inst_source.ycp 2007-08-14 17:06:43.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: inst_source.ycp 40107 2007-08-08 15:03:59Z lslezak $ + * $Id: inst_source.ycp 40251 2007-08-14 09:18:23Z jsuchome $ * */ @@ -461,7 +461,7 @@ term contents = `VBox( `HBox( - `Table(`id(`table),`opt(`notify, `immediate), + `Table(`id(`table),`opt(`notify), // table header `header( _("Enabled"), // table header @@ -543,8 +543,8 @@ // help, continued help_text = help_text + _("<p> -The CDs can be copied to the <b>hard disk</b> -Then use that as the repository. +The CDs can be copied to <b>hard disk</b> +and then used as a repository. Insert the path name where the first CD is located, for example, /data1/<b>CD1</b>. Only the base path is required if all CDs are copied @@ -557,16 +557,17 @@ help_text = help_text + _("<p> <b>Modifying a Repository Status</b> To change a repository location, use <b>Edit</b>. To remove a repository, use -<b>Delete</b>. To enable or disable the repository or to change the refresh status in the -initialization time select the repository in the table and use the check boxes below. -</p>"); +<b>Delete</b>. To enable or disable the repository or to change the refresh status at initialization time, select the repository in the table and use the check boxes below. +</p> +"); if (have_rug) { // help, continued help_text = help_text + _("<p> <b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt> -to perform the changes also in that package management system.</p>"); +to also perform the changes in that package management system.</p> +"); } Wizard::SetNextButton(`next, Label::FinishButton() ); @@ -618,7 +619,7 @@ boolean success = Write(); if ( !success ) { // popup message part 1 - string _msg1 = _("Unable to save changes to repository + string _msg1 = _("Unable to save changes to the repository configuration."); string details = Pkg::LastError(); // popup message part 2 followed by other info @@ -729,7 +730,7 @@ fillCurrentRepoInfo(); } } - else if ( input == `enable ) + else if (input == `enable || input == `table) { boolean state = sourceState[ "enabled" ]:true; state = !state; @@ -794,7 +795,7 @@ if (ret == `ok && (src_alias == nil || src_alias == "")) { // error popup - Report::Error(_("Name of the repository cannot be empty.")); + Report::Error(_("The name of the repository cannot be empty.")); ret = `again; } } @@ -915,8 +916,7 @@ boolean cont = Popup::AnyQuestionRichText( Label::ErrorMsg(), // Error popup - _("<p>There were errors when restoring the repository configuration.</p> -") + "<p>" + Pkg::LastError() + "</p>", + _("<p>There were errors while restoring the repository configuration.</p>\n") + "<p>" + Pkg::LastError() + "</p>", 50, 15, Label::ContinueButton(), Label::CancelButton(), `focus_no ); @@ -971,7 +971,7 @@ map cmdline_description = $[ "id" : "inst_source", /* Command line help text for the repository module, %1 is "zypper" */ - "help" : sformat(_("Installation Repositories - this module doesn't support command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Installation Repositories - this module doesn't support the command line interface, use '%1' instead."), "zypper"), "guihandler" : StartInstSource, ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/pkg_finish.ycp new/yast2-packager-2.15.61/src/clients/pkg_finish.ycp --- old/yast2-packager-2.15.59/src/clients/pkg_finish.ycp 2007-07-19 13:46:48.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/pkg_finish.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -39,7 +39,7 @@ return (any)$[ "steps" : 1, // progress step title - "title" : _("Saving package manager configuration..."), + "title" : _("Saving the package manager configuration..."), "when" : [ `installation, `update, `autoinst ], ]; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/software_proposal.ycp new/yast2-packager-2.15.61/src/clients/software_proposal.ycp --- old/yast2-packager-2.15.59/src/clients/software_proposal.ycp 2007-07-19 13:46:48.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/software_proposal.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -84,7 +84,7 @@ if (! haskey (ret, "warning")) { // the language_changed flag has NOT been set by the NLD frame - ret = add( ret, "warning", _("The software proposal is reset to default values.") ); + ret = add( ret, "warning", _("The software proposal is reset to the default values.") ); } } if (Packages::solve_errors > 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/software_simple_proposal.ycp new/yast2-packager-2.15.61/src/clients/software_simple_proposal.ycp --- old/yast2-packager-2.15.59/src/clients/software_simple_proposal.ycp 2007-07-19 10:02:38.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/software_simple_proposal.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -36,7 +36,7 @@ if (! haskey (ret, "warning")) { // the language_changed flag has NOT been set by the NLD frame - ret = add( ret, "warning", _("The software proposal is reset to default values.") ); + ret = add( ret, "warning", _("The software proposal is reset to the default values.") ); } } if (Packages::solve_errors > 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/clients/sw_single.ycp new/yast2-packager-2.15.61/src/clients/sw_single.ycp --- old/yast2-packager-2.15.59/src/clients/sw_single.ycp 2007-07-30 13:32:07.000000000 +0200 +++ new/yast2-packager-2.15.61/src/clients/sw_single.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -187,7 +187,7 @@ boolean mgr_ok = Pkg::SourceStartManager(enabled_only); if (!mgr_ok) { - Report::LongWarning(_("There was an error in repository initialization.") + "\n" + Pkg::LastError ()); + Report::LongWarning(_("There was an error in the repository initialization.") + "\n" + Pkg::LastError ()); } if (size(Pkg::SourceGetCurrent(enabled_only)) == 0) { @@ -470,7 +470,7 @@ map cmdline_description = $[ "id" : "sw_single", /* Command line help text for the software management module, %1 is "zypper" */ - "help" : sformat(_("Software installation - this module doesn't support command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Software installation - this module doesn't support the command line interface, use '%1' instead."), "zypper"), "guihandler" : StartSWSingle, ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/include/checkmedia/ui.ycp new/yast2-packager-2.15.61/src/include/checkmedia/ui.ycp --- old/yast2-packager-2.15.59/src/include/checkmedia/ui.ycp 2007-08-02 14:50:24.000000000 +0200 +++ new/yast2-packager-2.15.61/src/include/checkmedia/ui.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -94,7 +94,7 @@ else if (val == "md5sum wrong") { // wrong MD5 - val = _("<B>Error</B> -- MD5 sum does not match<BR>The medium should not be used."); + val = _("<B>Error</B> -- MD5 sum does not match<BR>This medium should not be used."); } else if (val == "md5sum not checked") { @@ -241,8 +241,8 @@ string help = _("<P><B>Media Check</B></P>") + // help text - media check 2/7 _("<P>When you have a problem with -installation and are using a CD or DVD installation medium, you should check -whether the medium could be broken.</P> +the installation and are using a CD or DVD installation medium, you should check +whether the medium is be broken.</P> ") + // help text - media check 3/7 @@ -262,9 +262,8 @@ The order of the media is irrelevant.") + // help text - media check 6/7 -_("<P><B>Note:</B> You cannot change the medium if it is used by the system. If -it happens during installation, start manual installation and select the media -verification item in the menu.</P> +_("<P><B>Note:</B> You cannot change the medium while it is used by the system. If +it happens during installation, start the manual installation and select the media verification item in the menu.</P> ") + // help text - media check 7/6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.61/src/modules/PackageCallbacks.ycp --- old/yast2-packager-2.15.59/src/modules/PackageCallbacks.ycp 2007-08-02 12:52:18.000000000 +0200 +++ new/yast2-packager-2.15.61/src/modules/PackageCallbacks.ycp 2007-08-14 17:09:06.000000000 +0200 @@ -616,14 +616,16 @@ if (url_scheme == "dir") { // report error while accessing local directory with product (%1 == "SuSE Linux ...") - message = sformat (_("Cannot access installation media\n%1. -Check that the directory is accessible."), wanted_label); + message = sformat (_("Cannot access installation media +%1. +Check whether the directory is accessible."), wanted_label); } else if (url_scheme != "cd" && url_scheme != "dvd") { // report error while accessing network media of product (%1 == "SuSE Linux ...") - message = sformat (_("Cannot access installation media \n%1. -Check that the server is accessible."), wanted_label); + message = sformat (_("Cannot access installation media +%1. +Check whether the server is accessible."), wanted_label); } // currently unused diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/modules/ProductLicense.ycp new/yast2-packager-2.15.61/src/modules/ProductLicense.ycp --- old/yast2-packager-2.15.59/src/modules/ProductLicense.ycp 2007-08-10 10:46:48.000000000 +0200 +++ new/yast2-packager-2.15.61/src/modules/ProductLicense.ycp 2007-08-14 17:10:16.000000000 +0200 @@ -544,7 +544,7 @@ } } else { // popup question - if (Popup::ContinueCancel(_("Really abort add-on product installation?"))) { + if (Popup::ContinueCancel(_("Really abort the add-on product installation?"))) { y2milestone("Aborting..."); return `abort; } @@ -564,7 +564,7 @@ // text changed due to bug #162499 string refuse_popup_text = base_product // text asking whether to refuse a license (Yes-No popup) - ? _("Refusing the license agreement cancels installation. + ? _("Refusing the license agreement cancels the installation. Really refuse the agreement?") // text asking whether to refuse a license (Yes-No popup) : _("Refusing the license agreement cancels the add-on @@ -584,7 +584,7 @@ { return `halt; // timed ok/cancel popup - if (!Popup::TimedOKCancel(_("System is shutting down..."), 10)) + if (!Popup::TimedOKCancel(_("The system is shutting down..."), 10)) { continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/modules/SlideShow.ycp new/yast2-packager-2.15.61/src/modules/SlideShow.ycp --- old/yast2-packager-2.15.59/src/modules/SlideShow.ycp 2007-08-08 09:13:34.000000000 +0200 +++ new/yast2-packager-2.15.61/src/modules/SlideShow.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -1562,7 +1562,7 @@ string HelpText() { // Help text while software packages are being installed (displayed only in rare cases) - string help_text = _("<p>Please wait while packages are installed.</p>"); + string help_text = _("<p>Please wait while packages are being installed.</p>"); return help_text; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.61/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.15.59/src/modules/SourceDialogs.ycp 2007-08-08 10:24:29.000000000 +0200 +++ new/yast2-packager-2.15.61/src/modules/SourceDialogs.ycp 2007-08-14 17:03:16.000000000 +0200 @@ -59,8 +59,9 @@ /** * Help text suffix for some types of the medias */ -string multi_cd_help = _("<p>If the repository is on multiple medias, -set the location of the first media of the set.</p>"); +string multi_cd_help = _("<p>If the repository is on multiple media, +set the location of the first media of the set.</p> +"); /** * Set the URL to work with @@ -226,7 +227,7 @@ { UI::SetFocus (`id (`repo_name)); // popup message - Popup::Message (_("Name of the repository cannot be empty.")); + Popup::Message (_("The name of the repository cannot be empty.")); return false; } return true; @@ -250,7 +251,8 @@ "validate_function" : RepoNameValidate, // help text "help" : _("<p><big><b>Repository Name</b></big><br> -Use <b>Repository Name</b> to specify the name of the repository. If it is empty Yast will use the product name (if available) or the URL as the name.</p>") +Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p> +") ]; } @@ -1047,8 +1049,9 @@ If the location is a file holding an ISO image of the media, set <b>ISO Image</b>.</p>") // help text - server dialog, there is a "Port" widget -+ _("<p>It's possible to set the <b>Port</b> number for a HTTP/HTTPS repository. -Leave it empty to use the default port.</p>") ++ _("<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository. +Leave it empty to use the default port.</p> +") + multi_cd_help, ]; } @@ -1304,9 +1307,10 @@ { return _("<p><b>Download Files</b><br> Each repository has description files which describe content of the repository. -Check option <b>Download repository description files</b> to download the files -when closing this Yast module. If the option is unchecked Yast will -automatically download the files when it needs them later. </p>"); +Check the <b>Download repository description files</b> to download the files +when closing this YaST module. If the option is unchecked, YaST will +automatically download the files when it needs them later. </p> +"); } map<string,any> SelectWidgetDL () { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.15.61/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.15.59/src/modules/SourceManagerSLP.ycp 2007-07-19 13:22:39.000000000 +0200 +++ new/yast2-packager-2.15.61/src/modules/SourceManagerSLP.ycp 2007-08-14 17:09:48.000000000 +0200 @@ -311,7 +311,7 @@ if (current == nil || current < 0) { // message popup - Report::Message (_("Please, select one of offered options. + Report::Message (_("Please select one of offered options. This product has more repositories available.")); return nil; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.59/VERSION new/yast2-packager-2.15.61/VERSION --- old/yast2-packager-2.15.59/VERSION 2007-08-13 16:32:28.000000000 +0200 +++ new/yast2-packager-2.15.61/VERSION 2007-08-14 17:11:05.000000000 +0200 @@ -1 +1 @@ -2.15.59 +2.15.61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org