Hello community,
here is the log from the commit of package yast2-firewall
checked in at Mon Oct 2 19:17:54 CEST 2006.
--------
--- yast2-firewall/yast2-firewall.changes 2006-10-02 09:04:46.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes 2006-10-02 17:20:38.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 2 16:46:11 CEST 2006 - locilka@suse.cz
+
+- Merged proofread texts
+- 2.13.13
+
+-------------------------------------------------------------------
Old:
----
yast2-firewall-2.13.12.tar.bz2
New:
----
yast2-firewall-2.13.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.VYDuJE/_old 2006-10-02 19:15:25.000000000 +0200
+++ /var/tmp/diff_new_pack.VYDuJE/_new 2006-10-02 19:15:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firewall (Version 2.13.12)
+# spec file for package yast2-firewall (Version 2.13.13)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-firewall
-Version: 2.13.12
+Version: 2.13.13
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firewall-2.13.12.tar.bz2
+Source0: yast2-firewall-2.13.13.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 >= 2.13.70
@@ -39,7 +39,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-firewall-2.13.12
+%setup -n yast2-firewall-2.13.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,9 @@
%changelog -n yast2-firewall
* Mon Oct 02 2006 - locilka@suse.cz
+- Merged proofread texts
+- 2.13.13
+* Mon Oct 02 2006 - locilka@suse.cz
- Added missing firewall icon to all dialogs
- Removed warning pop-up message that firewall will be
started/stopped when it gets enabled/disabled.
++++++ yast2-firewall-2.13.12.tar.bz2 -> yast2-firewall-2.13.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/Makefile.am new/yast2-firewall-2.13.13/Makefile.am
--- old/yast2-firewall-2.13.12/Makefile.am 2006-10-02 09:06:08.000000000 +0200
+++ new/yast2-firewall-2.13.13/Makefile.am 2006-10-02 17:19:03.000000000 +0200
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/Makefile.in new/yast2-firewall-2.13.13/Makefile.in
--- old/yast2-firewall-2.13.12/Makefile.in 2006-10-02 09:06:13.000000000 +0200
+++ new/yast2-firewall-2.13.13/Makefile.in 2006-10-02 17:19:10.000000000 +0200
@@ -705,7 +705,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
@CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$<
dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/VERSION new/yast2-firewall-2.13.13/VERSION
--- old/yast2-firewall-2.13.12/VERSION 2006-10-02 09:04:56.000000000 +0200
+++ new/yast2-firewall-2.13.13/VERSION 2006-10-02 17:20:16.000000000 +0200
@@ -1 +1 @@
-2.13.12
+2.13.13
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/autodocs-ycp.ami new/yast2-firewall-2.13.13/autodocs-ycp.ami
--- old/yast2-firewall-2.13.12/autodocs-ycp.ami 2006-10-02 09:06:08.000000000 +0200
+++ new/yast2-firewall-2.13.13/autodocs-ycp.ami 2006-10-02 17:19:03.000000000 +0200
@@ -1,18 +1,27 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
# PARAMETERS:
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
htmldir = $(docdir)/autodocs
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
- ${YCPDOC} -d. $^
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/doc/autodocs/Makefile.in new/yast2-firewall-2.13.13/doc/autodocs/Makefile.in
--- old/yast2-firewall-2.13.12/doc/autodocs/Makefile.in 2006-10-02 09:06:13.000000000 +0200
+++ new/yast2-firewall-2.13.13/doc/autodocs/Makefile.in 2006-10-02 17:19:09.000000000 +0200
@@ -17,13 +17,15 @@
# Makefile.am for YCP module .../doc/autodocs
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
# PARAMETERS:
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -175,7 +177,7 @@
ystartupdir = @ystartupdir@
htmldir = $(docdir)/autodocs
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
.SUFFIXES:
@@ -349,9 +351,17 @@
uninstall-am uninstall-htmlDATA uninstall-info-am
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/src/helps.ycp new/yast2-firewall-2.13.13/src/helps.ycp
--- old/yast2-firewall-2.13.12/src/helps.ycp 2006-08-10 10:22:34.000000000 +0200
+++ new/yast2-firewall-2.13.13/src/helps.ycp 2006-10-02 16:55:23.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Firewall dialogs helps
* Authors: Lukas Ocilka
*
- * $Id: helps.ycp 32099 2006-08-02 09:27:58Z locilka $
+ * $Id: helps.ycp 33232 2006-10-02 14:55:21Z locilka $
*
* File includes helps for yast2-firewall dialogs.
*/
@@ -147,38 +147,38 @@
"),
// TRANSLATORS: Additional Services dialog help 1/6
- "additional-services" : _("<p>Here you can enter some additional
-ports or protocols to be enabled in the respective firewall zone.</p>") +
+ "additional-services" : _("<p>Here, enter additional
+ports or protocols to enable in the firewall zone.</p>") +
// TRANSLATORS: Additional Services dialog help 2/6
// please, do not modify examples
_("<p><b>TCP Ports</b> and <b>UDP Ports</b> can be entered as
-list of port numbers, port names or port ranges separated by spaces,
-e.g., <tt>22</tt>, <tt>http</tt> or <tt>137:139</tt>.</p>") +
+a list of port numbers, port names, or port ranges separated by spaces,
+such as <tt>22</tt>, <tt>http</tt>, or <tt>137:139</tt>.</p>") +
// TRANSLATORS: Additional Services dialog help 3/6
// please, do not modify examples
- _("<p><b>RPC Ports</b> is a list of RPC services, e.g.,
-<tt>nlockmgr</tt>, <tt>ypbind</tt> or <tt>portmap</tt> separated by spaces.</p>") +
+ _("<p><b>RPC Ports</b> is a list of RPC services, such as
+<tt>nlockmgr</tt>, <tt>ypbind</tt>, or <tt>portmap</tt>, separated by spaces.</p>") +
// TRANSLATORS: Additional Services dialog help 4/6
// please, do not modify examples
- _("<p><b>IP Protocols</b> is a list of protocols, e.g.,
-<tt>esp</tt>, <tt>smp</tt> or <tt>chaos</tt> separated by spaces.
-The current list of protocols can be found at
-http://www.iana.org/assignments/protocol-numbers location.</p>") +
+ _("<p><b>IP Protocols</b> is a list of protocols, such as
+<tt>esp</tt>, <tt>smp</tt>, or <tt>chaos</tt>, separated by spaces.
+Find the current list of protocols at
+http://www.iana.org/assignments/protocol-numbers.</p>") +
// TRANSLATORS: Additional Services dialog help 5/6
// please, do not modify examples
- _("<p><b>Port range</b> is a couple of numbers, with a colon in between,
-and it represents all numbers inside the range including the numbers themselves.
+ _("<p><b>Port Range</b> is two numbers with a colon in between that represents
+all numbers inside the range including the numbers themselves.
The first port number must be lower than the second one,
-e.g. <tt>200:215</tt>.</p>") +
+for example, <tt>200:215</tt>.</p>") +
// TRANSLATORS: Additional Services dialog help 6/6
- _("<p><b>Port name</b> is a name assigned to port number by the IANA
-organization. One port number can have more port names assigned. The current
-assignment in use can be found in the <tt>/etc/services</tt> file.</p>")
+ _("<p>The <b>Port Name</b> is a name assigned to a port number by the IANA
+organization. One port number can have multiple port names assigned. Find
+the assignment currently in use in the <tt>/etc/services</tt> file.</p>")
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.12/src/uifunctions.ycp new/yast2-firewall-2.13.13/src/uifunctions.ycp
--- old/yast2-firewall-2.13.12/src/uifunctions.ycp 2006-10-02 09:05:32.000000000 +0200
+++ new/yast2-firewall-2.13.13/src/uifunctions.ycp 2006-10-02 16:55:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration dialogs handling functions
* Authors: Lukas Ocilka
*
- * $Id: uifunctions.ycp 33202 2006-10-02 07:05:30Z locilka $
+ * $Id: uifunctions.ycp 33232 2006-10-02 14:55:21Z locilka $
*
* Configuration dialogs handling.
* Both Expert and Simple.
@@ -365,7 +365,7 @@
port_err + "\n\n" +
// TRANSLATORS: popup message, %1 stands for the maximal port number
// that is possible to use in port-range
- sformat(_("Port number must be in the interval from 1 to %1 included."), SuSEFirewall::max_port_number)
+ sformat(_("The port number must be in the interval from 1 to %1 (inclusive)."), SuSEFirewall::max_port_number)
);
}
@@ -469,14 +469,13 @@
list <string> ports = splitstring(services_definition, ",");
return Popup::YesNoHeadline (
// TRANSLATORS: popup headline
- _("Invalid Additional Services Definition"),
+ _("Invalid Additional Service Definition"),
// TRANSLATORS: popup message, %1 stands for the wrong settings (might be quite long)
- sformat(_("It appears that the additional services settings
+ sformat(_("It appears that the additional service settings
%1
-are wrong. Entries should be separated by spaces instead of commas
-that are not allowed.
-
-Are you sure you want to use the current settings?"), services_definition)
+are wrong. Entries should be separated by spaces instead of commas,
+which are not allowed.
+Really use the current settings?"), services_definition)
);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org