Author: locilka Date: Tue Dec 4 15:31:51 2007 New Revision: 42664 URL: http://svn.opensuse.org/viewcvs/yast?rev=42664&view=rev Log: - Merged proofread texts. Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/dialogs.ycp trunk/firewall/src/firewall_proposal.ycp trunk/firewall/src/summary.ycp trunk/firewall/src/uifunctions.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.changes?rev=42664&r1=42663&r2=42664&view=diff ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Tue Dec 4 15:31:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 4 15:30:30 CET 2007 - locilka@suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Mon Sep 17 17:39:12 CEST 2007 - ug@suse.de - firewall.rnc file fixed for autoyast XML file Modified: trunk/firewall/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/dialogs.ycp?rev=42664&r1=42663&r2=42664&view=diff ============================================================================== --- trunk/firewall/src/dialogs.ycp (original) +++ trunk/firewall/src/dialogs.ycp Tue Dec 4 15:31:51 2007 @@ -36,9 +36,9 @@ "set_service_auto_start" : SetEnableFirewall, // TRANSLATORS: Radio selection - "start_auto_button" : _("&Enable firewall automatic starting"), + "start_auto_button" : _("&Enable Firewall Automatic Starting"), // TRANSLATORS: Radio selection - "start_manual_button" : _("&Disable firewall automatic starting"), + "start_manual_button" : _("&Disable Firewall Automatic Starting"), "help" : sformat(CWMServiceStart::AutoStartHelpTemplate (), // TRANSLATORS: part of help text - radio button label, NO SHORTCUT!!! _("Enable firewall"), Modified: trunk/firewall/src/firewall_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall_proposal.ycp?rev=42664&r1=42663&r2=42664&view=diff ============================================================================== --- trunk/firewall/src/firewall_proposal.ycp (original) +++ trunk/firewall/src/firewall_proposal.ycp Tue Dec 4 15:31:51 2007 @@ -103,7 +103,7 @@ if (! SuSEFirewall::SuSEFirewallIsInstalled()) { // TRANSLATORS: message popup Report::Message (_("Firewall configuration cannot be changed. -SuSEfirewall2 package is not installed.")); +The SuSEfirewall2 package is not installed.")); ret = $[ "workflow_sequence" : `next ]; // Enable firewall Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=42664&r1=42663&r2=42664&view=diff ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Tue Dec 4 15:31:51 2007 @@ -285,11 +285,11 @@ // Is running and will be running again if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; // Is stopped and will be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall <b>will be started</b> after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall <b>starts</b> after the configuration gets written") + li_end + "\n"; } } else { // Is running and will be stopped @@ -299,7 +299,7 @@ // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration gets written") + li_end + "\n"; } } Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev=42664&r1=42663&r2=42664&view=diff ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Tue Dec 4 15:31:51 2007 @@ -1165,10 +1165,10 @@ // disabling firewall if (new_state == false && curr_running == true) { // TRANSLATORS: popup question - if (Popup::YesNo (_("Firewall automatic starting has been just set to be disabled + if (Popup::YesNo (_("Firewall automatic starting has been disabled but firewall is currently running. -Would you like to stop the firewall after the new configuration is written?"))) { +Stop the firewall after the new configuration is written?"))) { y2milestone ("User decided to stop the firewall after it is disabled"); new_running = false; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org