Author: locilka Date: Fri Nov 2 14:30:12 2007 New Revision: 41743 URL: http://svn.opensuse.org/viewcvs/yast?rev=41743&view=rev Log: - YCP module Internet moved from yast2-network to yast2 to remove RPM dependencies. - Adjusted RPM dependencies. - Added some more texts for firewall services defined by packages. - 2.16.6 Added: trunk/yast2/library/network/src/Internet.ycp - copied unchanged from r41738, trunk/network/src/modules/Internet.ycp Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/Makefile.am trunk/yast2/library/network/src/yast2-services-translations.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=41743&r1=41742&r2=41743&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Nov 2 14:30:12 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: trunk/yast2/library/network/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Makefile.am?rev=41743&r1=41742&r2=41743&view=diff ============================================================================== --- trunk/yast2/library/network/src/Makefile.am (original) +++ trunk/yast2/library/network/src/Makefile.am Fri Nov 2 14:30:12 2007 @@ -6,20 +6,7 @@ ynclude_DATA = -module_DATA = \ - NetworkConfig.ycp \ - NetworkDevices.ycp \ - NetworkPopup.ycp \ - NetworkService.ycp \ - NetworkStorage.ycp \ - SuSEFirewall.ycp \ - SuSEFirewallServices.ycp \ - SuSEFirewallExpertRules.ycp \ - PortAliases.ycp \ - PortRanges.ycp \ - SuSEFirewallProposal.ycp \ - SLPAPI.pm \ - CWMFirewallInterfaces.ycp +module_DATA = $(wildcard *.ycp *.pm) EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-services-translations.ycp?rev=41743&r1=41742&r2=41743&view=diff ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Fri Nov 2 14:30:12 2007 @@ -10,6 +10,18 @@ string tmpstring = nil; + // TRANSLATORS: Name of Service (rpm: apache2), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (rpm: apache2), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + + // TRANSLATORS: Name of Service (rpm: apache2-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (rpm: apache2-ssl), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + // TRANSLATORS: Name of Service (rpm: avahi), can be used as check box, item in multiple selection box... tmpstring = _("Zeroconf/Bonjour Multicast DNS"); @@ -31,6 +43,18 @@ // TRANSLATORS: Description of a Service (rpm: bind), used as a common label or an item in table tmpstring = _("Open ports for the bind DNS server"); + // TRANSLATORS: Name of Service (rpm: courier-imap), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (rpm: courier-imap), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + + // TRANSLATORS: Name of Service (rpm: courier-imap-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (rpm: courier-imap-ssl), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + // TRANSLATORS: Name of Service (rpm: cups), can be used as check box, item in multiple selection box... tmpstring = _("cups"); @@ -103,12 +127,21 @@ // TRANSLATORS: Description of a Service (rpm: mysql), used as a common label or an item in table tmpstring = _("opens ports for MySQL in order to allow other hosts connect to it"); + // TRANSLATORS: Name of Service (rpm: nut), can be used as check box, item in multiple selection box... + tmpstring = _("Network UPS Tools"); + + // TRANSLATORS: Description of a Service (rpm: nut), used as a common label or an item in table + tmpstring = _("Opens ports for remote UPS signalling for Network UPS Tools."); + // TRANSLATORS: Name of Service (rpm: openldap), can be used as check box, item in multiple selection box... tmpstring = _("OpenLDAP Server"); // TRANSLATORS: Description of a Service (rpm: openldap), used as a common label or an item in table tmpstring = _("Opens ports for the OpenLDAP Server (slapd)."); + // TRANSLATORS: Description of a Service (rpm: postfix), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for postfix"); + // TRANSLATORS: Name of Service (rpm: postgresql), can be used as check box, item in multiple selection box... tmpstring = _("PostgreSQL Server"); @@ -172,11 +205,11 @@ // TRANSLATORS: Description of a Service (rpm: vsftpd), used as a common label or an item in table tmpstring = _("Opens ports for vsftpd Server."); - // TRANSLATORS: Name of Service (rpm: xorg-x11-Xvnc), can be used as check box, item in multiple selection box... - tmpstring = _("VNC Server"); + // TRANSLATORS: Name of Service (rpm: xntp), can be used as check box, item in multiple selection box... + tmpstring = _("xntp Server"); - // TRANSLATORS: Description of a Service (rpm: xorg-x11-Xvnc), used as a common label or an item in table - tmpstring = _("Opens ports for VNC Server"); + // TRANSLATORS: Description of a Service (rpm: xntp), used as a common label or an item in table + tmpstring = _("Opens ports for xntp."); // TRANSLATORS: Name of Service (rpm: ypbind), can be used as check box, item in multiple selection box... tmpstring = _("NIS Client"); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=41743&r1=41742&r2=41743&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 2 14:30:12 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Nov 2 14:27:14 CET 2007 - locilka@suse.cz + +- YCP module Internet moved from yast2-network to yast2 to remove + RPM dependencies. +- Adjusted RPM dependencies. +- Added some more texts for firewall services defined by packages. +- 2.16.6 + +------------------------------------------------------------------- Thu Nov 1 16:44:07 CET 2007 - locilka@suse.cz - Update/backup-related variables were moved from Update::* to Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41743&r1=41742&r2=41743&view=diff ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Fri Nov 2 14:30:12 2007 @@ -13,7 +13,7 @@ Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils +Requires: coreutils sysconfig Requires: yast2-xml yast2-hardware-detection # for SLPAPI.pm Requires: yast2-perl-bindings @@ -25,7 +25,7 @@ Conflicts: yast2-tune < 2.15.6 Obsoletes: yast2-mail-aliases <= 2.14.0 Conflicts: yast2-storage < 2.15.20 -Conflicts: yast2-network < 2.15.58 +Conflicts: yast2-network < 2.16.6 # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 Conflicts: yast2-update < 2.16.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org