Author: jsuchome Date: Thu Mar 29 14:04:52 2012 New Revision: 67753 URL: http://svn.opensuse.org/viewcvs/yast?rev=67753&view=rev Log: - merged proofed texts - 2.22.6 Modified: trunk/yast2/VERSION trunk/yast2/library/commandline/src/CommandLine.ycp trunk/yast2/library/desktop/src/menu.ycp trunk/yast2/library/log/src/ALog.ycp trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/NetworkService.ycp trunk/yast2/library/network/src/SuSEFirewallProposal.ycp trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/library/system/src/FileChanges.ycp trunk/yast2/library/wizard/src/Confirm.ycp trunk/yast2/library/wizard/src/Wizard.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Mar 29 14:04:52 2012 @@ -1 +1 @@ -2.22.5 +2.22.6 Modified: trunk/yast2/library/commandline/src/CommandLine.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/commandline/src/CommandLine.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/commandline/src/CommandLine.ycp (original) +++ trunk/yast2/library/commandline/src/CommandLine.ycp Thu Mar 29 14:04:52 2012 @@ -564,7 +564,7 @@ } // translators: default module description if none is provided by the module itself - Print( modulecommands["help"]: _("This is a YaST2 module.")+"\n" ); + Print( modulecommands["help"]: _("This is a YaST module.")+"\n" ); // translators: short help title for command line Print(_("Basic Syntax:")); Modified: trunk/yast2/library/desktop/src/menu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/src/menu.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/desktop/src/menu.ycp (original) +++ trunk/yast2/library/desktop/src/menu.ycp Thu Mar 29 14:04:52 2012 @@ -55,7 +55,7 @@ `HBox( `HSpacing(2), /* Heading for NCurses Control Center */ - `HCenter(`Heading( _("YaST2 Control Center")) ), + `HCenter(`Heading( _("YaST Control Center")) ), `HSpacing(2) ), `VSpacing(0.4) @@ -139,7 +139,7 @@ define void ShowNcursesHelp() { /* NCurses (textmode) Control Center headline */ - string headline = _("Controlling YaST2 ncurses with the Keyboard"); + string headline = _("Controlling YaST ncurses with the Keyboard"); /* NCurses Control Center help 1/ */ string help = _("<p>1) <i>General</i><br> Modified: trunk/yast2/library/log/src/ALog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/ALog.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/log/src/ALog.ycp (original) +++ trunk/yast2/library/log/src/ALog.ycp Thu Mar 29 14:04:52 2012 @@ -77,7 +77,7 @@ * that she did using YaST, logs it using @ref Note */ global void CommitPopup() { - string i = uiInput(_("Enter a log message to describe the changes that you did")); + string i = uiInput(_("Enter a log message that describes the changes you made.")); string msg = (i == nil)? "*empty log message*": i; Note(msg); } Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Mar 29 14:04:52 2012 @@ -96,10 +96,10 @@ // bnc #429861 if (Stage::initial()) { // label - label = _("Firewall cannot be adjusted during first stage installation"); + label = _("Firewall cannot be adjusted during first stage installation."); } else { // label - label = _("Firewall package is not installed"); + label = _("Firewall package is not installed."); } } else if (status == `off) @@ -469,8 +469,9 @@ Report::Message ( sformat ( - _("These network interfaces assigned to internal network cannot be unselected: -%1"), + _("These network interfaces assigned to internal network cannot be deselected: +%1 +"), mergestring (int_not_selected, "\n") ) ); Modified: trunk/yast2/library/network/src/NetworkService.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkService.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkService.ycp (original) +++ trunk/yast2/library/network/src/NetworkService.ycp Thu Mar 29 14:04:52 2012 @@ -165,7 +165,7 @@ y2internal("RunningNetworkPopup %1", isNetworkRunning()); if (isNetworkRunning()) return true; else { - string error_text = sformat("%1\n%2 %3", _("No running network detected!"), + string error_text = sformat("%1\n%2 %3", _("No running network detected."), Mode::installation() ? _("Restart installation and configure network in Linuxrc") : _("Configure network with YaST or Network Manager plug-in Modified: trunk/yast2/library/network/src/SuSEFirewallProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFirewallProposal.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallProposal.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallProposal.ycp Thu Mar 29 14:04:52 2012 @@ -517,7 +517,7 @@ is_ssh_enabled = true; // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - output = output + "<li>" + _("SSH port is open (close</a>), but there are still no network interfaces configured") + "</li>"; + output = output + "<li>" + _("SSH port is open (close</a>), but\nthere are no network interfaces configured") + "</li>"; } y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled"); Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacks.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Thu Mar 29 14:04:52 2012 @@ -435,7 +435,8 @@ // TODO: add "Don't show again" checkbox // a warning popup displayed after pressing [Ignore] after a download error Popup::Warning(_("Ignoring a download failure may result in a broken system. -The system should be later verified by running the Software Management module.")); +Verify the system later by running the Software Management module. +")); } return "I"; @@ -1305,7 +1306,7 @@ y2milestone ("Source create: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details - string message = _("Error occurred while creating the repository."); + string message = _("An error occurred while creating the repository."); if (error == `NOT_FOUND) // error message - a label followed by a richtext with details Modified: trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp (original) +++ trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp Thu Mar 29 14:04:52 2012 @@ -377,10 +377,12 @@ // %3 is URL of the repository _("The file %1 from repository %2 %3 -is not digitally signed. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +is not digitally signed. The origin and integrity of the file +cannot be verified. Using the file anyway puts the integrity of your +system at risk. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), repo["url"]:_("Unknown")); UI::OpenDialog( @@ -425,11 +427,12 @@ string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name _("No checksum for package %1 was found in the repository. -This means that the package is part of the signed repository, but the list of checksums -in this repository does not mention this package. Installing the package may put +While the package is part of the signed repository, it is not contained +in the list of checksums in this repository. Installing the package puts the integrity of your system at risk. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename _("No checksum for file %1 was found in the repository. @@ -530,22 +533,24 @@ %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the package has been changed by accident or by an attacker +The package has been changed, either by accident or by an attacker, since the repository creator signed it. Installing it is a big risk for the integrity and security of your system. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline) _("File %1 from repository %2 %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the file has been changed by accident or by an attacker +The file has been changed, either by accident or by an attacker, since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), @@ -673,23 +678,25 @@ _("The package %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a package from an unknown repository can put +Installing a package from an unknown repository puts the integrity of your system at risk. It is safest -to skip the package.") +to skip the package. +") : // popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name _("The file %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a file from an unknown repository can put +Installing a file from an unknown repository puts the integrity of your system at risk. It is safest -to skip it.") +to skip it. +") ), item_name, key["id"]:"", key["name"]:""); UI::OpenDialog( @@ -880,11 +887,12 @@ is %2, but the current checksum is %3. -This means that the file has been changed by accident or by an attacker +The file has been changed by accident or by an attacker since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?"), +Use it anyway? +"), filename, requested_digest, found_digest @@ -912,9 +920,10 @@ but the expected checksum is not known. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +cannot be verified. Using the file puts the integrity of your system at risk. -Use it anyway?"), +Use it anyway? +"), filename, digest ); Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/SlideShow.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Thu Mar 29 14:04:52 2012 @@ -647,7 +647,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 being installed.</p>") + string help_text = _("<p>Packages are being installed.</p>") + _("<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"); return help_text; Modified: trunk/yast2/library/system/src/FileChanges.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/FileChanges.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/system/src/FileChanges.ycp (original) +++ trunk/yast2/library/system/src/FileChanges.ycp Thu Mar 29 14:04:52 2012 @@ -156,7 +156,8 @@ { // Continue/Cancel question, %1 is a file name string msg = _("File %1 has been changed manually. -YaST might lose some of the changes"); +YaST might lose some of the changes. +"); if (size (files) > 1) // Continue/Cancel question, %1 is a coma separated list of file names msg = _("Files %1 have been changed manually. Modified: trunk/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Confirm.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/wizard/src/Confirm.ycp (original) +++ trunk/yast2/library/wizard/src/Confirm.ycp Thu Mar 29 14:04:52 2012 @@ -74,7 +74,7 @@ `VSpacing(0.5), // This is in information message. Next come the // hardware class name (network cards). - `HVCenter(`Label(_("YaST2 will detect the following hardware:"))), + `HVCenter(`Label(_("YaST will detect the following hardware:"))), `HVCenter(`HBox(icon, `HSpacing(0.5), `Heading(class))), `VSpacing(0.5) ))), Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.ycp?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Thu Mar 29 14:04:52 2012 @@ -235,7 +235,9 @@ `VSpacing(0.2), `HBox( // translators: dialog title to appear before any content is initialized - `Heading(`id(`title), `opt (`hstretch), _("YaST2\nInitializing ...")), + `Heading(`id(`title), `opt (`hstretch), _("YaST +Initializing ... +")), `HStretch() ), `VWeight( 1, // Layout trick: Lower layout priority with weight @@ -415,7 +417,7 @@ if ( haveFancyUI() ) { UI::OpenDialog(`opt(`wizardDialog ), - `Wizard(`apply, _( "&Apply" ), + `Wizard(`apply, _("&Apply"), `abort, Label::AbortButton(), `finish, Label::FinishButton() ) ); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=67753&r1=67752&r2=67753&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Mar 29 14:04:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 14:02:47 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts +- 2.22.6 + +------------------------------------------------------------------- Wed Mar 28 11:58:34 CEST 2012 - gs@suse.de - Revert the change in FileUtils::Exists() (change is not needed -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org