Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67766 - in /trunk/firewall: package/yast2-firewall.changes src/helps.ycp src/summary.ycp src/uifunctions.ycp
Author: jsuchome
Date: Thu Mar 29 14:45:55 2012
New Revision: 67766

URL: http://svn.opensuse.org/viewcvs/yast?rev=67766&view=rev
Log:
- merged proofread texts


Modified:
trunk/firewall/package/yast2-firewall.changes
trunk/firewall/src/helps.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=67766&r1=67765&r2=67766&view=diff
==============================================================================
--- trunk/firewall/package/yast2-firewall.changes (original)
+++ trunk/firewall/package/yast2-firewall.changes Thu Mar 29 14:45:55 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Mar 29 14:45:40 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofread texts
+
+-------------------------------------------------------------------
Fri Nov 4 15:50:22 CET 2011 - locilka@xxxxxxx

- Added function keys for buttons (bnc#595564)

Modified: trunk/firewall/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/helps.ycp?rev=67766&r1=67765&r2=67766&view=diff
==============================================================================
--- trunk/firewall/src/helps.ycp (original)
+++ trunk/firewall/src/helps.ycp Thu Mar 29 14:45:55 2012
@@ -52,15 +52,16 @@

// TRANSLATORS: Allowed services dialog help 1/2
"allowed-services" : _("<p><b><big>Allowed Services</big></b>
-<br>Here, specify services or ports that should be accessible from the network.
+<br>Specify services or ports that should be accessible from the network.
Networks are divided into firewall zones.</p>

<p>To allow a service, select the <b>Zone</b> and the
<b>Service to Allow</b> then press <b>Add</b>.
To remove an allowed service, select the <b>Zone</b> and the <b>Allowed
Service</b> then press <b>Delete</b>.</p>

-<p>By deselecting <b>Protect Firewall from Internal Zone</b>, remove
-protection from the zone. All services and ports would be unprotected from
this zone.</p>
+<p>By deselecting <b>Protect Firewall from Internal Zone</b>, you remove
+protection from the zone. All services and ports in your internal network will
+be unprotected.</p>
") +

// TRANSLATORS: Allowed services dialog help 2/2
@@ -191,18 +192,21 @@

// TRANSLATORS: help for Installation Proposal Dialog
"installation_proposal" : _("<p><b><big>Firewall</big></b><br />
-Firewall is a defensive mechanism that protects your computer from network
attacks.</p>"),
+A firewall is a defensive mechanism that protects your computer from network
attacks.</p>
+"),

// TRANSLATORS: general help for Custom Rules 1/5
"custom-rules" : _("<p><b><big>Custom Rules</big></b><br>
-Here you can set special firewall rules that allow new connections
-matching these rules.</p>") +
+Set special firewall rules that allow new connections
+matching these rules.</p>
+") +

// TRANSLATORS: general help for Custom Rules 2/5
_("<p><b>Source Network</b><br>
-Network or IP where the connection comes from,
+Network or IP address where the connection comes from,
e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt>
-or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>") +
+or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>
+") +

// TRANSLATORS: general help for Custom Rules 3/5
_("<p><b>Protocol</b><br>
@@ -223,9 +227,10 @@

// TRANSLATORS: help for Custom Rules - Adding new rule 1/4
"custom-rules-popup" : _("<p><b>Source Network</b><br>
-Network or IP where the connection comes from,
+Network or IP address where the connection comes from,
e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt>
-or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>") +
+or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>
+") +

// TRANSLATORS: help for Custom Rules - Adding new rule 2/4
_("<p><b>Protocol</b><br>

Modified: trunk/firewall/src/summary.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=67766&r1=67765&r2=67766&view=diff
==============================================================================
--- trunk/firewall/src/summary.ycp (original)
+++ trunk/firewall/src/summary.ycp Thu Mar 29 14:45:55 2012
@@ -331,21 +331,21 @@
// Is running and will be running again
if (SuSEFirewall::IsStarted()) {
// TRANSLATORS: Summary text item
- ret_message = ret_message + li_start + _("Firewall starts after
the configuration gets written") + li_end + "\n";
+ ret_message = ret_message + li_start + _("Firewall starts after
the configuration has been written") + li_end + "\n";
// Is stopped and will be running
} else {
// TRANSLATORS: Summary text item
- ret_message = ret_message + li_start + _("Firewall
<b>starts</b> after the configuration gets written") + li_end + "\n";
+ ret_message = ret_message + li_start + _("Firewall
<b>starts</b> after the configuration has been written") + li_end + "\n";
}
} else {
// Is running and will be stopped
if (SuSEFirewall::IsStarted()) {
// TRANSLATORS: Summary text item
- ret_message = ret_message + li_start + _("Firewall <b>will be
stopped</b> after the configuration is written") + li_end + "\n";
+ ret_message = ret_message + li_start + _("Firewall <b>will be
stopped</b> after the configuration has been written") + li_end + "\n";
// Is not running and will not be running
} else {
// TRANSLATORS: Summary text item
- ret_message = ret_message + li_start + _("Firewall will not
start after the configuration is written") + li_end + "\n";
+ ret_message = ret_message + li_start + _("Firewall will not
start after the configuration has been written") + li_end + "\n";
}
}


Modified: trunk/firewall/src/uifunctions.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev=67766&r1=67765&r2=67766&view=diff
==============================================================================
--- trunk/firewall/src/uifunctions.ycp (original)
+++ trunk/firewall/src/uifunctions.ycp Thu Mar 29 14:45:55 2012
@@ -1206,7 +1206,8 @@
if (Popup::YesNo (_("Firewall automatic starting has been disabled
but firewall is currently running.

-Stop the firewall after the new configuration is written?"))) {
+Stop the firewall after the new configuration has been written?
+"))) {
y2milestone ("User decided to stop the firewall after it is
disabled");
new_running = false;
} else {

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages