Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2011-11-16 17:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2011-11-02 12:22:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2011-11-16 17:23:45.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 16 11:35:38 CET 2011 - [email protected] + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.21.22.tar.bz2 New: ---- yast2-packager-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.7Tmce6/_old 2011-11-16 17:23:47.000000000 +0100 +++ /var/tmp/diff_new_pack.7Tmce6/_new 2011-11-16 17:23:47.000000000 +0100 @@ -19,7 +19,7 @@ Name: yast2-packager -Version: 2.21.22 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-2.21.22.tar.bz2 -> yast2-packager-2.22.0.tar.bz2 ++++++ ++++ 3484 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.21.22/VERSION new/yast2-packager-2.22.0/VERSION --- old/yast2-packager-2.21.22/VERSION 2011-11-01 14:52:34.000000000 +0100 +++ new/yast2-packager-2.22.0/VERSION 2011-11-16 11:36:04.000000000 +0100 @@ -1 +1 @@ -2.21.22 +2.22.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.21.22/src/clients/do_not_show_again_editor.ycp new/yast2-packager-2.22.0/src/clients/do_not_show_again_editor.ycp --- old/yast2-packager-2.21.22/src/clients/do_not_show_again_editor.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/do_not_show_again_editor.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -59,9 +59,10 @@ string caption = _("Editor for 'Do Not Show Again'"); // help text - string helptext = _("<p>You can remove entries by selecting them -in the table and clicking the <b>Delete</b> button. -The entry will be removed immediately from the current configuration.</p>"); + string helptext = _("<p>Remove entries by selecting them in the table and clicking the +<b>Delete</b> button. The entries will be removed immediately from +the current configuration.</p> +"); term contents = `VBox( `Table( 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.21.22/src/clients/inst_desktop.ycp new/yast2-packager-2.22.0/src/clients/inst_desktop.ycp --- old/yast2-packager-2.21.22/src/clients/inst_desktop.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/inst_desktop.ycp 2011-11-16 11:31:34.000000000 +0100 @@ -53,16 +53,16 @@ string gnome_blurb = // explanation text for GNOME _("GNOME is a powerful and intuitive desktop -environment that uses Evolution as its mailer, -Firefox as its browser, and Nautilus as its -file manager."); +environment that uses Evolution as mailer, +Firefox as browser, and Nautilus as file manager. +"); string kde_blurb = // explanation text for KDE _("KDE is a powerful and intuitive desktop -environment that uses Kontact as its mailer, -Konqueror as its file manager, and offers -both, Firefox and Konqueror as its Web browser. +environment that uses Kontact as mailer, +Dolphin as file manager, and offers +both Firefox and Konqueror as Web browsers. "); // help text 1/3 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.21.22/src/clients/inst_productsources.ycp new/yast2-packager-2.22.0/src/clients/inst_productsources.ycp --- old/yast2-packager-2.21.22/src/clients/inst_productsources.ycp 2010-11-12 12:36:58.000000000 +0100 +++ new/yast2-packager-2.22.0/src/clients/inst_productsources.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -261,7 +261,7 @@ // Network is not running if (! Popup::AnyQuestion ( // TRANSLATORS: popup header - _("Network is not configured"), + _("Network is not configured."), // TRANSLATORS: popup question _("Online sources defined by product require an Internet connection. @@ -602,8 +602,8 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("<p>Please wait while the packager is being initialized -and the list of servers downloaded from the Web.</p> + _("<p>The packager is being initialized and +the list of servers downloaded from the Web.</p> "), [icons_for_progress] ); @@ -702,8 +702,9 @@ if (! ReadControlFile()) { y2milestone ("Feature not supported by the product"); // TRANSLATORS: light-warning message - Report::Message (_("No product URL defined to download -list of repositories from.")); + Report::Message (_("No product URL defined from which to download +list of repositories. +")); return `nosources; } @@ -1120,22 +1121,20 @@ ) ), // TRANSLATORS: dialog help 1/3 - _("<p>Here you can see default online repositories downloaded from the Internet. -Click on the repository to see its details.</p> + _("<p>List of default online repositories. +Click on a repository for details.</p> ") + (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> + _("<p>Select the online repositories you want to use then 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> + _("<p>Select the online repositories you want to use then click <b>Finish</b>.</p> ") ) + // TRANSLATORS: dialog help 3/3 - (skip_already_used_repos != true ? _("<p>To remove a used repository, just deselect it.</p>"):""), + (skip_already_used_repos != true ? _("<p>To remove a used repository, simply deselect it.</p>"):""), (Mode::installation() ? GetInstArgs::enable_back():false), (Mode::installation() ? GetInstArgs::enable_next():true) ); @@ -1232,7 +1231,7 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("<p>Please wait while the repository manager downloads the repository details...</p>") + _("<p>The repository manager is downloading repository details...</p>") ); Wizard::SetTitleIcon ("yast-sw_source"); @@ -1309,7 +1308,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url) ) + error + details @@ -1328,7 +1327,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url)) + "\n" + Pkg::LastError() ); @@ -1340,7 +1339,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url)) + "\n" + Pkg::LastError() ); 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.21.22/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.22.0/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.21.22/src/clients/inst_rpmcopy.ycp 2011-06-14 13:49:01.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/inst_rpmcopy.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -178,7 +178,7 @@ // Solve dependencies // if( !Pkg::PkgSolve(false) ) { - Report::Error( _("The package resolver run failed. Please check your software section in the autoyast profile.") ); + Report::Error( _("The package resolver run failed. Check your software section in the AutoYaST profile.") ); } } @@ -215,7 +215,7 @@ string failed = mergestring(commit_result[1]:[], "\n"); // error message - displayed in a scrollable text area // %1 - an error message (details) - Report::LongError(sformat(_("Installation Failed + Report::LongError(sformat(_("Installation failed. Details: %1 @@ -367,7 +367,7 @@ // FIXME error checking is missing all around here, initialization could actually fail! if (Pkg::TargetInitialize (Installation::destdir) != true) { // continue-cancel popup - if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) { + if(Popup::ContinueCancel(_("Initializing the target directory failed.")) == false) { return `abort; } } 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.21.22/src/clients/media_proposal.ycp new/yast2-packager-2.22.0/src/clients/media_proposal.ycp --- old/yast2-packager-2.21.22/src/clients/media_proposal.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/media_proposal.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -32,7 +32,7 @@ UI::OpenDialog (`opt(`decorated), // intermediate popup while initializing internal packagemanagement - `Label(_("Reading package information. One moment please..."))); + `Label(_("Reading package information..."))); Packages::Init (true); 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.21.22/src/clients/repositories.ycp new/yast2-packager-2.22.0/src/clients/repositories.ycp --- old/yast2-packager-2.21.22/src/clients/repositories.ycp 2011-09-23 11:04:59.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/repositories.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -283,7 +283,7 @@ } // heading - in case repo name not found - string name = info["name"]:_("Unknown repository name"); + string name = info["name"]:_("Unknown Repository Name"); // label to be used instead of URL if not found string url = sformat (_("URL: %1"), info["url"]:_("Unknown") ); @@ -669,9 +669,9 @@ // push button - refresh the selected repository now string refreshButtonLabel = _("Re&fresh Selected"); // push button - disable/enable the selected repository - string enableButtonLabel = _("Status &On or Off"); + string enableButtonLabel = _("Status &on or off"); // push button - disable/enable automatic refresh of the selected repository - string refreshOnOffButtonLabel = _("Refre&sh On or Off"); + string refreshOnOffButtonLabel = _("Refre&sh on or off"); // push button - set name of the selected repository string setAliasButtonLabel = _("Set &Name..."); @@ -720,9 +720,9 @@ `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ `item(`id(`refresh), refreshButtonLabel ), // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + `item(`id(`autorefresh_all), _("Refresh all Autor&efreshed")), // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + `item(`id(`refresh_enabled), _("Refresh all &Enabled")) ]) ) ); @@ -732,15 +732,17 @@ // help string help_text = _("<p> -In this dialog, manage configured software repositories and services.</p>"); +Manage configured software repositories and services.</p> +"); help_text = help_text + _("<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>"); help_text = help_text + _("<p> -<b>Adding a New Repository or a Service</b><br> +<b>Adding a new Repository or a Service</b><br> To add a new repository, use <b>Add</b> and specify the software repository or service. -Yast will automatically detect whether a service or a repository is available at the entered location. -</p>"); +YaST will automatically detect whether a service or a repository is available at the entered location. +</p> +"); // help, continued help_text = help_text + _("<p> @@ -771,12 +773,13 @@ // help text, continued help_text = help_text + _("<P><B>Priority of a Repository</B><BR> -Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default priority is 99. If a package is available in more repositories the repository with the highest priority is used.</P>"); +Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P> +"); // help text, continued help_text = help_text + _("<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"); // help text, continued - help_text = help_text + _("<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded packages in a local cache so they can be reused later when the packages are reinstalled. If unchecked the downloaded packages are deleted after installation.</P>") + _("<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>, the location can be changed in <B>/etc/zypp/zypp.conf</B> file.</P>"); + help_text = help_text + _("<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\npackages in a local cache so they can be reused later when the packages are\nreinstalled. If not checked, the downloaded packages are deleted after installation.</P>") + _("<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"); Wizard::SetNextButton(`next, Label::OKButton() ); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -1609,7 +1612,7 @@ boolean cont = Popup::AnyQuestionRichText( Label::ErrorMsg(), // Error popup - _("<p>There were errors while restoring the repository configuration.</p>\n") + "<p>" + Pkg::LastError() + "</p>", + _("<p>Errors occurred while restoring the repository configuration.</p>\n") + "<p>" + Pkg::LastError() + "</p>", 50, 15, Label::ContinueButton(), Label::CancelButton(), `focus_no ); @@ -1685,7 +1688,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 the command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Installation Repositories - This module does not 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.21.22/src/clients/sw_single.ycp new/yast2-packager-2.22.0/src/clients/sw_single.ycp --- old/yast2-packager-2.21.22/src/clients/sw_single.ycp 2011-09-23 15:44:45.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/sw_single.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -307,7 +307,7 @@ boolean mgr_ok = Pkg::SourceStartManager(enabled_only); if (!mgr_ok) { - Report::LongWarning(_("There was an error in the repository initialization.") + "\n" + Pkg::LastError ()); + Report::LongWarning(_("An error occurred during repository initialization.") + "\n" + Pkg::LastError ()); } if (size(Pkg::SourceGetCurrent(enabled_only)) == 0) { @@ -502,8 +502,8 @@ SCR::Read (.target.ycp, "/var/lib/YaST2/failed_packages"); } if (size (old_failed_packs) > 0 && Popup::YesNo ( -_("During the last package installation, -several package failed to install. +_("During the last package installation +several packages failed to install. Install them now? "))) { @@ -580,7 +580,9 @@ mergestring (nonexisting, ", ")); Report::LongError (sformat ( // error report, %1 is a list of packages - _("Following packages haven't been found on the medium:\n%1"), + _("The following packages have not been found on the medium: +%1 +"), mergestring (nonexisting, "\n"))); return `cancel; } @@ -755,7 +757,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 the command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Software Installation - This module does not 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.21.22/src/clients/webpin_package_search.ycp new/yast2-packager-2.22.0/src/clients/webpin_package_search.ycp --- old/yast2-packager-2.21.22/src/clients/webpin_package_search.ycp 2011-09-23 11:04:59.000000000 +0200 +++ new/yast2-packager-2.22.0/src/clients/webpin_package_search.ycp 2011-11-16 11:27:39.000000000 +0100 @@ -199,7 +199,7 @@ size(steps), steps, actions, - _("<p>Please wait while packager is initializing...</p>") + _("<p>Packager is initializing...</p>") ); Progress::NextStage(); @@ -237,7 +237,7 @@ ), `MultiSelectionBox( `id("search_in"), - _("Search &In"), + _("Search &in"), [ `item( `id("name"),_("Name"), true ), `item( `id("description"), _("Description"), true ), @@ -280,13 +280,12 @@ ) ), _("<p><big><b>Package Search</b></big><br> -This YaST module enables you to use the functionality of <i>Webpin package search</i>. -It searches within all known openSUSE build-service and openSUSE community repositories.</p>") + +Use the functionality of <i>Webpin package search</i> to search in all known openSUSE build-service and openSUSE community repositories.</p> +") + -_("<p><big><b>Security</b></big><br> -The software found is often not part of the distribution itself and the level of trust -depends on yourself. We do not take any responsibility for installing -such software.</p> +_("<p><big><b>Security</b></big><br> The software found is often not part of the +distribution itself. You need to decide whether to trust the source of a +package. We do not take any responsibility for installing such software.</p> "), //We don't need back button false, @@ -312,7 +311,7 @@ list <map> selected_packages = SelectedPackages(); if (selected_packages == nil || size (selected_packages) == 0) { - Report::Message (_("Select some packages to install.")); + Report::Message (_("Select packages to install.")); UI::SetFocus(`id("results")); continue; } @@ -348,7 +347,7 @@ // error message UI::ChangeWidget(`id("description"), `Value, _("<p><b>Search failed</b></p>")); else if (search_results == $[]) - UI::ChangeWidget(`id("description"), `Value, _("<p><b>No packages matching entered criteria were found</b></p>")); + UI::ChangeWidget(`id("description"), `Value, _("<p><b>No packages matching entered criteria were found.</b></p>")); else CreatePackageDescription(); } 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.21.22/src/include/checkmedia/ui.ycp new/yast2-packager-2.22.0/src/include/checkmedia/ui.ycp --- old/yast2-packager-2.21.22/src/include/checkmedia/ui.ycp 2009-01-16 20:03:38.000000000 +0100 +++ new/yast2-packager-2.22.0/src/include/checkmedia/ui.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -289,23 +289,22 @@ // help text - media check 4/8 _("<P>If the check of the medium fails, you should not continue the installation. -It may fail or you may lose your data. You should replace the broken -medium.</P> +It may fail or you may lose your data. Better replace the broken medium.</P> ") + // help text - media check 5/8 -_("After the check you can insert the next medium and start the procedure again. -The order of the media is irrelevant.") + +_("After the check, insert the next medium and start the procedure again. +The order of the media is irrelevant. +") + // help text - media check 6/8 _("<P><B>Note:</B> You cannot change the medium while it is used by the system.</P>") + // help text - media check 7/8 -_("<P>To check media before starting installation use the media check item in the boot menu.</P>") + +_("<P>To check media before the installation, use the media check item in the boot menu.</P>") + // help text - media check 8/8 -_("<P>If you burn the media yourself, use the <B>pad</B> option in your recording software. It avoids read errors at the end of media during the check.</P> -"); +_("<P>If you burn the media yourself, use the <B>pad</B> option in your recording\nsoftware. It avoids read errors at the end of the media during the check.</P>\n"); // advice check of the media // for translators: split the message to more lines if needed, use max. 50 characters per line @@ -419,7 +418,7 @@ if (res != 0) { // error message: the medium cannot be read or no medium in the drive; %1 = drive, e.g. /dev/hdc - LogLine("<FONT COLOR=red>" + sformat(_("Cannot read medium in the drive %1."), selecteddrive) + "</FONT>"); + LogLine("<FONT COLOR=red>" + sformat(_("Cannot read medium in drive %1."), selecteddrive) + "</FONT>"); } else { 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.21.22/src/include/key_manager_dialogs.ycp new/yast2-packager-2.22.0/src/include/key_manager_dialogs.ycp --- old/yast2-packager-2.21.22/src/include/key_manager_dialogs.ycp 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-packager-2.22.0/src/include/key_manager_dialogs.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -168,13 +168,15 @@ // help string help_text = _("<p> -In this dialog, manage known GPG public keys.</p>"); +Manage known GPG public keys.</p> +"); help_text = help_text + _("<p> <b>Adding a New GPG Key</b><br> -To add a new GPG key specify the path to the key file. +To add a new GPG key, specify the path to the key file. Check the <B>Trusted</B> check box if the key is trusted. -</p>"); +</p> +"); Wizard::SetNextButton(`next, Label::OKButton()); Wizard::SetContents(title, contents, help_text, true, true); @@ -251,7 +253,8 @@ // help string help_text = _("<p> -In this dialog, manage known GPG public keys.</p>"); +Manage known GPG public keys.</p> +"); help_text = help_text + _("<p> <b>Adding a New GPG Key</b><br> 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.21.22/src/include/repositories_include.ycp new/yast2-packager-2.22.0/src/include/repositories_include.ycp --- old/yast2-packager-2.21.22/src/include/repositories_include.ycp 2011-06-28 11:37:38.000000000 +0200 +++ new/yast2-packager-2.22.0/src/include/repositories_include.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -72,7 +72,7 @@ [ _("Check Repository Type"), _("Add Repository"), _("Read Repository License") ], [ _("Checking Repository Type"), _("Adding Repository"), _("Reading Repository License") ], // TRANSLATORS: dialog help - _("<p>Please wait while the repository manager downloads the repository details...</p>") + _("<p>The repository manager is downloading repository details...</p>") ); Progress::NextStage(); @@ -198,10 +198,11 @@ Popup::NoHeadline (), // continue-back popup _("There is no product information available at the given location. -If you expected to address a product, return back and enter +If you expected to to point a product, go back and enter the correct location. To make rpm packages located at the specified location available -in the packages selection, continue."), +in the packages selection, continue. +"), Label::ContinueButton (), Label::BackButton (), `focus_no)) @@ -399,7 +400,8 @@ Report::Error (sformat ( // popup error message, %1 is the package name _("Cannot search for SLP repositories -without having %1 package installed"), +without having %1 package installed. +"), required_package )); y2warning ("Not searching for SLP repositories"); 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.21.22/src/modules/AddOnProduct.ycp new/yast2-packager-2.22.0/src/modules/AddOnProduct.ycp --- old/yast2-packager-2.21.22/src/modules/AddOnProduct.ycp 2011-09-23 16:19:45.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/AddOnProduct.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -1153,8 +1153,9 @@ ), `VSpacing (0.5), // TRANSLATORS: additional dialog information - `Left (`Label (_("The installation repository contains also the listed additional repositories. -Select those you want to use."))), + `Left (`Label (_("The installation repository also contains the listed additional repositories. +Select the ones you want to use. +"))), `VSpacing (0.5), `MinSize ( 70, 16, 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.21.22/src/modules/KeyManager.ycp new/yast2-packager-2.22.0/src/modules/KeyManager.ycp --- old/yast2-packager-2.21.22/src/modules/KeyManager.ycp 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/KeyManager.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -237,7 +237,8 @@ else { Report::Error(sformat(_("File '%1' -doesn't contain a valid GPG key."), file)); +does not contain a valid GPG key. +"), file)); 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.21.22/src/modules/PackageInstallation.ycp new/yast2-packager-2.22.0/src/modules/PackageInstallation.ycp --- old/yast2-packager-2.21.22/src/modules/PackageInstallation.ycp 2011-06-24 11:38:35.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/PackageInstallation.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -60,7 +60,7 @@ `VBox( `HSpacing(40), // dialog headline - `Left(`Heading(_("Installation of Some Packages Failed"))), + `Left(`Heading(_("Installation of some Packages Failed"))), rbuttons, `RichText(`id(`text), `opt(`plainText), 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.21.22/src/modules/Packages.ycp new/yast2-packager-2.22.0/src/modules/Packages.ycp --- old/yast2-packager-2.21.22/src/modules/Packages.ycp 2011-10-31 18:45:54.000000000 +0100 +++ new/yast2-packager-2.22.0/src/modules/Packages.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -285,7 +285,7 @@ if (contains (flags, "lm")) { // warning text - return _("Your computer is a 64-bit x86-64 system. However, you are trying to install a 32-bit distribution."); + return _("Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."); } } return ""; @@ -308,7 +308,9 @@ // translators: help text for software proposal _("<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>") + // help text for software proposal - _("<P>The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n This value is important when the connection is slow or when there is a data limit for downloading.</P>"); + _("<P>The total 'size to download' is the size of the packages which will be +downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P> +"); } @@ -424,7 +426,7 @@ }); warning = sformat ( - _("These Add-On products have been marked for auto-removal: %1"), + _("These add-on products have been marked for auto-removal: %1"), "<ul>\n" + warning + "</ul>\n" ); @@ -436,10 +438,10 @@ if (size (ret["warning"]:"") > 0) { ret["warning"] = ret["warning"]:"" + "<br>\n" + (size (products) > 1 ? // Warning message when some add-ons are marked to be removed automatically - _("Please, contact the vendors of these add-ons to provide you with new the installation media.") + _("Contact the vendors of these add-ons to provide you with new installation media.") : // Warning message when some add-ons are marked to be removed automatically - _("Please, contact the vendor of the add-on to provide you with the new installation media.") + _("Contact the vendor of the add-on to provide you with a new installation media.") ); } @@ -1343,10 +1345,10 @@ if (load_release_notes (source)) { // TRANSLATORS: beginning of the rich text with the release notes - SlideShow::relnotes = _("<p><b>These are the release notes made for the first initial release. They are -part of the installation media. During the configuration steps, if a connection -to the Internet is available, you can download updated release notes -from the SUSE Linux Web server.</b></p>") + media_text; + SlideShow::relnotes = _("<p><b>The release notes for the initial release are part of the installation +media. If an Internet connection is available during configuration, you can +download updated release notes from the SUSE Linux Web server.</b></p> +") + media_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.21.22/src/modules/ProductLicense.ycp new/yast2-packager-2.22.0/src/modules/ProductLicense.ycp --- old/yast2-packager-2.21.22/src/modules/ProductLicense.ycp 2011-06-24 15:09:21.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/ProductLicense.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -317,7 +317,7 @@ `Left(`RadioButton(`id (sformat("no_%1", id)), `opt(`notify), // radio button - _("N&o, I Do Not Agree") + _("N&o, I Do not Agree") )) ), `HSpacing (2*space) 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.21.22/src/modules/SourceDialogs.ycp new/yast2-packager-2.22.0/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.21.22/src/modules/SourceDialogs.ycp 2011-01-25 10:07:45.000000000 +0100 +++ new/yast2-packager-2.22.0/src/modules/SourceDialogs.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -872,9 +872,10 @@ "validate_function" : DirValidate, "help" : _("<p><big><b>Local Directory</b></big><br> Use <b>Path to Directory</b> to specify the path to the -directory. If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -<b>Plain RPM Directory</b>.</p>") +directory. If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +<b>Plain RPM Directory</b>.</p> +") + multi_cd_help, ]; @@ -1104,17 +1105,19 @@ "init" : USBInit, "store" : USBStore, "help" : _("<p><big><b>USB Stick or Disk</b></big><br> -Select the USB device where the repository is located. +Select the USB device on which the repository is located. Use <b>Path to Directory</b> to specify the directory of the repository. -If the path is omitted the system will use the root directory of the disk. -If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -<b>Plain RPM Directory</b>.</p>") +If the path is omitted, the system will use the root directory of the disk. +If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +<b>Plain RPM Directory</b>.</p> +") // 'auto' is a value in the combo box widget, do not translate it! -+ _("<p>The file system which is used on the device will be automatically -detected if file system 'auto' is selected. If the detection fails or you -want to use a certain file system then select it from the list.</p>") ++ _("<p>The file system used on the device will be detected automatically +if you select file system 'auto'. If the detection fails or you +want to use a certain file system, select it from the list.</p> +") ]; } @@ -1173,17 +1176,19 @@ "init" : DiskInit, "store" : DiskStore, "help" : _("<p><big><b>Disk</b></big><br> -Select the disk where the repository is located. +Select the disk on which the repository is located. Use <b>Path to Directory</b> to specify the directory of the repository. -If the path is omitted the system will use the root directory of the disk. -If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -<b>Plain RPM Directory</b>.</p>") +If the path is omitted, the system will use the root directory of the disk. +If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +<b>Plain RPM Directory</b>.</p> +") // 'auto' is a value in the combo box widget, do not translate it! -+ _("<p>The file system which is used on the device will be automatically -detected if file system 'auto' is selected. If the detection fails or you -want to use a certain file system then select it from the list.</p>") ++ _("<p>The file system used on the device will be detected automatically +if you select file system 'auto'. If the detection fails or you +want to use a certain file system, select it from the list.</p> +") ]; } @@ -1856,16 +1861,15 @@ // help, continued help_text = help_text + _("<p> The product CDs can be copied to the hard disk. -Insert the path where the first -CD is located, for example, /data1/<b>CD1</b>. +Enter the path to the first CD, for example, /data1/<b>CD1</b>. Only the base path is required if all CDs are copied -into one directory.</p> +into the same directory.</p> "); // help, continued help_text = help_text + _("<p> Network installation requires a working network connection. -Specify the directory where the packages from +Specify the directory in which the packages from the first CD are located, such as /data1/CD1.</p> "); return help_text; @@ -1876,7 +1880,7 @@ if (selected == nil) { // error popup - Popup::Message (_("Select the media type.")); + Popup::Message (_("Select the media type")); return false; } if (selected == `cd || selected == `dvd) @@ -2033,9 +2037,9 @@ string SelectWidgetHelpDl() { return _("<p><b>Download Files</b><br> -Each repository has description files which describe content of the repository. -Check the <b>Download repository description files</b> to download the files -when closing this YaST module. If the option is unchecked, YaST will +Each repository has description files which describe the content of the +repository. Check <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> "); } 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.21.22/src/modules/SourceManager.ycp new/yast2-packager-2.22.0/src/modules/SourceManager.ycp --- old/yast2-packager-2.21.22/src/modules/SourceManager.ycp 2011-08-03 16:15:03.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/SourceManager.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -369,10 +369,11 @@ Popup::NoHeadline (), // continue-back popup _("There is no product information available at the given location. -If you expected to address a product, return back and enter +If you expected to to point a product, go back and enter the correct location. To make rpm packages located at the specified location available -in the packages selection, continue."), +in the packages selection, continue. +"), Label::ContinueButton (), Label::BackButton (), `focus_yes)) 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.21.22/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.22.0/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.21.22/src/modules/SourceManagerSLP.ycp 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-packager-2.22.0/src/modules/SourceManagerSLP.ycp 2011-11-16 11:27:40.000000000 +0100 @@ -311,8 +311,9 @@ if (current == nil || current < 0) { // message popup - Report::Message (_("Please select one of offered options. -This product has more repositories available.")); + Report::Message (_("Select one of the offered options. +More repositories are available for this product. +")); return nil; } else { 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.21.22/src/modules/SpaceCalculation.ycp new/yast2-packager-2.22.0/src/modules/SpaceCalculation.ycp --- old/yast2-packager-2.21.22/src/modules/SpaceCalculation.ycp 2011-11-01 14:53:12.000000000 +0100 +++ new/yast2-packager-2.22.0/src/modules/SpaceCalculation.ycp 2011-11-16 11:35:08.000000000 +0100 @@ -874,13 +874,14 @@ if (Mode::update ()) message = add (message, "\n" + // popup message -_("Deselect some packages or delete some data -or temporary files before updating the system.")); +_("Deselect packages or delete data or temporary files +before updating the system. +")); else message = add (message, "\n" + // popup message -_("Please deselect some packages.")); +_("Deselect some packages.")); } } return message; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
