Hello community, here is the log from the commit of package yast2 checked in at Tue Jul 18 23:48:23 CEST 2006. -------- --- yast2/yast2.changes 2006-07-17 10:34:59.000000000 +0200 +++ yast2/yast2.changes 2006-07-18 16:17:39.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 18 16:02:46 CEST 2006 - jsrain@suse.cz + +- fixed handling of translated strings in control file (eg. + congratulate string) +- 2.13.68 + +------------------------------------------------------------------- +Tue Jul 18 10:24:24 CEST 2006 - locilka@suse.cz + +- Fixed proposal to reflect the current status better. Network + interfaces might be assigned to the zone with 'any' in 'EXT'. + If there are no network interfaces but SSH port is open, proposal + informs about it (#154401). +- If there are only dial-up interfaces, SSH port can be also + enabled and correctly informs about the current state. + +------------------------------------------------------------------- Old: ---- yast2-2.13.67.tar.bz2 New: ---- yast2-2.13.68.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.d5IkSN/_old 2006-07-18 23:47:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d5IkSN/_new 2006-07-18 23:47:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.67) +# spec file for package yast2 (Version 2.13.68) # # 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 -Version: 2.13.67 +Version: 2.13.68 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.67.tar.bz2 +Source0: yast2-2.13.68.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -95,7 +95,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.13.67 +%setup -n yast2-2.13.68 %build %{prefix}/bin/y2tool y2autoconf @@ -194,6 +194,17 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Tue Jul 18 2006 - jsrain@suse.cz +- fixed handling of translated strings in control file (eg. + congratulate string) +- 2.13.68 +* Tue Jul 18 2006 - locilka@suse.cz +- Fixed proposal to reflect the current status better. Network + interfaces might be assigned to the zone with 'any' in 'EXT'. + If there are no network interfaces but SSH port is open, proposal + informs about it (#154401). +- If there are only dial-up interfaces, SSH port can be also + enabled and correctly informs about the current state. * Sun Jul 16 2006 - olh@suse.de - introduce a Linuxrc::display_ip and use it instead of Arch::s390 - 2.13.67 ++++++ yast2-2.13.67.tar.bz2 -> yast2-2.13.68.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/VERSION new/yast2-2.13.68/VERSION --- old/yast2-2.13.67/VERSION 2006-07-17 10:19:07.000000000 +0200 +++ new/yast2-2.13.68/VERSION 2006-07-18 16:05:27.000000000 +0200 @@ -1 +1 @@ -2.13.67 +2.13.68 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/configure new/yast2-2.13.68/configure --- old/yast2-2.13.67/configure 2006-07-17 10:29:17.000000000 +0200 +++ new/yast2-2.13.68/configure 2006-07-18 16:15:25.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2 2.13.67. +# Generated by GNU Autoconf 2.59 for yast2 2.13.68. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.67' -PACKAGE_STRING='yast2 2.13.67' +PACKAGE_VERSION='2.13.68' +PACKAGE_STRING='yast2 2.13.68' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.13.67 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.68 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.13.67:";; + short | recursive ) echo "Configuration of yast2 2.13.68:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.67 +yast2 configure 2.13.68 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.13.67, which was +It was created by yast2 $as_me 2.13.68, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.13.67' + VERSION='2.13.68' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.67" +VERSION="2.13.68" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov@suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.67, which was +This file was extended by yast2 $as_me 2.13.68, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.67 +yast2 config.status 2.13.68 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/configure.in new/yast2-2.13.68/configure.in --- old/yast2-2.13.67/configure.in 2006-07-17 10:29:07.000000000 +0200 +++ new/yast2-2.13.68/configure.in 2006-07-18 16:15:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.67, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.13.68, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.67" +VERSION="2.13.68" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/library/control/src/ProductControl.ycp new/yast2-2.13.68/library/control/src/ProductControl.ycp --- old/yast2-2.13.67/library/control/src/ProductControl.ycp 2006-06-26 08:17:31.000000000 +0200 +++ new/yast2-2.13.68/library/control/src/ProductControl.ycp 2006-07-18 16:03:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Product Control routines * Authors: Anas Nashif <nashif@suse.de> * - * $Id: ProductControl.ycp 30912 2006-05-15 10:59:24Z jsrain $ + * $Id: ProductControl.ycp 31933 2006-07-18 14:05:17Z jsrain $ */ { textdomain "base"; @@ -39,7 +39,7 @@ global list<string> clone_modules = []; // texts which are product specific -global map<string,string> texts = $[]; +map<string,map<string, string> > texts = $[]; // Location of a custom control file global string custom_control_file = ""; @@ -163,11 +163,15 @@ ProductFeatures::SetFeature ("partitioning", "FlexiblePartitioning", partitioning); } + string textdom = productControl["textdomain"]:"control"; texts = mapmap (string key, map<string,string> text, productControl["texts"]:$[], { string label = text["label"]:""; - return $[ key : label ]; + return $[ key : $[ + "label" : label, + "textdomain" : textdom, + ] ]; }); return true; } @@ -738,7 +742,22 @@ } - +global string GetTranslatedText (string key) { + map<string,string> text = texts[key]:$[]; + string label = text["label"]:""; + if (label == "") + { + y2error ("The requested label %1 does not exist", key); + return ""; + } + string domain = text["textdomain"]:""; + if (domain == "") + { + y2error ("The text domain for label %1 not set", key); + return label; + } + return dgettext (domain, label); +} /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/library/modules/Version.ycp new/yast2-2.13.68/library/modules/Version.ycp --- old/yast2-2.13.67/library/modules/Version.ycp 2006-07-17 10:30:03.000000000 +0200 +++ new/yast2-2.13.68/library/modules/Version.ycp 2006-07-18 16:16:13.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.67"; +global string yast2 = "2.13.68"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.13.68/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.13.67/library/network/src/CWMFirewallInterfaces.ycp 2006-06-26 08:18:12.000000000 +0200 +++ new/yast2-2.13.68/library/network/src/CWMFirewallInterfaces.ycp 2006-07-18 15:33:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 31263 2006-06-01 16:08:54Z locilka $ + * $Id: CWMFirewallInterfaces.ycp 31893 2006-07-17 09:20:01Z locilka $ * * WARNING: If you want to use this functionality of this module * you should allways call 'SuSEFirewall::Read()' in the @@ -58,26 +58,11 @@ */ boolean configuration_changed = nil; -///** -// * NetworkManager handles some network interfaces -// */ -//boolean nm_managed = nil; - -///** -// * String used as a fake interface name -// */ -//string special_all_nm_interfaces = ">>__this__string__includes__all__NM__interfaces__<<"; - /** * `Any`-feature is supported in the firewall configuration */ boolean any_iface_supported = nil; -///** -// * NetworkManager interfaces were selected, or are supported by the current configuration -// */ -//boolean nm_ifaces_have_to_be_supported = nil; - // private functions /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/library/network/src/SuSEFirewall.ycp new/yast2-2.13.68/library/network/src/SuSEFirewall.ycp --- old/yast2-2.13.67/library/network/src/SuSEFirewall.ycp 2006-07-17 10:19:06.000000000 +0200 +++ new/yast2-2.13.68/library/network/src/SuSEFirewall.ycp 2006-07-18 15:33:18.000000000 +0200 @@ -33,13 +33,19 @@ */ boolean configuration_has_been_read = false; - /* String which includes all interfaces not-defined in any zone */ + /** + * String which includes all interfaces not-defined in any zone + */ global string special_all_interface_string = "any"; - /* Zone which works with the special_all_interface_string string */ + /** + * Zone which works with the special_all_interface_string string + */ global string special_all_interface_zone = "EXT"; - /* Maximal number of port number, they are in the interval 1-65535 included */ + /** + * Maximal number of port number, they are in the interval 1-65535 included + */ global integer max_port_number = 65535; /* firewall settings map */ @@ -1691,6 +1697,21 @@ } /** + * Function returns list of dial-up interfaces. + * + * @return list <string> of dial-up interface names + */ + global define list <string> GetAllDialUpInterfaces () { + list <string> dial_up_interfaces = []; + foreach (map <string, string> interface, SuSEFirewall::GetAllKnownInterfaces(), { + if (interface["type"]:nil == "dial_up") + dial_up_interfaces = add (dial_up_interfaces, interface["id"]:""); + }); + + return dial_up_interfaces; + } + + /** * Function returns list of all known interfaces. * * @return list <string> of interfaces diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.67/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.13.68/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.13.67/library/network/src/SuSEFirewallProposal.ycp 2006-07-14 13:52:58.000000000 +0200 +++ new/yast2-2.13.68/library/network/src/SuSEFirewallProposal.ycp 2006-07-18 15:33:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functional interface for SuSEFirewall installation proposal * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: SuSEFirewallProposal.ycp 31649 2006-06-26 07:34:33Z locilka $ + * $Id: SuSEFirewallProposal.ycp 31916 2006-07-18 09:01:18Z locilka $ * * This module provides a functional API for Installation proposal of SuSEfirewall2 */ @@ -14,7 +14,6 @@ textdomain "base"; import "SuSEFirewall"; - //import "NetworkService"; import "ProductFeatures"; import "Linuxrc"; import "Package"; @@ -153,25 +152,45 @@ } /** - * Function opens up the service on all non-dial-up network interfaces + * Function opens up the service on all non-dial-up network interfaces. + * If there are no network interfaces known and the 'any' feature is supported, + * function opens the service for the zone supporting that feature. If there + * are only dial-up interfaces, function opens the service for them. * * @param string service such as "ssh" or "vnc" */ global define void OpenServiceOnNonDialUpInterfaces (string service) { list <string> non_dial_up_interfaces = SuSEFirewall::GetAllNonDialUpInterfaces(); + list <string> dial_up_interfaces = SuSEFirewall::GetAllDialUpInterfaces(); - //// NetworkManager is turned on - //if (NetworkService::IsManaged()) { - // string zone = "EXT"; - // y2milestone("Opening service %1 for %2 zone", service, zone); - // SuSEFirewall::SetServicesForZones([service], [zone], true); - //// NetworkManager is turned off and there are some non_dup interfaces - //} else if (size(non_dial_up_interfaces)>0) { + // Opening the service for non-dial-up interfaces if (size(non_dial_up_interfaces)>0) { list <string> non_dial_up_interfaces_zones = SuSEFirewall::GetZonesOfInterfaces(non_dial_up_interfaces); y2milestone("Opening service %1 on interfaces %2 (zones %3)", service, non_dial_up_interfaces, non_dial_up_interfaces_zones); SuSEFirewall::SetServicesForZones([service], non_dial_up_interfaces_zones, true); + + // Only dial-up network interfaces, there mustn't be any non-dial-up one + } else if (size(dial_up_interfaces) > 0) { + list <string> dial_up_interfaces_zones = SuSEFirewall::GetZonesOfInterfaces(dial_up_interfaces); + y2warning("Opening service %1 on interfaces %2 (zones %3)", + service, dial_up_interfaces, dial_up_interfaces_zones); + SuSEFirewall::SetServicesForZones([service], dial_up_interfaces_zones, true); + + // No network interfaces are known + } else if (size(known_interfaces) == 0) { + if ( + SuSEFirewall::IsAnyNetworkInterfaceSupported() && + SuSEFirewall::IsServiceSupportedInZone (service, SuSEFirewall::special_all_interface_zone) + ) { + y2warning("WARNING: Opening %1 for the External zone without any known interface!", toupper(service)); + SuSEFirewall::SetServicesForZones([service], [SuSEFirewall::special_all_interface_zone], true); + y2milestone("By now, %1 for %2 zone is %3", + service, + SuSEFirewall::special_all_interface_zone, + SuSEFirewall::IsServiceSupportedInZone (service, SuSEFirewall::special_all_interface_zone) + ); + } } } @@ -208,31 +227,12 @@ dial_up_interfaces, non_dup_interfaces ); - //// has no network interface - //// and NetworkManager is disabled (#139402) - //if (size(non_dup_interfaces)==0 && size(dial_up_interfaces)==0 && - // !NetworkService::IsManaged ()) { - // SuSEFirewall::SetEnableService(false); - // SuSEFirewall::SetStartService(false); - //} else { - // has any network interface if (size(non_dup_interfaces)==0 || size(dial_up_interfaces)==0) { SuSEFirewall::SetEnableService(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); SuSEFirewall::SetStartService(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); } - //// NetworkManager is enabled - //if (NetworkService::IsManaged()) { - // string special_all_interface_string = SuSEFirewall::special_all_interface_string; - // string zone = SuSEFirewall::special_all_interface_zone; - // // Adding all interfaces into the $zone zone - // if (!contains(SuSEFirewall::GetSpecialInterfacesInZone(zone), special_all_interface_string)) { - // SuSEFirewall::AddSpecialInterfaceIntoZone(special_all_interface_string, zone); - // } - //// NetworkManager is disabled - //} else { - // has non-dial-up and also dial-up interfaces if (size(non_dup_interfaces)>0 && size(dial_up_interfaces)>0) { SetInterfacesToZone(non_dup_interfaces, "INT"); @@ -253,8 +253,6 @@ SuSEFirewall::SetServicesForZones(["ssh"], ["EXT"], true); } - //} - /* * Dial-up interfaces are considered to be internal, * Non-dial-up are considered to be external. @@ -371,52 +369,55 @@ output = output + "<ul>\n"; output = output + (firewall_is_enabled ? // TRANSLATORS: Proposal informative text "Firewall is enabled" with link around - // "enabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("Firewall is %1enabled%2"), "<a href=\"firewall--disable_firewall_in_proposal\">", "</a>") + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("Firewall is <a href=\"firewall--disable_firewall_in_proposal\">enabled</a>") : // TRANSLATORS: Proposal informative text "Firewall is disabled" with link around - // "disabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("Firewall is %1disabled%2"), "<a href=\"firewall--enable_firewall_in_proposal\">", "</a>") + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("Firewall is <a href=\"firewall--enable_firewall_in_proposal\">disabled</a>") ); if (firewall_is_enabled) { // Any enabled SSH means SSH-is-enabled boolean is_ssh_enabled = false; - //// Any known interfaces, or NetworkManager interfaces - //if ((size(known_interfaces)>0) || NetworkService::IsManaged()) + + // Any known interfaces if (size(known_interfaces)>0) { y2milestone("Interfaces: %1", known_interfaces); + // all known interfaces for testing - list <string> used_zones = SuSEFirewall::GetZonesOfInterfaces(known_interfaces); + list <string> used_zones = SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported(known_interfaces); y2milestone("Zones used by firewall: %1", used_zones); - - //// NM is used, add also NM-Zone - //if (NetworkService::IsManaged() && SuSEFirewall::IsAnyNetworkInterfaceSupported()) { - // used_zones = add (used_zones, SuSEFirewall::special_all_interface_zone); - // y2milestone("NM is used, zone %1 was added into used zones %2", SuSEFirewall::special_all_interface_zone, used_zones); - //} - + foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("ssh", zone)) + if (SuSEFirewall::IsServiceSupportedInZone ("ssh", zone)) { is_ssh_enabled = true; + } }); + + output = output + "<br>" + (is_ssh_enabled ? + // TRANSLATORS: Network proposal informative text with link around + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("SSH port is <a href=\"firewall--disable_ssh_in_proposal\">open</a>") + : + // TRANSLATORS: Network proposal informative text with link around + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("SSH port is <a href=\"firewall--enable_ssh_in_proposal\">blocked</a>") + ); + + // No known interfaces, but 'any' is supported + // and ssh is enabled there + } else if ( + SuSEFirewall::IsAnyNetworkInterfaceSupported() && + SuSEFirewall::IsServiceSupportedInZone ("ssh", SuSEFirewall::special_all_interface_zone) + ) { + 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 + "<br>" + _("SSH port is <a href=\"firewall--disable_ssh_in_proposal\">open</a>, but there are still no network interfaces configured"); } y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled"); - output = output + "<br>" + (is_ssh_enabled ? - // TRANSLATORS: Network proposal informative text "SSH is enabled" with link around - // "enabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("SSH port is %1open%2"), "<a href=\"firewall--disable_ssh_in_proposal\">", "</a>") - : - // TRANSLATORS: Network proposal informative text "SSH is disabled" with link around - // "disabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("SSH port is %1blocked%2"), "<a href=\"firewall--enable_ssh_in_proposal\">", "</a>") - ); - if (Linuxrc::usessh()) { if (!is_ssh_enabled) // TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall @@ -428,7 +429,7 @@ // Any enabled VNC means VNC-is-enabled boolean is_vnc_enabled = false; if (size(known_interfaces)>0) { - foreach (string zone, SuSEFirewall::GetZonesOfInterfaces(known_interfaces), { + foreach (string zone, SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported(known_interfaces), { if (SuSEFirewall::IsServiceSupportedInZone ("vnc", zone)) is_vnc_enabled = true; }); @@ -437,14 +438,12 @@ output = output + "<br>" + (is_vnc_enabled ? // TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around - // "enabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("Remote Administration (VNC) ports are %1open%2"), "<a href=\"firewall--disable_vnc_in_proposal\">", "</a>") + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("Remote Administration (VNC) ports are <a href=\"firewall--disable_vnc_in_proposal\">open</a>") : // TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around - // "disabled" must be surrounded with the "%1" and "%2" strings - // %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" - sformat(_("Remote Administration (VNC) ports are %1blocked%2"), "<a href=\"firewall--enable_vnc_in_proposal\">", "</a>") + // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + _("Remote Administration (VNC) ports are <a href=\"firewall--enable_vnc_in_proposal\">blocked</a>") ); if (!is_vnc_enabled) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de