Author: keichwa Date: 2016-09-22 14:11:24 +0200 (Thu, 22 Sep 2016) New Revision: 97018 Modified: branches/plus-SLE12-SP2/yast/en_GB/po/add-on-creator.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/add-on.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/audit-laf.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/auth-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/auth-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/autoinst.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/base.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/bootloader.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/ca-management.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/cio.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/cluster.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/control-center.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/control.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/country.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/crowbar.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/dhcp-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/dns-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/docker.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/drbd.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/fcoe-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/firewall-services.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/firewall.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/firstboot.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/fonts.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/ftp-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/geo-cluster.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/http-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/inetd.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/installation.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/instserver.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/iplb.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-lio-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/isns.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/journal.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/kdump.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/languages_db.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/ldap-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/ldap.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/mail.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/multipath.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/network.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/nfs.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/nfs_server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/nis.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/nis_server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/ntp-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/oneclickinstall.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/online-update-configuration.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/online-update.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/opensuse_mirror.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/packager.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/pam.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/pkg-bindings.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/printer.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/product-creator.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/proxy.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/rear.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/registration.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/relocation-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/samba-client.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/samba-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/samba-users.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/scanner.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/security.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/services-manager.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/slp-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/snapper.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/sound.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/squid.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/sshd.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/storage.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/sudo.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/support.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/sysconfig.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/tftp-server.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/timezone_db.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/tune.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/update.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/users.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/vm.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/wol.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po Log: from SLE12-SP2 plus Factory Modified: branches/plus-SLE12-SP2/yast/en_GB/po/add-on-creator.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/add-on-creator.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/add-on-creator.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:10+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/add-on.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/add-on.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/add-on.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/audit-laf.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/audit-laf.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/audit-laf.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/auth-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/auth-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/auth-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -258,12 +258,12 @@ #: src/lib/authui/ldapkrb/main_dialog.rb:339 #: src/lib/authui/sssd/main_dialog.rb:80 msgid "Users" -msgstr "Users" +msgstr "" #: src/lib/authui/ldapkrb/main_dialog.rb:340 #: src/lib/authui/sssd/main_dialog.rb:81 msgid "Groups" -msgstr "Groups" +msgstr "" #: src/lib/authui/ldapkrb/main_dialog.rb:341 #: src/lib/authui/sssd/main_dialog.rb:82 @@ -447,7 +447,7 @@ #: src/lib/authui/main_dialog.rb:94 msgid "IP Addresses" -msgstr "IP Addresses" +msgstr "" #: src/lib/authui/main_dialog.rb:95 #, fuzzy @@ -540,7 +540,7 @@ #: src/lib/authui/sssd/main_dialog.rb:75 msgid "Running" -msgstr "Running" +msgstr "" #: src/lib/authui/sssd/main_dialog.rb:75 msgid "Stopped" @@ -736,11 +736,11 @@ #: src/lib/authui/sssd/manage_ad_dialog.rb:69 msgid "Username" -msgstr "Username" +msgstr "" #: src/lib/authui/sssd/manage_ad_dialog.rb:70 msgid "Password" -msgstr "Password" +msgstr "" #: src/lib/authui/sssd/manage_ad_dialog.rb:71 msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\"" @@ -1001,7 +1001,7 @@ msgid "Override the user's home directory. You can either provide an absolute value or a template." msgstr "Override the user's home directory. You can either provide an absolute value or a template." -#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1251 +#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." msgstr "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." @@ -1021,7 +1021,7 @@ msgid "The default shell to use if an allowed shell is not installed on the machine." msgstr "The default shell to use if an allowed shell is not installed on the machine." -#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1255 +#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217 msgid "The default shell to use if the provider does not return one during lookup." msgstr "The default shell to use if the provider does not return one during lookup." @@ -1050,8 +1050,8 @@ msgstr "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information." #. The kerberos domain section -#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:809 -#: src/lib/authui/sssd/params.rb:1138 +#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815 +#: src/lib/authui/sssd/params.rb:1100 msgid "Display a warning N days before the password expires." msgstr "Display a warning N days before the password expires." @@ -1253,589 +1253,544 @@ msgid "(Active Directory specific) Use token-groups attribute if available" msgstr "" -#: src/lib/authui/sssd/params.rb:594 +#: src/lib/authui/sssd/params.rb:595 msgid "URIs (ldap://) of LDAP servers (comma separated)" msgstr "" -#: src/lib/authui/sssd/params.rb:599 -msgid "An optional base DN to restrict LDAP sudo-rule searches. The default value is ldap_search_base." -msgstr "" +#: src/lib/authui/sssd/params.rb:601 +msgid "The default base DN to use for performing LDAP sudo rules." +msgstr "The default base DN to use for performing LDAP sudo rules." -#: src/lib/authui/sssd/params.rb:603 +#: src/lib/authui/sssd/params.rb:606 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." -#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:613 +#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." -#: src/lib/authui/sssd/params.rb:618 +#: src/lib/authui/sssd/params.rb:624 #, fuzzy #| msgid "Base DN for the database" msgid "Base DN for LDAP search" msgstr "Base DN for the database" -#: src/lib/authui/sssd/params.rb:625 +#: src/lib/authui/sssd/params.rb:631 #, fuzzy #| msgid "LDAP secure port" msgid "LDAP schema type" msgstr "LDAP secure port" -#: src/lib/authui/sssd/params.rb:629 +#: src/lib/authui/sssd/params.rb:635 msgid "The default bind DN to use for performing LDAP operations." msgstr "The default bind DN to use for performing LDAP operations." -#: src/lib/authui/sssd/params.rb:635 +#: src/lib/authui/sssd/params.rb:641 msgid "The type of the authentication token of the default bind DN." msgstr "The type of the authentication token of the default bind DN." -#: src/lib/authui/sssd/params.rb:639 +#: src/lib/authui/sssd/params.rb:645 msgid "The authentication token of the default bind DN." msgstr "The authentication token of the default bind DN." -#: src/lib/authui/sssd/params.rb:644 +#: src/lib/authui/sssd/params.rb:650 msgid "The object class of a user entry in LDAP." msgstr "The object class of a user entry in LDAP." -#: src/lib/authui/sssd/params.rb:649 +#: src/lib/authui/sssd/params.rb:655 msgid "The LDAP attribute that corresponds to the user's login name." msgstr "The LDAP attribute that corresponds to the user's login name." -#: src/lib/authui/sssd/params.rb:654 +#: src/lib/authui/sssd/params.rb:660 msgid "The LDAP attribute that corresponds to the user's id." msgstr "The LDAP attribute that corresponds to the user's id." -#: src/lib/authui/sssd/params.rb:659 +#: src/lib/authui/sssd/params.rb:665 msgid "The LDAP attribute that corresponds to the user's primary group id." msgstr "The LDAP attribute that corresponds to the user's primary group id." -#: src/lib/authui/sssd/params.rb:664 +#: src/lib/authui/sssd/params.rb:670 msgid "The LDAP attribute that corresponds to the user's gecos field." msgstr "The LDAP attribute that corresponds to the user's gecos field." -#: src/lib/authui/sssd/params.rb:669 +#: src/lib/authui/sssd/params.rb:675 msgid " The LDAP attribute that contains the name of the user's home directory." msgstr " The LDAP attribute that contains the name of the user's home directory." -#: src/lib/authui/sssd/params.rb:674 +#: src/lib/authui/sssd/params.rb:680 msgid "The LDAP attribute that contains the path to the user's default shell." msgstr "The LDAP attribute that contains the path to the user's default shell." -#: src/lib/authui/sssd/params.rb:679 +#: src/lib/authui/sssd/params.rb:685 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP user object." -#: src/lib/authui/sssd/params.rb:684 +#: src/lib/authui/sssd/params.rb:690 msgid "The LDAP attribute that contains the objectSID of an LDAP user object." msgstr "The LDAP attribute that contains the objectSID of an LDAP user object." -#: src/lib/authui/sssd/params.rb:689 src/lib/authui/sssd/params.rb:894 +#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "The LDAP attribute that contains timestamp of the last modification of the parent object." -#: src/lib/authui/sssd/params.rb:694 +#: src/lib/authui/sssd/params.rb:700 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." -#: src/lib/authui/sssd/params.rb:699 +#: src/lib/authui/sssd/params.rb:705 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." -#: src/lib/authui/sssd/params.rb:704 +#: src/lib/authui/sssd/params.rb:710 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." -#: src/lib/authui/sssd/params.rb:709 +#: src/lib/authui/sssd/params.rb:715 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." -#: src/lib/authui/sssd/params.rb:714 +#: src/lib/authui/sssd/params.rb:720 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." -#: src/lib/authui/sssd/params.rb:719 +#: src/lib/authui/sssd/params.rb:725 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." msgstr "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." -#: src/lib/authui/sssd/params.rb:724 +#: src/lib/authui/sssd/params.rb:730 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." -#: src/lib/authui/sssd/params.rb:729 +#: src/lib/authui/sssd/params.rb:735 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." -#: src/lib/authui/sssd/params.rb:734 +#: src/lib/authui/sssd/params.rb:740 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." -#: src/lib/authui/sssd/params.rb:739 +#: src/lib/authui/sssd/params.rb:745 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." -#: src/lib/authui/sssd/params.rb:744 +#: src/lib/authui/sssd/params.rb:750 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." msgstr "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." -#: src/lib/authui/sssd/params.rb:749 +#: src/lib/authui/sssd/params.rb:755 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." msgstr "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." -#: src/lib/authui/sssd/params.rb:754 +#: src/lib/authui/sssd/params.rb:760 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." msgstr "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." -#: src/lib/authui/sssd/params.rb:759 +#: src/lib/authui/sssd/params.rb:765 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." msgstr "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." -#: src/lib/authui/sssd/params.rb:764 +#: src/lib/authui/sssd/params.rb:770 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." msgstr "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." -#: src/lib/authui/sssd/params.rb:768 +#: src/lib/authui/sssd/params.rb:774 msgid "The LDAP attribute that contains the user's SSH public keys." msgstr "The LDAP attribute that contains the user's SSH public keys." -#: src/lib/authui/sssd/params.rb:773 +#: src/lib/authui/sssd/params.rb:779 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." msgstr "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." -#: src/lib/authui/sssd/params.rb:774 +#: src/lib/authui/sssd/params.rb:780 msgid "Set this option to true if you want to use an upper-case realm." msgstr "Set this option to true if you want to use an upper-case realm." -#: src/lib/authui/sssd/params.rb:779 +#: src/lib/authui/sssd/params.rb:785 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." msgstr "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." -#: src/lib/authui/sssd/params.rb:784 +#: src/lib/authui/sssd/params.rb:790 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." msgstr "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." -#: src/lib/authui/sssd/params.rb:789 +#: src/lib/authui/sssd/params.rb:795 msgid "The LDAP attribute that corresponds to the user's full name." msgstr "The LDAP attribute that corresponds to the user's full name." -#: src/lib/authui/sssd/params.rb:794 +#: src/lib/authui/sssd/params.rb:800 msgid "The LDAP attribute that lists the user's group memberships." msgstr "The LDAP attribute that lists the user's group memberships." -#: src/lib/authui/sssd/params.rb:799 +#: src/lib/authui/sssd/params.rb:805 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." msgstr "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." -#: src/lib/authui/sssd/params.rb:804 +#: src/lib/authui/sssd/params.rb:810 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." msgstr "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." -#: src/lib/authui/sssd/params.rb:814 +#: src/lib/authui/sssd/params.rb:820 msgid "The object class of a group entry in LDAP." msgstr "The object class of a group entry in LDAP." -#: src/lib/authui/sssd/params.rb:819 +#: src/lib/authui/sssd/params.rb:825 msgid "The LDAP attribute that corresponds to the group name." msgstr "The LDAP attribute that corresponds to the group name." -#: src/lib/authui/sssd/params.rb:824 +#: src/lib/authui/sssd/params.rb:830 msgid "The LDAP attribute that corresponds to the group's id." msgstr "The LDAP attribute that corresponds to the group's id." -#: src/lib/authui/sssd/params.rb:829 +#: src/lib/authui/sssd/params.rb:835 msgid "The LDAP attribute that contains the names of the group's members." msgstr "The LDAP attribute that contains the names of the group's members." -#: src/lib/authui/sssd/params.rb:834 +#: src/lib/authui/sssd/params.rb:840 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP group object." -#: src/lib/authui/sssd/params.rb:839 +#: src/lib/authui/sssd/params.rb:845 msgid "The LDAP attribute that contains the objectSID of an LDAP group object." msgstr "The LDAP attribute that contains the objectSID of an LDAP group object." -#: src/lib/authui/sssd/params.rb:844 +#: src/lib/authui/sssd/params.rb:850 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr " The LDAP attribute that contains timestamp of the last modification of the parent object." -#: src/lib/authui/sssd/params.rb:850 +#: src/lib/authui/sssd/params.rb:856 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." msgstr "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." -#: src/lib/authui/sssd/params.rb:856 +#: src/lib/authui/sssd/params.rb:862 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." -#: src/lib/authui/sssd/params.rb:862 +#: src/lib/authui/sssd/params.rb:868 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." -#: src/lib/authui/sssd/params.rb:868 +#: src/lib/authui/sssd/params.rb:874 msgid " The object class of a netgroup entry in LDAP." msgstr " The object class of a netgroup entry in LDAP." -#: src/lib/authui/sssd/params.rb:874 +#: src/lib/authui/sssd/params.rb:880 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "The LDAP attribute that corresponds to the netgroup name." -#: src/lib/authui/sssd/params.rb:879 +#: src/lib/authui/sssd/params.rb:885 msgid "The LDAP attribute that contains the names of the netgroup's members." msgstr "The LDAP attribute that contains the names of the netgroup's members." -#: src/lib/authui/sssd/params.rb:884 +#: src/lib/authui/sssd/params.rb:890 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples." msgstr "The LDAP attribute that contains the (host, user, domain) netgroup triples." -#: src/lib/authui/sssd/params.rb:889 +#: src/lib/authui/sssd/params.rb:895 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." -#: src/lib/authui/sssd/params.rb:899 +#: src/lib/authui/sssd/params.rb:905 msgid "The object class of a service entry in LDAP." msgstr "The object class of a service entry in LDAP." -#: src/lib/authui/sssd/params.rb:904 +#: src/lib/authui/sssd/params.rb:910 msgid "The LDAP attribute that contains the name of service attributes and their aliases." msgstr "The LDAP attribute that contains the name of service attributes and their aliases." -#: src/lib/authui/sssd/params.rb:909 +#: src/lib/authui/sssd/params.rb:915 msgid "The LDAP attribute that contains the port managed by this service." msgstr "The LDAP attribute that contains the port managed by this service." -#: src/lib/authui/sssd/params.rb:914 +#: src/lib/authui/sssd/params.rb:920 msgid "The LDAP attribute that contains the protocols understood by this service." msgstr "The LDAP attribute that contains the protocols understood by this service." -#: src/lib/authui/sssd/params.rb:919 -#, fuzzy -#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP service searches for this attribute type. The default value is ldap_search_base." +#: src/lib/authui/sssd/params.rb:926 +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -#: src/lib/authui/sssd/params.rb:924 +#: src/lib/authui/sssd/params.rb:931 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." -#: src/lib/authui/sssd/params.rb:929 +#: src/lib/authui/sssd/params.rb:936 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." -#: src/lib/authui/sssd/params.rb:934 +#: src/lib/authui/sssd/params.rb:941 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." msgstr "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." -#: src/lib/authui/sssd/params.rb:939 +#: src/lib/authui/sssd/params.rb:946 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." msgstr "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." -#: src/lib/authui/sssd/params.rb:944 +#: src/lib/authui/sssd/params.rb:951 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." msgstr "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." -#: src/lib/authui/sssd/params.rb:949 +#: src/lib/authui/sssd/params.rb:956 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." msgstr "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." -#: src/lib/authui/sssd/params.rb:954 +#: src/lib/authui/sssd/params.rb:961 msgid "Disable the LDAP paging control." msgstr "Disable the LDAP paging control." -#: src/lib/authui/sssd/params.rb:958 +#: src/lib/authui/sssd/params.rb:965 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." msgstr "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." -#: src/lib/authui/sssd/params.rb:963 +#: src/lib/authui/sssd/params.rb:970 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." msgstr "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." -#: src/lib/authui/sssd/params.rb:970 +#: src/lib/authui/sssd/params.rb:977 msgid "Validate server certification in LDAP TLS session" msgstr "" -#: src/lib/authui/sssd/params.rb:974 +#: src/lib/authui/sssd/params.rb:981 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." msgstr "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." -#: src/lib/authui/sssd/params.rb:978 +#: src/lib/authui/sssd/params.rb:985 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." msgstr "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." -#: src/lib/authui/sssd/params.rb:982 +#: src/lib/authui/sssd/params.rb:989 msgid "Specifies the file that contains the certificate for the client's key." msgstr "Specifies the file that contains the certificate for the client's key." -#: src/lib/authui/sssd/params.rb:986 +#: src/lib/authui/sssd/params.rb:993 msgid "Specifies the file that contains the client's key." msgstr "Specifies the file that contains the client's key." -#: src/lib/authui/sssd/params.rb:991 +#: src/lib/authui/sssd/params.rb:998 msgid "Specifies acceptable cipher suites." msgstr "Specifies acceptable cipher suites." -#: src/lib/authui/sssd/params.rb:996 +#: src/lib/authui/sssd/params.rb:1003 msgid "Specifies that the id_provider connection must also use tls to protect the channel." msgstr "Specifies that the id_provider connection must also use tls to protect the channel." -#: src/lib/authui/sssd/params.rb:1001 +#: src/lib/authui/sssd/params.rb:1008 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." msgstr "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." -#: src/lib/authui/sssd/params.rb:1005 +#: src/lib/authui/sssd/params.rb:1012 msgid "Specify the SASL mechanism to use." msgstr "Specify the SASL mechanism to use." -#: src/lib/authui/sssd/params.rb:1010 +#: src/lib/authui/sssd/params.rb:1017 msgid "Specify the SASL authorization id to use." msgstr "Specify the SASL authorization id to use." -#: src/lib/authui/sssd/params.rb:1015 +#: src/lib/authui/sssd/params.rb:1022 msgid "Specify the SASL realm to use." msgstr "Specify the SASL realm to use." -#: src/lib/authui/sssd/params.rb:1020 +#: src/lib/authui/sssd/params.rb:1027 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." msgstr "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." -#: src/lib/authui/sssd/params.rb:1025 +#: src/lib/authui/sssd/params.rb:1032 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "Specify the keytab to use when using SASL/GSSAPI." -#: src/lib/authui/sssd/params.rb:1030 +#: src/lib/authui/sssd/params.rb:1037 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "Specifies that the id_provider should init Kerberos credentials (TGT)." -#: src/lib/authui/sssd/params.rb:1035 +#: src/lib/authui/sssd/params.rb:1042 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used." msgstr "Specifies the lifetime in seconds of the TGT if GSSAPI is used." -#: src/lib/authui/sssd/params.rb:1040 +#: src/lib/authui/sssd/params.rb:1047 msgid "Select the policy to evaluate the password expiration on the client side." msgstr "Select the policy to evaluate the password expiration on the client side." -#: src/lib/authui/sssd/params.rb:1045 +#: src/lib/authui/sssd/params.rb:1052 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "Specifies whether automatic referral chasing should be enabled." -#: src/lib/authui/sssd/params.rb:1050 +#: src/lib/authui/sssd/params.rb:1057 msgid "Specifies the service name to use when service discovery is enabled." msgstr "Specifies the service name to use when service discovery is enabled." -#: src/lib/authui/sssd/params.rb:1054 +#: src/lib/authui/sssd/params.rb:1061 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." msgstr "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." -#: src/lib/authui/sssd/params.rb:1059 +#: src/lib/authui/sssd/params.rb:1066 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." msgstr "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." -#: src/lib/authui/sssd/params.rb:1064 +#: src/lib/authui/sssd/params.rb:1071 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." msgstr "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." -#: src/lib/authui/sssd/params.rb:1069 +#: src/lib/authui/sssd/params.rb:1076 msgid " With this option a client side evaluation of access control attributes can be enabled." msgstr " With this option a client side evaluation of access control attributes can be enabled." -#: src/lib/authui/sssd/params.rb:1075 +#: src/lib/authui/sssd/params.rb:1082 msgid "Comma separated list of access control options." msgstr "Comma separated list of access control options." -#: src/lib/authui/sssd/params.rb:1080 +#: src/lib/authui/sssd/params.rb:1087 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "Specifies how alias dereferencing is done when performing a search." -#: src/lib/authui/sssd/params.rb:1085 +#: src/lib/authui/sssd/params.rb:1092 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." msgstr "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." -#: src/lib/authui/sssd/params.rb:1090 -#, fuzzy -#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP autofs searches for this attribute type. The default value is ldap_search_base." -msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." - -#: src/lib/authui/sssd/params.rb:1095 -#, fuzzy -#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP group searches for this attribute type. The default value is ldap_search_base." -msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." - -#: src/lib/authui/sssd/params.rb:1100 -#, fuzzy -#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP netgroup searches for this attribute type. The default value is ldap_search_base." -msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." - #: src/lib/authui/sssd/params.rb:1105 #, fuzzy -#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP user searches for this attribute type. The default value is ldap_search_base." -msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." - -#: src/lib/authui/sssd/params.rb:1110 src/lib/authui/sssd/params.rb:1120 -#, fuzzy -#| msgid "The object class of a group entry in LDAP." -msgid "The object class of an automount map entry in LDAP." -msgstr "The object class of a group entry in LDAP." - -#: src/lib/authui/sssd/params.rb:1115 -#, fuzzy -#| msgid "The object class of a group entry in LDAP." -msgid "The name of an automount map entry in LDAP." -msgstr "The object class of a group entry in LDAP." - -#: src/lib/authui/sssd/params.rb:1125 src/lib/authui/sssd/params.rb:1130 -msgid "The key of an automount entry in LDAP. The entry usually corresponds to a mount point." -msgstr "" - -#: src/lib/authui/sssd/params.rb:1143 -#, fuzzy #| msgid "The IP address (or hostname) of the host with a fixed address" msgid "IP address or host names of Kerberos servers (comma separated)" msgstr "The IP address (or hostname) of the host with a fixed address" -#: src/lib/authui/sssd/params.rb:1147 +#: src/lib/authui/sssd/params.rb:1109 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." msgstr "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." -#: src/lib/authui/sssd/params.rb:1152 +#: src/lib/authui/sssd/params.rb:1114 msgid "Kerberos realm (e.g. EXAMPLE.COM)" msgstr "" -#: src/lib/authui/sssd/params.rb:1156 src/lib/authui/sssd/params.rb:1161 +#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123 msgid "If the change password service is not running on the KDC, alternative servers can be defined here." msgstr "If the change password service is not running on the KDC, alternative servers can be defined here." -#: src/lib/authui/sssd/params.rb:1166 +#: src/lib/authui/sssd/params.rb:1128 msgid "Directory to store credential caches." msgstr "Directory to store credential caches." -#: src/lib/authui/sssd/params.rb:1171 +#: src/lib/authui/sssd/params.rb:1133 msgid "Location of the user's credential cache." msgstr "Location of the user's credential cache." -#: src/lib/authui/sssd/params.rb:1176 +#: src/lib/authui/sssd/params.rb:1138 msgid " Timeout in seconds after an online authentication request or change password request is aborted." msgstr " Timeout in seconds after an online authentication request or change password request is aborted." -#: src/lib/authui/sssd/params.rb:1181 +#: src/lib/authui/sssd/params.rb:1143 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." msgstr "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." -#: src/lib/authui/sssd/params.rb:1186 +#: src/lib/authui/sssd/params.rb:1148 msgid "The location of the keytab to use when validating credentials obtained from KDCs." msgstr "The location of the keytab to use when validating credentials obtained from KDCs." -#: src/lib/authui/sssd/params.rb:1191 +#: src/lib/authui/sssd/params.rb:1153 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." msgstr "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." -#: src/lib/authui/sssd/params.rb:1195 +#: src/lib/authui/sssd/params.rb:1157 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." msgstr "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." -#: src/lib/authui/sssd/params.rb:1199 +#: src/lib/authui/sssd/params.rb:1161 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." msgstr "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." -#: src/lib/authui/sssd/params.rb:1203 +#: src/lib/authui/sssd/params.rb:1165 msgid "The time in seconds between two checks if the TGT should be renewed." msgstr "The time in seconds between two checks if the TGT should be renewed." -#: src/lib/authui/sssd/params.rb:1208 +#: src/lib/authui/sssd/params.rb:1170 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." -#: src/lib/authui/sssd/params.rb:1212 +#: src/lib/authui/sssd/params.rb:1174 msgid "Specifies the server principal to use for FAST." msgstr "Specifies the server principal to use for FAST." -#: src/lib/authui/sssd/params.rb:1217 +#: src/lib/authui/sssd/params.rb:1179 msgid "Specifies if the host and user principal should be canonicalized." msgstr "Specifies if the host and user principal should be canonicalized." #. The Active Directory domain section -#: src/lib/authui/sssd/params.rb:1229 +#: src/lib/authui/sssd/params.rb:1191 msgid "Specifies the name of the Active Directory domain." msgstr "Specifies the name of the Active Directory domain." -#: src/lib/authui/sssd/params.rb:1234 +#: src/lib/authui/sssd/params.rb:1196 msgid "IP addresses or host names of AD servers (comma separated)" msgstr "" -#: src/lib/authui/sssd/params.rb:1238 +#: src/lib/authui/sssd/params.rb:1200 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." msgstr "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." -#: src/lib/authui/sssd/params.rb:1243 +#: src/lib/authui/sssd/params.rb:1205 #, fuzzy #| msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host." msgstr "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." -#: src/lib/authui/sssd/params.rb:1247 +#: src/lib/authui/sssd/params.rb:1209 msgid "Override the user's home directory." msgstr "Override the user's home directory." -#: src/lib/authui/sssd/params.rb:1260 +#: src/lib/authui/sssd/params.rb:1222 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." -#: src/lib/authui/sssd/params.rb:1265 +#: src/lib/authui/sssd/params.rb:1227 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." -#: src/lib/authui/sssd/params.rb:1270 +#: src/lib/authui/sssd/params.rb:1232 msgid "Specifies the number of IDs available for each slice." msgstr "Specifies the number of IDs available for each slice." -#: src/lib/authui/sssd/params.rb:1274 +#: src/lib/authui/sssd/params.rb:1236 msgid "Specify the domain SID of the default domain." msgstr "Specify the domain SID of the default domain." -#: src/lib/authui/sssd/params.rb:1278 +#: src/lib/authui/sssd/params.rb:1240 msgid "Specify the name of the default domain." msgstr "Specify the name of the default domain." -#: src/lib/authui/sssd/params.rb:1283 +#: src/lib/authui/sssd/params.rb:1245 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." msgstr "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." #. The Active Directory domain section -#: src/lib/authui/sssd/params.rb:1295 +#: src/lib/authui/sssd/params.rb:1257 msgid "Specifies the name of the IPA domain." msgstr "Specifies the name of the IPA domain." -#: src/lib/authui/sssd/params.rb:1300 +#: src/lib/authui/sssd/params.rb:1262 msgid "IP addresses or host names of IPA servers (comma separated)" msgstr "" -#: src/lib/authui/sssd/params.rb:1305 +#: src/lib/authui/sssd/params.rb:1267 #, fuzzy #| msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host." msgstr "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." -#: src/lib/authui/sssd/params.rb:1310 +#: src/lib/authui/sssd/params.rb:1272 #, fuzzy #| msgid "The configuration of the NIS client will be saved.\n" msgid "The automounter location this IPA client will be using." msgstr "The configuration of the NIS client will be saved.\n" -#: src/lib/authui/sssd/params.rb:1315 +#: src/lib/authui/sssd/params.rb:1277 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." msgstr "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." -#: src/lib/authui/sssd/params.rb:1320 +#: src/lib/authui/sssd/params.rb:1282 msgid "The TTL to apply to the client DNS record when updating it." msgstr "The TTL to apply to the client DNS record when updating it." -#: src/lib/authui/sssd/params.rb:1324 +#: src/lib/authui/sssd/params.rb:1286 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." msgstr "Choose the interface whose IP address should be used for dynamic DNS updates." -#~ msgid "The default base DN to use for performing LDAP sudo rules." -#~ msgstr "The default base DN to use for performing LDAP sudo rules." - #~ msgid "Authentication client configuration module" #~ msgstr "Authentication client configuration module" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/auth-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/auth-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/auth-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -308,8 +308,7 @@ msgstr "Register at an &SLP Daemon" #. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")), -#: src/include/auth-server/dialogs.rb:88 -#: src/include/auth-server/widgets.rb:127 +#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127 msgid "Firewall Settings" msgstr "Firewall Settings" @@ -497,11 +496,6 @@ msgid "Provider Hostname" msgstr "Provider Hostname" -#: src/include/auth-server/dialogs.rb:1150 src/modules/LdapDatabase.rb:1613 -#: src/modules/LdapDatabase.rb:1710 -msgid "Port" -msgstr "Port" - #: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618 msgid "Use StartTLS" msgstr "Use StartTLS" @@ -2070,8 +2064,7 @@ #. Initialization dialog contents #. Initialization dialog contents #: src/include/auth-server/mirrormode-wizard.rb:175 -#: src/include/auth-server/wizards.rb:53 -#: src/include/auth-server/wizards.rb:124 +#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124 #: src/include/auth-server/wizards.rb:207 #: src/include/auth-server/wizards.rb:300 msgid "Initializing..." @@ -2832,6 +2825,10 @@ msgid "Provider Name" msgstr "Provider Name" +#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710 +msgid "Port" +msgstr "Port" + #: src/modules/LdapDatabase.rb:1631 msgid "Replication Type" msgstr "Replication Type" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/autoinst.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/autoinst.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/autoinst.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -653,55 +653,55 @@ #. ReportingDialog() #. @return sumbol -#: src/clients/report_auto.rb:99 +#: src/clients/report_auto.rb:103 msgid "Messages" msgstr "Messages" -#: src/clients/report_auto.rb:105 +#: src/clients/report_auto.rb:109 msgid "Sho&w messages" msgstr "Sho&w messages" -#: src/clients/report_auto.rb:113 +#: src/clients/report_auto.rb:117 msgid "Lo&g messages" msgstr "Lo&g messages" -#: src/clients/report_auto.rb:124 +#: src/clients/report_auto.rb:128 msgid "&Time-out (in sec.)" msgstr "&Time-out (in sec.)" -#: src/clients/report_auto.rb:136 +#: src/clients/report_auto.rb:140 msgid "Warnings" msgstr "Warnings" -#: src/clients/report_auto.rb:142 +#: src/clients/report_auto.rb:146 msgid "Sh&ow warnings" msgstr "Sh&ow warnings" -#: src/clients/report_auto.rb:150 +#: src/clients/report_auto.rb:154 msgid "Log wa&rnings" msgstr "Log wa&rnings" -#: src/clients/report_auto.rb:161 +#: src/clients/report_auto.rb:165 msgid "Time-out (in s&ec.)" msgstr "Time-out (in s&ec.)" -#: src/clients/report_auto.rb:173 +#: src/clients/report_auto.rb:177 msgid "Errors" msgstr "Errors" -#: src/clients/report_auto.rb:179 +#: src/clients/report_auto.rb:183 msgid "Show error&s" msgstr "Show error&s" -#: src/clients/report_auto.rb:187 +#: src/clients/report_auto.rb:191 msgid "&Log errors" msgstr "&Log errors" -#: src/clients/report_auto.rb:198 +#: src/clients/report_auto.rb:202 msgid "Time-o&ut (in sec.)" msgstr "Time-o&ut (in sec.)" -#: src/clients/report_auto.rb:213 +#: src/clients/report_auto.rb:217 msgid "" "<p>Depending on your experience, you can skip, log, and show (with time-out)\n" "installation messages.</p> \n" @@ -709,7 +709,7 @@ "<p>Depending on your experience, you can skip, log, and show (with time-out)\n" "installation messages.</p> \n" -#: src/clients/report_auto.rb:219 +#: src/clients/report_auto.rb:223 msgid "" "<p>It is recommended to show all <b>messages</b> with time-out.\n" "Warnings can be skipped in some places, but should not be ignored.</p>\n" @@ -717,7 +717,7 @@ "<p>It is recommended to show all <b>messages</b> with time-out.\n" "Warnings can be skipped in some places, but should not be ignored.</p>\n" -#: src/clients/report_auto.rb:226 +#: src/clients/report_auto.rb:230 msgid "Messages and Logging" msgstr "Messages and Logging" @@ -1051,7 +1051,7 @@ #. Shows a dialog when 'control file' can't be found #. @param [String] original Original value #. @return [String] new value -#: src/include/autoinstall/autoinst_dialogs.rb:22 +#: src/include/autoinstall/autoinst_dialogs.rb:21 msgid "" "<p>\n" "A profile for this machine could not be found or retrieved.\n" @@ -1069,11 +1069,11 @@ "are using rules or host name-based control files, restart the\n" "installation process and make sure the control files are accessible.</p>\n" -#: src/include/autoinstall/autoinst_dialogs.rb:31 +#: src/include/autoinstall/autoinst_dialogs.rb:30 msgid "System Profile Location" msgstr "System Profile Location" -#: src/include/autoinstall/autoinst_dialogs.rb:46 +#: src/include/autoinstall/autoinst_dialogs.rb:45 msgid "&Profile Location:" msgstr "&Profile Location:" @@ -1081,11 +1081,11 @@ #. Below this label, all targets are listed that can be used as #. installation target #. heading text -#: src/include/autoinstall/autoinst_dialogs.rb:118 +#: src/include/autoinstall/autoinst_dialogs.rb:117 msgid "Choose a hard disk" msgstr "Choose a hard disk" -#: src/include/autoinstall/autoinst_dialogs.rb:125 +#: src/include/autoinstall/autoinst_dialogs.rb:124 msgid "No disks found." msgstr "No disks found." @@ -1094,7 +1094,7 @@ #. "Preparing Hard Disk - Step 1" is the description of the dialog what to #. do while the following locale is the help description #. help part 1 of 1 -#: src/include/autoinstall/autoinst_dialogs.rb:133 +#: src/include/autoinstall/autoinst_dialogs.rb:132 msgid "" "<p>\n" "All hard disks automatically detected on your system\n" @@ -1107,13 +1107,13 @@ "</p>" #. force help text width -#: src/include/autoinstall/autoinst_dialogs.rb:155 +#: src/include/autoinstall/autoinst_dialogs.rb:154 msgid "Hard Disk Selection" msgstr "Hard Disk Selection" #. there is a selection from that one option has to be #. chosen - at the moment no option is chosen -#: src/include/autoinstall/autoinst_dialogs.rb:178 +#: src/include/autoinstall/autoinst_dialogs.rb:177 msgid "Select one of the options to continue." msgstr "Select one of the options to continue." @@ -1550,8 +1550,7 @@ msgid "Settings" msgstr "Settings" -#: src/include/autoinstall/dialogs.rb:94 -#: src/include/autoinstall/dialogs.rb:101 +#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101 msgid "Select Directory" msgstr "Select Directory" @@ -2382,62 +2381,46 @@ #. The line above needs to be fixed when we have more attributes #. comment will look like this: "(description=BLA BLA)" -#: src/modules/AutoinstConfig.rb:289 +#: src/modules/AutoinstConfig.rb:279 #, fuzzy msgid "Choose Profile" msgstr "&Use Profile" -#. Nothing returned by SLP query -#: src/modules/AutoinstConfig.rb:312 -#, fuzzy -#| msgid "The resulting autoyast profile can be found in /root/autoinst.xml." -msgid "No 'autoyast' provider has been found via SLP." -msgstr "The resulting autoyast profile can be found in /root/autoinst.xml." - -#. There is no profile defined/found anywhere -#: src/modules/AutoinstConfig.rb:357 -#, fuzzy -#| msgid "Path to AutoYaST Profile" -msgid "" -"Invalid AutoYaST profile URL\n" -"%{url}" -msgstr "Path to AutoYaST Profile" - #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:384 +#: src/modules/AutoinstConfig.rb:335 msgid "Retrieving control file from floppy." msgstr "Retrieving control file from floppy." -#: src/modules/AutoinstConfig.rb:387 +#: src/modules/AutoinstConfig.rb:338 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "Retrieving control file (%1) from TFTP server: %2." -#: src/modules/AutoinstConfig.rb:393 +#: src/modules/AutoinstConfig.rb:344 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "Retrieving control file (%1) from NFS server: %2." -#: src/modules/AutoinstConfig.rb:399 +#: src/modules/AutoinstConfig.rb:350 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "Retrieving control file (%1) from HTTP server: %2." -#: src/modules/AutoinstConfig.rb:405 +#: src/modules/AutoinstConfig.rb:356 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "Retrieving control file (%1) from FTP server: %2." -#: src/modules/AutoinstConfig.rb:411 +#: src/modules/AutoinstConfig.rb:362 msgid "Copying control file from file: %1." msgstr "Copying control file from file: %1." -#: src/modules/AutoinstConfig.rb:416 +#: src/modules/AutoinstConfig.rb:367 msgid "Copying control file from device: /dev/%1." msgstr "Copying control file from device: /dev/%1." -#: src/modules/AutoinstConfig.rb:420 +#: src/modules/AutoinstConfig.rb:371 msgid "Copying control file from default location." msgstr "Copying control file from default location." -#: src/modules/AutoinstConfig.rb:422 +#: src/modules/AutoinstConfig.rb:373 msgid "Source unknown." msgstr "Source unknown." @@ -2447,7 +2430,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:502 +#: src/modules/AutoinstConfig.rb:453 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2457,7 +2440,7 @@ "<p>Almost all resources of the control file can be\n" "configured using the configuration management system.</p>\n" -#: src/modules/AutoinstConfig.rb:507 +#: src/modules/AutoinstConfig.rb:458 #, fuzzy msgid "" "<p>Most of the modules used to create the configuration are identical to those available\n" @@ -2472,7 +2455,7 @@ "install another system using AutoYaST.\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:514 +#: src/modules/AutoinstConfig.rb:465 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2613,7 +2596,7 @@ #. if no feeder (PV) was found for current volume group #. the next instructions taints result -#: src/modules/AutoinstPartPlan.rb:289 +#: src/modules/AutoinstPartPlan.rb:282 msgid "Volume group '%1' must have at least one physical volume. Provide one." msgstr "" @@ -2623,18 +2606,18 @@ #. @return [String] configuration summary dialog #. return Summary of configuration #. @return [String] configuration summary dialog -#: src/modules/AutoinstPartPlan.rb:703 src/modules/AutoinstStorage.rb:913 +#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913 msgid "Drives" msgstr "Drives" #. We are counting harddisks only (type CT_DISK) -#: src/modules/AutoinstPartPlan.rb:709 +#: src/modules/AutoinstPartPlan.rb:697 msgid "%s drive in total" msgid_plural "%s drives in total" msgstr[0] "" msgstr[1] "" -#: src/modules/AutoinstPartPlan.rb:728 +#: src/modules/AutoinstPartPlan.rb:716 #, fuzzy #| msgid "Not detected." msgid "Not yet cloned." @@ -2642,23 +2625,23 @@ #. Return Summary #. @return [String] summary -#: src/modules/AutoinstScripts.rb:343 +#: src/modules/AutoinstScripts.rb:329 msgid "Preinstallation Scripts" msgstr "Preinstallation Scripts" -#: src/modules/AutoinstScripts.rb:356 +#: src/modules/AutoinstScripts.rb:342 msgid "Postinstallation Scripts" msgstr "Postinstallation Scripts" -#: src/modules/AutoinstScripts.rb:369 +#: src/modules/AutoinstScripts.rb:355 msgid "Chroot Scripts" msgstr "Chroot Scripts" -#: src/modules/AutoinstScripts.rb:382 +#: src/modules/AutoinstScripts.rb:368 msgid "Init Scripts" msgstr "Init Scripts" -#: src/modules/AutoinstScripts.rb:395 +#: src/modules/AutoinstScripts.rb:381 #, fuzzy msgid "Postpartitioning Scripts" msgstr "Postinstallation Scripts" @@ -2666,28 +2649,28 @@ #. return type of script as formatted string #. @param script type #. @return [String] type as translated string -#: src/modules/AutoinstScripts.rb:490 +#: src/modules/AutoinstScripts.rb:476 msgid "Pre" msgstr "Pre" -#: src/modules/AutoinstScripts.rb:492 +#: src/modules/AutoinstScripts.rb:478 msgid "Post" msgstr "Post" -#: src/modules/AutoinstScripts.rb:494 +#: src/modules/AutoinstScripts.rb:480 msgid "Init" msgstr "Init" -#: src/modules/AutoinstScripts.rb:496 +#: src/modules/AutoinstScripts.rb:482 msgid "Chroot" msgstr "Chroot" -#: src/modules/AutoinstScripts.rb:498 +#: src/modules/AutoinstScripts.rb:484 #, fuzzy msgid "Postpartitioning" msgstr "Partitioning" -#: src/modules/AutoinstScripts.rb:500 +#: src/modules/AutoinstScripts.rb:486 msgid "Unknown" msgstr "Unknown" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/base.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/base.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/base.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -1719,13 +1719,13 @@ msgstr "&Details..." #. translators: summary header for messages generated through autoinstallation -#: library/general/src/modules/Report.rb:103 +#: library/general/src/modules/Report.rb:101 msgid "Messages" msgstr "Messages" #. Report configuration - will be normal messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:111 +#: library/general/src/modules/Report.rb:109 msgid "Display Messages: %1" msgstr "Display Messages: %1" @@ -1736,23 +1736,23 @@ #. translators: summary if the errors should be displayed #. translators: summary if the errors should be written to log file #. TRANSLATORS: human text for Boolean value -#: library/general/src/modules/Report.rb:113 -#: library/general/src/modules/Report.rb:129 -#: library/general/src/modules/Report.rb:143 -#: library/general/src/modules/Report.rb:159 -#: library/general/src/modules/Report.rb:173 -#: library/general/src/modules/Report.rb:189 +#: library/general/src/modules/Report.rb:111 +#: library/general/src/modules/Report.rb:127 +#: library/general/src/modules/Report.rb:141 +#: library/general/src/modules/Report.rb:157 +#: library/general/src/modules/Report.rb:171 +#: library/general/src/modules/Report.rb:187 #: library/network/src/modules/NetworkPopup.rb:90 #: library/types/src/modules/String.rb:101 msgid "Yes" msgstr "Yes" -#: library/general/src/modules/Report.rb:113 -#: library/general/src/modules/Report.rb:129 -#: library/general/src/modules/Report.rb:143 -#: library/general/src/modules/Report.rb:159 -#: library/general/src/modules/Report.rb:173 -#: library/general/src/modules/Report.rb:189 +#: library/general/src/modules/Report.rb:111 +#: library/general/src/modules/Report.rb:127 +#: library/general/src/modules/Report.rb:141 +#: library/general/src/modules/Report.rb:157 +#: library/general/src/modules/Report.rb:171 +#: library/general/src/modules/Report.rb:187 #: library/network/src/modules/NetworkPopup.rb:89 #: library/types/src/modules/String.rb:101 msgid "No" @@ -1760,64 +1760,64 @@ #. Report configuration - will have normal messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:120 +#: library/general/src/modules/Report.rb:118 msgid "Time-out Messages: %1" msgstr "Time-out Messages: %1" #. Report configuration - will be normal messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:127 +#: library/general/src/modules/Report.rb:125 msgid "Log Messages: %1" msgstr "Log Messages: %1" #. translators: summary header for warnings generated through autoinstallation -#: library/general/src/modules/Report.rb:134 +#: library/general/src/modules/Report.rb:132 msgid "Warnings" msgstr "Warnings" #. Report configuration - will be warning messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:141 +#: library/general/src/modules/Report.rb:139 msgid "Display Warnings: %1" msgstr "Display Warnings: %1" #. Report configuration - will have warning messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:150 +#: library/general/src/modules/Report.rb:148 msgid "Time-out Warnings: %1" msgstr "Time-out Warnings: %1" #. Report configuration - will be warning messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:157 +#: library/general/src/modules/Report.rb:155 msgid "Log Warnings: %1" msgstr "Log Warnings: %1" #. translators: summary header for errors generated through autoinstallation -#: library/general/src/modules/Report.rb:164 +#: library/general/src/modules/Report.rb:162 msgid "Errors" msgstr "Errors" #. Report configuration - will be error messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:171 +#: library/general/src/modules/Report.rb:169 msgid "Display Errors: %1" msgstr "Display Errors: %1" #. Report configuration - will have error messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:180 +#: library/general/src/modules/Report.rb:178 msgid "Time-out Errors: %1" msgstr "Time-out Errors: %1" #. Report configuration - will be error messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:187 +#: library/general/src/modules/Report.rb:185 msgid "Log Errors: %1" msgstr "Log Errors: %1" #. translators: warnings summary header -#: library/general/src/modules/Report.rb:668 +#: library/general/src/modules/Report.rb:664 #, fuzzy #| msgid "Warning:" #| msgid_plural "Warnings:" @@ -1825,7 +1825,7 @@ msgstr "Warning:" #. translators: errors summary header -#: library/general/src/modules/Report.rb:685 +#: library/general/src/modules/Report.rb:681 #, fuzzy #| msgid "Error:" #| msgid_plural "Errors:" @@ -1834,8 +1834,8 @@ #. translators: message summary header #. translators: message summary header -#: library/general/src/modules/Report.rb:702 -#: library/general/src/modules/Report.rb:719 +#: library/general/src/modules/Report.rb:698 +#: library/general/src/modules/Report.rb:715 #, fuzzy #| msgid "Message:" #| msgid_plural "Messages:" @@ -3475,7 +3475,7 @@ #. popup heading #: library/packages/src/modules/PackageCallbacks.rb:1428 -#: library/packages/src/modules/PackageCallbacks.rb:3065 +#: library/packages/src/modules/PackageCallbacks.rb:3070 msgid "Package: " msgstr "Package: " @@ -3642,15 +3642,15 @@ msgstr "&User Name" #. check box -#: library/packages/src/modules/PackageCallbacks.rb:3000 +#: library/packages/src/modules/PackageCallbacks.rb:3005 msgid "Show &details" msgstr "Show &details" -#: library/packages/src/modules/PackageCallbacks.rb:3066 +#: library/packages/src/modules/PackageCallbacks.rb:3071 msgid "Size: " msgstr "Size: " -#: library/packages/src/modules/PackageCallbacks.rb:3089 +#: library/packages/src/modules/PackageCallbacks.rb:3094 msgid "Remaining time to automatic retry: %1" msgstr "" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/bootloader.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/bootloader.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/bootloader.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -156,7 +156,7 @@ #: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82 msgid "no" -msgstr "no" +msgstr "" #: src/lib/bootloader/grub2.rb:116 #, fuzzy @@ -222,12 +222,12 @@ msgstr "Location: %1" #. Represents bootloader timeout value -#: src/lib/bootloader/grub2_widgets.rb:54 +#: src/lib/bootloader/grub2_widgets.rb:53 #, fuzzy msgid "&Timeout in Seconds" msgstr "Timeout in Seconds" -#: src/lib/bootloader/grub2_widgets.rb:58 +#: src/lib/bootloader/grub2_widgets.rb:57 #, fuzzy msgid "" "<p><b>Timeout in Seconds</b><br>\n" @@ -237,12 +237,12 @@ "Specifies the the time the bootloader will wait until the default kernel is loaded.</p>" #. Represents decision if bootloader need activated partition -#: src/lib/bootloader/grub2_widgets.rb:90 +#: src/lib/bootloader/grub2_widgets.rb:89 #, fuzzy msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "Set active Flag in Partition Table for Boot Partition" -#: src/lib/bootloader/grub2_widgets.rb:94 +#: src/lib/bootloader/grub2_widgets.rb:93 #, fuzzy msgid "" "<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n" @@ -256,12 +256,12 @@ "if the boot loader is installed in the MBR.</p>" #. Represents decision if generic MBR have to be installed on disk -#: src/lib/bootloader/grub2_widgets.rb:121 +#: src/lib/bootloader/grub2_widgets.rb:120 #, fuzzy msgid "Write &generic Boot Code to MBR" msgstr "Write generic Boot Code to MBR" -#: src/lib/bootloader/grub2_widgets.rb:125 +#: src/lib/bootloader/grub2_widgets.rb:124 #, fuzzy msgid "" "<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n" @@ -272,54 +272,54 @@ "boots the active partition), select <b>Write generic Boot Code to MBR</b>.</p>" #. Represents decision if menu should be hidden or visible -#: src/lib/bootloader/grub2_widgets.rb:150 +#: src/lib/bootloader/grub2_widgets.rb:149 #, fuzzy msgid "&Hide Menu on Boot" msgstr "Hide Menu on Boot" -#: src/lib/bootloader/grub2_widgets.rb:154 +#: src/lib/bootloader/grub2_widgets.rb:153 #, fuzzy msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>" msgstr "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu</p>" #. Represents if os prober should be run -#: src/lib/bootloader/grub2_widgets.rb:173 +#: src/lib/bootloader/grub2_widgets.rb:172 msgid "Pro&be Foreign OS" msgstr "" -#: src/lib/bootloader/grub2_widgets.rb:177 +#: src/lib/bootloader/grub2_widgets.rb:176 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>" msgstr "" #. represents kernel command line -#: src/lib/bootloader/grub2_widgets.rb:201 +#: src/lib/bootloader/grub2_widgets.rb:200 #, fuzzy msgid "O&ptional Kernel Command Line Parameter" msgstr "Optional Kernel Command Line Parameter" -#: src/lib/bootloader/grub2_widgets.rb:205 +#: src/lib/bootloader/grub2_widgets.rb:204 #, fuzzy msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>" msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" #. Represents Protective MBR action -#: src/lib/bootloader/grub2_widgets.rb:229 +#: src/lib/bootloader/grub2_widgets.rb:228 msgid "&Protective MBR flag" msgstr "" -#: src/lib/bootloader/grub2_widgets.rb:233 +#: src/lib/bootloader/grub2_widgets.rb:232 msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>" msgstr "" #. TRANSLATORS: set flag on disk -#: src/lib/bootloader/grub2_widgets.rb:247 +#: src/lib/bootloader/grub2_widgets.rb:246 #, fuzzy #| msgid "[set]" msgid "set" msgstr "[set]" #. TRANSLATORS: remove flag from disk -#: src/lib/bootloader/grub2_widgets.rb:249 +#: src/lib/bootloader/grub2_widgets.rb:248 #, fuzzy #| msgid "_remove" msgid "remove" @@ -329,7 +329,7 @@ #. force re-calculation of bootloader proposal #. this deletes any internally cached values, a new proposal will #. not be partially based on old data now any more -#: src/lib/bootloader/grub2_widgets.rb:251 +#: src/lib/bootloader/grub2_widgets.rb:250 #: src/lib/bootloader/proposal_client.rb:49 #, fuzzy #| msgid "Do not change name" @@ -337,72 +337,55 @@ msgstr "Do not change name" #. Represents switcher for secure boot on EFI -#: src/lib/bootloader/grub2_widgets.rb:269 +#: src/lib/bootloader/grub2_widgets.rb:268 #, fuzzy #| msgid "Enable &Quota Support" msgid "Enable &Secure Boot Support" msgstr "Enable &Quota Support" -#: src/lib/bootloader/grub2_widgets.rb:273 +#: src/lib/bootloader/grub2_widgets.rb:272 #, fuzzy #| msgid "Enable &GSS Security" msgid "Tick to enable UEFI Secure Boot\n" msgstr "Enable &GSS Security" #. Represents switcher for Trusted Boot -#: src/lib/bootloader/grub2_widgets.rb:294 +#: src/lib/bootloader/grub2_widgets.rb:293 #, fuzzy #| msgid "Enable &Quota Support" msgid "Enable &Trusted Boot Support" msgstr "Enable &Quota Support" #. TRANSLATORS: TrustedGRUB2 is a name, don't translate it -#: src/lib/bootloader/grub2_widgets.rb:299 -msgid "" -"<p><b>Trusted Boot</b> will install TrustedGRUB2\n" -"instead of regular GRUB2.</p>\n" -"<p>It means measuring the integrity of the boot process,\n" -"with the help from the hardware (a TPM, Trusted Platform Module,\n" -"chip).</p>\n" -"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n" -"setup (the setting may be named Security Chip, for example).</p>\n" +#: src/lib/bootloader/grub2_widgets.rb:298 +msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n" msgstr "" -#. check for file size does not work, since FS reports it 4096 -#. even if the file is in fact empty and a single byte cannot -#. be read, therefore testing real reading (details: bsc#994556) -#: src/lib/bootloader/grub2_widgets.rb:325 -msgid "" -"Trusted Platform Module not found.\n" -"Make sure it is enabled in BIOS.\n" -"The system will not boot otherwise." -msgstr "" - #. Represents grub password protection widget -#: src/lib/bootloader/grub2_widgets.rb:345 +#: src/lib/bootloader/grub2_widgets.rb:324 msgid "Prot&ect Boot Loader with Password" msgstr "Prot&ect Boot Loader with Password" #. TRANSLATORS: checkbox entry -#: src/lib/bootloader/grub2_widgets.rb:351 +#: src/lib/bootloader/grub2_widgets.rb:330 msgid "P&rotect Entry Modification Only" msgstr "" #. TRANSLATORS: text entry, please keep it short -#: src/lib/bootloader/grub2_widgets.rb:357 +#: src/lib/bootloader/grub2_widgets.rb:336 msgid "&Password for GRUB2 User 'root'" msgstr "" #. text entry -#: src/lib/bootloader/grub2_widgets.rb:360 +#: src/lib/bootloader/grub2_widgets.rb:339 msgid "Re&type Password" msgstr "Re&type Password" -#: src/lib/bootloader/grub2_widgets.rb:371 +#: src/lib/bootloader/grub2_widgets.rb:350 msgid "The password must not be empty." msgstr "The password must not be empty." -#: src/lib/bootloader/grub2_widgets.rb:378 +#: src/lib/bootloader/grub2_widgets.rb:357 msgid "" "'Password' and 'Retype password'\n" "do not match. Retype the password." @@ -411,7 +394,7 @@ "do not match. Retype the password." #. special value as we do not know password, so it mean user do not change it -#: src/lib/bootloader/grub2_widgets.rb:428 +#: src/lib/bootloader/grub2_widgets.rb:407 #, fuzzy msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" @@ -422,50 +405,50 @@ "it in <b>Retype Password</b>.</p>" #. there's mode specified, use it -#: src/lib/bootloader/grub2_widgets.rb:506 +#: src/lib/bootloader/grub2_widgets.rb:485 #, fuzzy msgid "Choose new graphical theme file" msgstr "Graphical Menu File" -#: src/lib/bootloader/grub2_widgets.rb:519 +#: src/lib/bootloader/grub2_widgets.rb:498 #, fuzzy msgid "Use &graphical console" msgstr "Serial Console" -#: src/lib/bootloader/grub2_widgets.rb:524 +#: src/lib/bootloader/grub2_widgets.rb:503 #, fuzzy #| msgid "Conflict Resolution:" msgid "&Console resolution" msgstr "Conflict Resolution:" -#: src/lib/bootloader/grub2_widgets.rb:529 +#: src/lib/bootloader/grub2_widgets.rb:508 #, fuzzy msgid "&Console theme" msgstr "invalid arguments" -#: src/lib/bootloader/grub2_widgets.rb:560 +#: src/lib/bootloader/grub2_widgets.rb:539 #, fuzzy #| msgid "Autodetected card" msgid "Autodetect by grub2" msgstr "Autodetected card" -#: src/lib/bootloader/grub2_widgets.rb:568 +#: src/lib/bootloader/grub2_widgets.rb:547 #, fuzzy msgid "Use &serial console" msgstr "Serial Console" -#: src/lib/bootloader/grub2_widgets.rb:575 +#: src/lib/bootloader/grub2_widgets.rb:554 #, fuzzy msgid "&Console arguments" msgstr "invalid arguments" #. represent choosing default section to boot -#: src/lib/bootloader/grub2_widgets.rb:592 +#: src/lib/bootloader/grub2_widgets.rb:571 #, fuzzy msgid "&Default Boot Section" msgstr "Default Boot Section" -#: src/lib/bootloader/grub2_widgets.rb:596 +#: src/lib/bootloader/grub2_widgets.rb:575 #, fuzzy msgid "" "<p> By pressing <b>Set as Default</b> you mark the selected section as\n" @@ -483,48 +466,48 @@ "menu can be changed using the <b>Up</b> and <b>Down</b> buttons.</p>" #. Represents stage1 location for bootloader -#: src/lib/bootloader/grub2_widgets.rb:631 +#: src/lib/bootloader/grub2_widgets.rb:610 msgid "Boot Loader Location" msgstr "Boot Loader Location" -#: src/lib/bootloader/grub2_widgets.rb:685 +#: src/lib/bootloader/grub2_widgets.rb:664 msgid "Custom boot device have to be specied if checked" msgstr "" -#: src/lib/bootloader/grub2_widgets.rb:713 +#: src/lib/bootloader/grub2_widgets.rb:692 #, fuzzy msgid "Boo&t from Boot Partition" msgstr "Boot from Boot Partition" -#: src/lib/bootloader/grub2_widgets.rb:714 +#: src/lib/bootloader/grub2_widgets.rb:693 #, fuzzy #| msgid "Boot from Root Partition" msgid "Boo&t from Root Partition" msgstr "Boot from Root Partition" -#: src/lib/bootloader/grub2_widgets.rb:715 +#: src/lib/bootloader/grub2_widgets.rb:694 #, fuzzy msgid "Boot from &Master Boot Record" msgstr "Boot from Master Boot Record" -#: src/lib/bootloader/grub2_widgets.rb:716 +#: src/lib/bootloader/grub2_widgets.rb:695 #, fuzzy msgid "Boot from &Extended Partition" msgstr "Boot from Root Partition" -#: src/lib/bootloader/grub2_widgets.rb:727 +#: src/lib/bootloader/grub2_widgets.rb:706 #, fuzzy msgid "C&ustom Boot Partition" msgstr "Custom Boot Partition" #. Represents button that open Device Map edit dialog -#: src/lib/bootloader/grub2_widgets.rb:740 +#: src/lib/bootloader/grub2_widgets.rb:719 #, fuzzy #| msgid "Disk Order" msgid "&Edit Disk Boot Order" msgstr "Disk Order" -#: src/lib/bootloader/grub2_widgets.rb:746 +#: src/lib/bootloader/grub2_widgets.rb:725 #, fuzzy msgid "" "<p><big><b>Disks Order</b></big><br>\n" @@ -538,21 +521,21 @@ "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.</p>" #. represents Tab with kernel related configuration -#: src/lib/bootloader/grub2_widgets.rb:767 +#: src/lib/bootloader/grub2_widgets.rb:746 #, fuzzy #| msgid "Other Kernel &Parameters" msgid "&Kernel Parameters" msgstr "Other Kernel &Parameters" #. Represent tab with options related to stage1 location and bootloader type -#: src/lib/bootloader/grub2_widgets.rb:792 +#: src/lib/bootloader/grub2_widgets.rb:771 #, fuzzy #| msgid "Boot Loader Options" msgid "Boot Co&de Options" msgstr "Boot Loader Options" #. Represents bootloader specific options like its timeout, default section or password protection -#: src/lib/bootloader/grub2_widgets.rb:858 +#: src/lib/bootloader/grub2_widgets.rb:837 #, fuzzy #| msgid "Boot Loader Options" msgid "Boot&loader Options" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/ca-management.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/ca-management.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ca-management.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ca-management\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -139,8 +139,7 @@ #: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362 #: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466 #: src/include/ca-management/new_cert.rb:573 -#: src/include/ca-management/util.rb:277 -#: src/include/ca-management/util.rb:1211 +#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211 msgid "&Password:" msgstr "&Password:" @@ -212,8 +211,7 @@ #: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536 #: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536 #: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565 -#: src/include/ca-management/util.rb:777 -#: src/include/ca-management/util.rb:1121 +#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121 msgid "New passwords do not match." msgstr "New passwords do not match." @@ -2287,8 +2285,7 @@ msgid "LDAP P&assword:" msgstr "LDAP P&assword:" -#: src/include/ca-management/util.rb:375 -#: src/include/ca-management/util.rb:1032 +#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032 #: src/include/ca-management/util.rb:1388 msgid "Certificate &Password:" msgstr "Certificate &Password:" @@ -2340,28 +2337,23 @@ msgid "Ce&rtificate and the Key Unencrypted in PEM Format" msgstr "Ce&rtificate and the Key Unencrypted in PEM Format" -#: src/include/ca-management/util.rb:665 -#: src/include/ca-management/util.rb:1002 +#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002 msgid "C&ertificate and the Key Encrypted in PEM Format" msgstr "C&ertificate and the Key Encrypted in PEM Format" -#: src/include/ca-management/util.rb:672 -#: src/include/ca-management/util.rb:1009 +#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009 msgid "&Certificate in DER Format" msgstr "&Certificate in DER Format" -#: src/include/ca-management/util.rb:679 -#: src/include/ca-management/util.rb:1016 +#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016 msgid "Cer&tificate and the Key in PKCS12 Format" msgstr "Cer&tificate and the Key in PKCS12 Format" -#: src/include/ca-management/util.rb:686 -#: src/include/ca-management/util.rb:1023 +#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023 msgid "&Like PKCS12 and Include the CA Chain" msgstr "&Like PKCS12 and Include the CA Chain" -#: src/include/ca-management/util.rb:693 -#: src/include/ca-management/util.rb:1035 +#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035 msgid "&New Password" msgstr "&New Password" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/cio.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/cio.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/cio.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/cluster.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/cluster.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/cluster.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/control-center.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/control-center.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/control-center.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 16:26+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/control.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/control.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/control.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -73,11 +73,11 @@ #: control/control.SLES.glade.translations.glade:45 #: control/control.SLES.glade.translations.glade:82 #: control/control.SLES.glade.translations.glade:83 -#: control/control.openSUSE.glade.translations.glade:28 #: control/control.openSUSE.glade.translations.glade:29 -#: control/control.openSUSE.glade.translations.glade:32 -#: control/control.openSUSE.glade.translations.glade:72 +#: control/control.openSUSE.glade.translations.glade:30 +#: control/control.openSUSE.glade.translations.glade:33 #: control/control.openSUSE.glade.translations.glade:73 +#: control/control.openSUSE.glade.translations.glade:74 msgid "Installation Settings" msgstr "Installation Settings" @@ -93,21 +93,21 @@ #: control/control.SLED.glade.translations.glade:20 #: control/control.SLES.glade.translations.glade:42 -#: control/control.openSUSE.glade.translations.glade:30 +#: control/control.openSUSE.glade.translations.glade:31 msgid "Live Installation Settings" msgstr "Live Installation Settings" #: control/control.SLED.glade.translations.glade:21 #: control/control.SLES.glade.translations.glade:43 -#: control/control.openSUSE.glade.translations.glade:31 -#: control/control.openSUSE.glade.translations.glade:90 +#: control/control.openSUSE.glade.translations.glade:32 +#: control/control.openSUSE.glade.translations.glade:89 msgid "Update Settings" msgstr "Update Settings" #: control/control.SLED.glade.translations.glade:23 #: control/control.SLES.glade.translations.glade:46 #: control/control.SLES.glade.translations.glade:47 -#: control/control.openSUSE.glade.translations.glade:33 +#: control/control.openSUSE.glade.translations.glade:34 msgid "Network Configuration" msgstr "Network Configuration" @@ -115,7 +115,7 @@ #: control/control.SLES.glade.translations.glade:49 #: control/control.SLES.glade.translations.glade:50 #: control/control.SLES.glade.translations.glade:51 -#: control/control.openSUSE.glade.translations.glade:34 +#: control/control.openSUSE.glade.translations.glade:35 msgid "Hardware Configuration" msgstr "Hardware Configuration" @@ -125,18 +125,17 @@ #: control/control.SLES.glade.translations.glade:52 #: control/control.SLES.glade.translations.glade:89 #: control/control.SLES.glade.translations.glade:119 -#: control/control.openSUSE.glade.translations.glade:35 -#: control/control.openSUSE.glade.translations.glade:79 -#: control/control.openSUSE.glade.translations.glade:111 +#: control/control.openSUSE.glade.translations.glade:36 +#: control/control.openSUSE.glade.translations.glade:80 +#: control/control.openSUSE.glade.translations.glade:110 msgid "Preparation" msgstr "Preparation" #: control/control.SLED.glade.translations.glade:26 #: control/control.SLED.glade.translations.glade:52 #: control/control.SLED.glade.translations.glade:66 -#: control/control.openSUSE.glade.translations.glade:36 -#: control/control.openSUSE.glade.translations.glade:65 -#: control/control.openSUSE.glade.translations.glade:80 +#: control/control.openSUSE.glade.translations.glade:37 +#: control/control.openSUSE.glade.translations.glade:66 #, fuzzy #| msgid "Saving Network Configuration" msgid "Load linuxrc Network Configuration" @@ -148,85 +147,84 @@ #: control/control.SLES.glade.translations.glade:54 #: control/control.SLES.glade.translations.glade:77 #: control/control.SLES.glade.translations.glade:91 -#: control/control.openSUSE.glade.translations.glade:37 -#: control/control.openSUSE.glade.translations.glade:66 -#: control/control.openSUSE.glade.translations.glade:81 +#: control/control.openSUSE.glade.translations.glade:38 +#: control/control.openSUSE.glade.translations.glade:67 #, fuzzy #| msgid "Network Setup" msgid "Network Autosetup" msgstr "Network Setup Method" #: control/control.SLED.glade.translations.glade:28 +#: control/control.SLED.glade.translations.glade:54 #: control/control.SLED.glade.translations.glade:68 -#: control/control.SLED.glade.translations.glade:84 -#: control/control.SLED.glade.translations.glade:97 #: control/control.SLES.glade.translations.glade:55 +#: control/control.SLES.glade.translations.glade:78 #: control/control.SLES.glade.translations.glade:92 -#: control/control.SLES.glade.translations.glade:108 -#: control/control.SLES.glade.translations.glade:120 -#: control/control.openSUSE.glade.translations.glade:38 -#: control/control.openSUSE.glade.translations.glade:82 -#: control/control.openSUSE.glade.translations.glade:99 -#: control/control.openSUSE.glade.translations.glade:112 -#, fuzzy -#| msgid "Online Update" -msgid "Installer Update" -msgstr "Online Update" - -#: control/control.SLED.glade.translations.glade:29 -#: control/control.SLED.glade.translations.glade:54 -#: control/control.SLED.glade.translations.glade:69 -#: control/control.SLES.glade.translations.glade:56 -#: control/control.SLES.glade.translations.glade:78 -#: control/control.SLES.glade.translations.glade:93 #: control/control.openSUSE.glade.translations.glade:39 -#: control/control.openSUSE.glade.translations.glade:67 -#: control/control.openSUSE.glade.translations.glade:83 +#: control/control.openSUSE.glade.translations.glade:68 +#: control/control.openSUSE.glade.translations.glade:81 msgid "Welcome" msgstr "Welcome" -#: control/control.SLED.glade.translations.glade:30 +#: control/control.SLED.glade.translations.glade:29 #: control/control.SLED.glade.translations.glade:55 -#: control/control.SLED.glade.translations.glade:70 -#: control/control.SLES.glade.translations.glade:57 +#: control/control.SLED.glade.translations.glade:69 +#: control/control.SLES.glade.translations.glade:56 #: control/control.SLES.glade.translations.glade:79 -#: control/control.SLES.glade.translations.glade:94 +#: control/control.SLES.glade.translations.glade:93 #: control/control.openSUSE.glade.translations.glade:40 #, fuzzy #| msgid "Disk Activation" msgid "Network Activation" msgstr "Disk Activation" +#: control/control.SLED.glade.translations.glade:30 +#: control/control.SLED.glade.translations.glade:70 +#: control/control.SLES.glade.translations.glade:57 +#: control/control.SLES.glade.translations.glade:94 +#: control/control.openSUSE.glade.translations.glade:41 +#: control/control.openSUSE.glade.translations.glade:82 +msgid "Disk Activation" +msgstr "Disk Activation" + #: control/control.SLED.glade.translations.glade:31 +#: control/control.SLED.glade.translations.glade:33 #: control/control.SLED.glade.translations.glade:71 +#: control/control.SLED.glade.translations.glade:97 #: control/control.SLES.glade.translations.glade:58 +#: control/control.SLES.glade.translations.glade:60 #: control/control.SLES.glade.translations.glade:95 -#: control/control.openSUSE.glade.translations.glade:41 -#: control/control.openSUSE.glade.translations.glade:84 -msgid "Disk Activation" -msgstr "Disk Activation" +#: control/control.SLES.glade.translations.glade:120 +#: control/control.openSUSE.glade.translations.glade:42 +#: control/control.openSUSE.glade.translations.glade:44 +#: control/control.openSUSE.glade.translations.glade:83 +#: control/control.openSUSE.glade.translations.glade:111 +msgid "System Analysis" +msgstr "System Analysis" #: control/control.SLED.glade.translations.glade:32 -#: control/control.SLED.glade.translations.glade:33 #: control/control.SLED.glade.translations.glade:72 -#: control/control.SLED.glade.translations.glade:98 +#: control/control.SLED.glade.translations.glade:85 +#: control/control.SLED.glade.translations.glade:100 #: control/control.SLES.glade.translations.glade:59 -#: control/control.SLES.glade.translations.glade:60 #: control/control.SLES.glade.translations.glade:96 -#: control/control.SLES.glade.translations.glade:121 -#: control/control.openSUSE.glade.translations.glade:42 +#: control/control.SLES.glade.translations.glade:109 +#: control/control.SLES.glade.translations.glade:123 #: control/control.openSUSE.glade.translations.glade:43 -#: control/control.openSUSE.glade.translations.glade:85 -#: control/control.openSUSE.glade.translations.glade:113 -msgid "System Analysis" -msgstr "System Analysis" +#: control/control.openSUSE.glade.translations.glade:84 +#: control/control.openSUSE.glade.translations.glade:99 +#: control/control.openSUSE.glade.translations.glade:114 +#, fuzzy +#| msgid "Online Update" +msgid "Installer Update" +msgstr "Online Update" #: control/control.SLED.glade.translations.glade:34 #: control/control.SLED.glade.translations.glade:74 #: control/control.SLES.glade.translations.glade:61 #: control/control.SLES.glade.translations.glade:98 -#: control/control.openSUSE.glade.translations.glade:47 -#: control/control.openSUSE.glade.translations.glade:88 +#: control/control.openSUSE.glade.translations.glade:48 +#: control/control.openSUSE.glade.translations.glade:87 msgid "Add-On Products" msgstr "Add-On Products" @@ -234,8 +232,8 @@ #: control/control.SLED.glade.translations.glade:56 #: control/control.SLES.glade.translations.glade:62 #: control/control.SLES.glade.translations.glade:80 -#: control/control.openSUSE.glade.translations.glade:44 -#: control/control.openSUSE.glade.translations.glade:69 +#: control/control.openSUSE.glade.translations.glade:45 +#: control/control.openSUSE.glade.translations.glade:70 msgid "Disk" msgstr "Disk" @@ -243,22 +241,22 @@ #: control/control.SLED.glade.translations.glade:57 #: control/control.SLES.glade.translations.glade:63 #: control/control.SLES.glade.translations.glade:81 -#: control/control.openSUSE.glade.translations.glade:45 -#: control/control.openSUSE.glade.translations.glade:68 +#: control/control.openSUSE.glade.translations.glade:46 +#: control/control.openSUSE.glade.translations.glade:69 msgid "Time Zone" msgstr "Time Zone" #: control/control.SLED.glade.translations.glade:37 #: control/control.SLED.glade.translations.glade:38 -#: control/control.openSUSE.glade.translations.glade:49 #: control/control.openSUSE.glade.translations.glade:50 -#: control/control.openSUSE.glade.translations.glade:70 +#: control/control.openSUSE.glade.translations.glade:51 #: control/control.openSUSE.glade.translations.glade:71 +#: control/control.openSUSE.glade.translations.glade:72 msgid "User Settings" msgstr "User Settings" #: control/control.SLED.glade.translations.glade:39 -#: control/control.openSUSE.glade.translations.glade:52 +#: control/control.openSUSE.glade.translations.glade:53 msgid "Installation Overview" msgstr "Installation Overview" @@ -309,31 +307,31 @@ #: control/control.SLES.glade.translations.glade:135 #: control/control.SLES.glade.translations.glade:136 #: control/control.SLES.glade.translations.glade:137 -#: control/control.openSUSE.glade.translations.glade:53 #: control/control.openSUSE.glade.translations.glade:54 #: control/control.openSUSE.glade.translations.glade:55 -#: control/control.openSUSE.glade.translations.glade:57 +#: control/control.openSUSE.glade.translations.glade:56 #: control/control.openSUSE.glade.translations.glade:58 #: control/control.openSUSE.glade.translations.glade:59 #: control/control.openSUSE.glade.translations.glade:60 #: control/control.openSUSE.glade.translations.glade:61 #: control/control.openSUSE.glade.translations.glade:62 #: control/control.openSUSE.glade.translations.glade:63 -#: control/control.openSUSE.glade.translations.glade:74 +#: control/control.openSUSE.glade.translations.glade:64 #: control/control.openSUSE.glade.translations.glade:75 #: control/control.openSUSE.glade.translations.glade:76 #: control/control.openSUSE.glade.translations.glade:77 #: control/control.openSUSE.glade.translations.glade:78 +#: control/control.openSUSE.glade.translations.glade:79 +#: control/control.openSUSE.glade.translations.glade:102 #: control/control.openSUSE.glade.translations.glade:103 -#: control/control.openSUSE.glade.translations.glade:104 +#: control/control.openSUSE.glade.translations.glade:105 #: control/control.openSUSE.glade.translations.glade:106 #: control/control.openSUSE.glade.translations.glade:107 #: control/control.openSUSE.glade.translations.glade:108 #: control/control.openSUSE.glade.translations.glade:109 -#: control/control.openSUSE.glade.translations.glade:110 +#: control/control.openSUSE.glade.translations.glade:126 #: control/control.openSUSE.glade.translations.glade:127 #: control/control.openSUSE.glade.translations.glade:128 -#: control/control.openSUSE.glade.translations.glade:129 msgid "Perform Installation" msgstr "Perform Installation" @@ -345,10 +343,10 @@ #: control/control.SLES.glade.translations.glade:103 #: control/control.SLES.glade.translations.glade:114 #: control/control.SLES.glade.translations.glade:130 -#: control/control.openSUSE.glade.translations.glade:56 -#: control/control.openSUSE.glade.translations.glade:93 -#: control/control.openSUSE.glade.translations.glade:105 -#: control/control.openSUSE.glade.translations.glade:122 +#: control/control.openSUSE.glade.translations.glade:57 +#: control/control.openSUSE.glade.translations.glade:92 +#: control/control.openSUSE.glade.translations.glade:104 +#: control/control.openSUSE.glade.translations.glade:121 #, fuzzy #| msgid "Installation" msgid "Installer Cleanup" @@ -357,17 +355,17 @@ #: control/control.SLED.glade.translations.glade:51 #: control/control.SLES.glade.translations.glade:64 #: control/control.SLES.glade.translations.glade:75 -#: control/control.openSUSE.glade.translations.glade:51 -#: control/control.openSUSE.glade.translations.glade:64 +#: control/control.openSUSE.glade.translations.glade:52 +#: control/control.openSUSE.glade.translations.glade:65 msgid "Installation" msgstr "Installation" #: control/control.SLED.glade.translations.glade:73 -#: control/control.SLED.glade.translations.glade:99 +#: control/control.SLED.glade.translations.glade:98 #: control/control.SLES.glade.translations.glade:97 -#: control/control.SLES.glade.translations.glade:122 -#: control/control.openSUSE.glade.translations.glade:86 -#: control/control.openSUSE.glade.translations.glade:114 +#: control/control.SLES.glade.translations.glade:121 +#: control/control.openSUSE.glade.translations.glade:85 +#: control/control.openSUSE.glade.translations.glade:112 msgid "System for Update" msgstr "System for Update" @@ -375,8 +373,8 @@ #: control/control.SLED.glade.translations.glade:102 #: control/control.SLES.glade.translations.glade:99 #: control/control.SLES.glade.translations.glade:125 -#: control/control.openSUSE.glade.translations.glade:89 -#: control/control.openSUSE.glade.translations.glade:117 +#: control/control.openSUSE.glade.translations.glade:88 +#: control/control.openSUSE.glade.translations.glade:116 msgid "Update" msgstr "Update" @@ -413,47 +411,47 @@ #: control/control.SLES.glade.translations.glade:134 #: control/control.SLES.glade.translations.glade:140 #: control/control.SLES.glade.translations.glade:141 +#: control/control.openSUSE.glade.translations.glade:90 #: control/control.openSUSE.glade.translations.glade:91 -#: control/control.openSUSE.glade.translations.glade:92 +#: control/control.openSUSE.glade.translations.glade:93 #: control/control.openSUSE.glade.translations.glade:94 #: control/control.openSUSE.glade.translations.glade:95 -#: control/control.openSUSE.glade.translations.glade:96 +#: control/control.openSUSE.glade.translations.glade:118 #: control/control.openSUSE.glade.translations.glade:119 #: control/control.openSUSE.glade.translations.glade:120 -#: control/control.openSUSE.glade.translations.glade:121 +#: control/control.openSUSE.glade.translations.glade:122 #: control/control.openSUSE.glade.translations.glade:123 #: control/control.openSUSE.glade.translations.glade:124 #: control/control.openSUSE.glade.translations.glade:125 -#: control/control.openSUSE.glade.translations.glade:126 +#: control/control.openSUSE.glade.translations.glade:131 #: control/control.openSUSE.glade.translations.glade:132 -#: control/control.openSUSE.glade.translations.glade:133 msgid "Perform Update" msgstr "Perform Update" #: control/control.SLED.glade.translations.glade:83 #: control/control.SLES.glade.translations.glade:107 -#: control/control.openSUSE.glade.translations.glade:98 +#: control/control.openSUSE.glade.translations.glade:97 msgid "Base Installation" msgstr "Base Installation" -#: control/control.SLED.glade.translations.glade:85 +#: control/control.SLED.glade.translations.glade:84 #: control/control.SLED.glade.translations.glade:86 #: control/control.SLED.glade.translations.glade:87 -#: control/control.SLED.glade.translations.glade:100 +#: control/control.SLED.glade.translations.glade:99 #: control/control.SLED.glade.translations.glade:101 #: control/control.SLED.glade.translations.glade:103 -#: control/control.SLES.glade.translations.glade:109 +#: control/control.SLES.glade.translations.glade:108 #: control/control.SLES.glade.translations.glade:110 #: control/control.SLES.glade.translations.glade:111 -#: control/control.SLES.glade.translations.glade:123 +#: control/control.SLES.glade.translations.glade:122 #: control/control.SLES.glade.translations.glade:124 #: control/control.SLES.glade.translations.glade:126 +#: control/control.openSUSE.glade.translations.glade:98 #: control/control.openSUSE.glade.translations.glade:100 #: control/control.openSUSE.glade.translations.glade:101 -#: control/control.openSUSE.glade.translations.glade:102 +#: control/control.openSUSE.glade.translations.glade:113 #: control/control.openSUSE.glade.translations.glade:115 -#: control/control.openSUSE.glade.translations.glade:116 -#: control/control.openSUSE.glade.translations.glade:118 +#: control/control.openSUSE.glade.translations.glade:117 msgid "AutoYaST Settings" msgstr "AutoYaST Settings" @@ -461,9 +459,9 @@ #: control/control.SLED.glade.translations.glade:119 #: control/control.SLES.glade.translations.glade:138 #: control/control.SLES.glade.translations.glade:142 -#: control/control.openSUSE.glade.translations.glade:97 -#: control/control.openSUSE.glade.translations.glade:130 -#: control/control.openSUSE.glade.translations.glade:134 +#: control/control.openSUSE.glade.translations.glade:96 +#: control/control.openSUSE.glade.translations.glade:129 +#: control/control.openSUSE.glade.translations.glade:133 msgid "Configuration" msgstr "Configuration" @@ -471,8 +469,8 @@ #: control/control.SLED.glade.translations.glade:120 #: control/control.SLES.glade.translations.glade:139 #: control/control.SLES.glade.translations.glade:143 -#: control/control.openSUSE.glade.translations.glade:131 -#: control/control.openSUSE.glade.translations.glade:135 +#: control/control.openSUSE.glade.translations.glade:130 +#: control/control.openSUSE.glade.translations.glade:134 msgid "System Configuration" msgstr "System Configuration" @@ -656,12 +654,16 @@ msgid "Enlightenment Desktop" msgstr "Alternate Desktops" -#: control/control.openSUSE.glade.translations.glade:46 -#: control/control.openSUSE.glade.translations.glade:87 +#: control/control.openSUSE.glade.translations.glade:28 +msgid "Minimal Server Selection (Text Mode)" +msgstr "" + +#: control/control.openSUSE.glade.translations.glade:47 +#: control/control.openSUSE.glade.translations.glade:86 msgid "Online Repositories" msgstr "Online Repositories" -#: control/control.openSUSE.glade.translations.glade:48 +#: control/control.openSUSE.glade.translations.glade:49 msgid "Desktop Selection" msgstr "Desktop Selection" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/country.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/country.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/country.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:17+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -345,8 +345,8 @@ #. summary label #. summary label -#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850 -#: language/src/modules/Language.rb:884 +#: language/src/clients/language.rb:266 language/src/modules/Language.rb:793 +#: language/src/modules/Language.rb:827 msgid "Additional Languages: %1" msgstr "Additional Languages: %1" @@ -610,35 +610,25 @@ msgstr "Adapt &Time Zone to %1" #. busy message -#: language/src/modules/Language.rb:375 +#: language/src/modules/Language.rb:382 msgid "Downloading installation system language extension..." msgstr "Downloading installation system language extension..." -#. TRANSLATORS: Error message. Strings marked %{...} will be replaced -#. with variable content - do not translate them, please. -#: language/src/modules/Language.rb:406 -msgid "" -"Language '%{language}' was not found within the list of supported languages\n" -"available at %{directory}.\n" -"\n" -"Fallback language %{fallback} will be used." -msgstr "" - #. summary label #. summary label -#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866 +#: language/src/modules/Language.rb:737 language/src/modules/Language.rb:809 msgid "Primary Language: %1" msgstr "Primary Language: %1" #. work-around for following in order not to depend on yast2-packager #. PackageSlideShow::InitPkgData (false); #. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes -#: language/src/modules/Language.rb:1039 +#: language/src/modules/Language.rb:982 msgid "Installing Packages..." msgstr "Installing Packages..." #. continue/cancel message -#: language/src/modules/Language.rb:1130 +#: language/src/modules/Language.rb:1073 msgid "" "Translation of the primary language is not complete.\n" "Some texts may be displayed in English.\n" @@ -647,7 +637,7 @@ "Some texts may be displayed in English.\n" #. popup message -#: language/src/modules/Language.rb:1344 +#: language/src/modules/Language.rb:1287 #, fuzzy msgid "" "Only minimal support for the selected language is included on this media.\n" @@ -659,7 +649,7 @@ "for this language." #. popup message (user selected CJK language in text mode) -#: language/src/modules/Language.rb:1373 +#: language/src/modules/Language.rb:1316 msgid "" "The selected language cannot be used in text mode. English is used for\n" "installation, but the selected language will be used for the new system." Modified: branches/plus-SLE12-SP2/yast/en_GB/po/crowbar.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/crowbar.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/crowbar.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-12 09:12+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" @@ -213,7 +213,7 @@ #. radiobutton label #: src/include/crowbar/complex.rb:542 msgid "Architecture" -msgstr "Architecture" +msgstr "" #. error popup #: src/include/crowbar/complex.rb:583 Modified: branches/plus-SLE12-SP2/yast/en_GB/po/dhcp-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/dhcp-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/dhcp-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dhcp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2008-03-27 19:18+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/dns-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/dns-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/dns-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dns-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:54+0200\n" "PO-Revision-Date: 2007-08-16 16:32+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -307,8 +307,7 @@ #. TRANSLATORS: commandline error message #. Both Add and Remove defined => Error! #: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867 -#: src/include/dns-server/cmdline.rb:999 -#: src/include/dns-server/cmdline.rb:1049 +#: src/include/dns-server/cmdline.rb:999 src/include/dns-server/cmdline.rb:1049 #: src/include/dns-server/cmdline.rb:1108 #: src/include/dns-server/cmdline.rb:1244 #: src/include/dns-server/cmdline.rb:1303 @@ -379,8 +378,7 @@ #. Table header item - ACL-options #. Table menu item - Records listing #: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743 -#: src/include/dns-server/cmdline.rb:944 -#: src/include/dns-server/cmdline.rb:1157 +#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157 #: src/include/dns-server/dialog-main.rb:766 #: src/include/dns-server/dialog-main.rb:1359 #: src/include/dns-server/dialog-masterzone.rb:1409 @@ -457,8 +455,7 @@ #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item #. Table header item - DNS listing zones -#: src/include/dns-server/cmdline.rb:980 -#: src/include/dns-server/cmdline.rb:1032 +#: src/include/dns-server/cmdline.rb:980 src/include/dns-server/cmdline.rb:1032 #: src/include/dns-server/cmdline.rb:1089 #: src/include/dns-server/cmdline.rb:1220 #: src/include/dns-server/cmdline.rb:1284 Modified: branches/plus-SLE12-SP2/yast/en_GB/po/docker.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/docker.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/docker.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" @@ -39,7 +39,7 @@ #: src/lib/ydocker/changes_dialog.rb:79 msgid "Path" -msgstr "Path" +msgstr "" #: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235 msgid "Status" @@ -77,7 +77,7 @@ #: src/lib/ydocker/commit_dialog.rb:96 msgid "Name" -msgstr "Name" +msgstr "" #: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218 #, fuzzy @@ -97,13 +97,13 @@ #: src/lib/ydocker/inject_shell_dialog.rb:92 #: src/lib/ydocker/run_image_dialog.rb:162 msgid "&Ok" -msgstr "&Ok" +msgstr "" #: src/lib/ydocker/commit_dialog.rb:113 #: src/lib/ydocker/inject_shell_dialog.rb:93 #: src/lib/ydocker/run_image_dialog.rb:163 msgid "&Cancel" -msgstr "&Cancel" +msgstr "" #. Copyright (c) 2014 SUSE LLC. #. All Rights Reserved. @@ -304,7 +304,7 @@ #: src/lib/ydocker/run_image_dialog.rb:100 msgid "Host" -msgstr "Host" +msgstr "" #: src/lib/ydocker/run_image_dialog.rb:101 #, fuzzy @@ -314,11 +314,11 @@ #: src/lib/ydocker/run_image_dialog.rb:108 msgid "Add" -msgstr "Add" +msgstr "" #: src/lib/ydocker/run_image_dialog.rb:112 msgid "Remove" -msgstr "Remove" +msgstr "" #: src/lib/ydocker/run_image_dialog.rb:122 msgid "Volumes" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/drbd.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/drbd.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/drbd.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" @@ -307,7 +307,7 @@ "\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n" "\t\t<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n" "\t\t\t\t\t\t\t\t\t\t \n" -"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>LVM Filter</b>: A filter that tells LVM2 to only use a restricted set of devices.</p>\n" +"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n" "\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n" "\n" "\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n" @@ -460,43 +460,47 @@ "Press <b>Next</b> to continue.\n" "<br></p>\n" -#. encoding: utf-8 -#: src/include/drbd/lvm_conf.rb:42 +#. Default is always true (auto) +#: src/include/drbd/lvm_conf.rb:44 #, fuzzy msgid "LVM Filter Configuration of DRBD" msgstr "Global Configuration" -#: src/include/drbd/lvm_conf.rb:50 +#: src/include/drbd/lvm_conf.rb:52 +msgid "Modify LVM Device filter Automatically" +msgstr "" + +#: src/include/drbd/lvm_conf.rb:62 #, fuzzy #| msgid "Device type" msgid "Device Filter" msgstr "Device type" -#: src/include/drbd/lvm_conf.rb:60 +#: src/include/drbd/lvm_conf.rb:72 #, fuzzy #| msgid "Writing the SCPM database..." msgid "Writing the LVM cache" msgstr "Writing the SCPM database..." -#: src/include/drbd/lvm_conf.rb:69 +#: src/include/drbd/lvm_conf.rb:81 #, fuzzy #| msgid "Enable Microphone." msgid "Enable LVM Cache" msgstr "Enable Microphone." -#: src/include/drbd/lvm_conf.rb:74 +#: src/include/drbd/lvm_conf.rb:86 msgid "Warning! Should disable LVM cache for using drbd." msgstr "" -#: src/include/drbd/lvm_conf.rb:85 +#: src/include/drbd/lvm_conf.rb:97 msgid "Use lvmetad for LVM" msgstr "" -#: src/include/drbd/lvm_conf.rb:94 +#: src/include/drbd/lvm_conf.rb:106 msgid "Use LVM metad" msgstr "" -#: src/include/drbd/lvm_conf.rb:99 +#: src/include/drbd/lvm_conf.rb:111 msgid "Warning! Should not use lvmetad for cluster." msgstr "" @@ -508,82 +512,82 @@ #: src/include/drbd/resource_conf.rb:151 msgid "Nodes" -msgstr "Nodes" +msgstr "" #: src/include/drbd/resource_conf.rb:154 msgid "Add" -msgstr "Add" +msgstr "" #: src/include/drbd/resource_conf.rb:155 msgid "Edit" -msgstr "Edit" +msgstr "" #: src/include/drbd/resource_conf.rb:156 msgid "Delete" -msgstr "Delete" +msgstr "" #: src/include/drbd/resource_conf.rb:188 msgid "Save" msgstr "" #. Since n_name can't be edit, so set direct is OK -#: src/include/drbd/resource_conf.rb:331 +#: src/include/drbd/resource_conf.rb:336 msgid "Protocol" msgstr "Protocol" #. return `cancel or a string -#: src/include/drbd/resource_conf.rb:555 +#: src/include/drbd/resource_conf.rb:560 msgid "OK" -msgstr "OK" +msgstr "" -#: src/include/drbd/resource_conf.rb:556 +#: src/include/drbd/resource_conf.rb:561 msgid "Cancel" -msgstr "Cancel" +msgstr "" -#: src/include/drbd/resource_conf.rb:570 +#: src/include/drbd/resource_conf.rb:575 #, fuzzy #| msgid "Scheme name must be set." msgid "Node name can not be empty." msgstr "Scheme name must be set." #. eg. ipv6 [fd01:2345:6789:abcd::1]:7800 -#: src/include/drbd/resource_conf.rb:618 +#: src/include/drbd/resource_conf.rb:623 msgid "IPv6 address must be placed inside brackets." msgstr "" #. IPv6 should including port -#: src/include/drbd/resource_conf.rb:626 src/include/drbd/resource_conf.rb:631 +#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636 msgid "IP/port should use 'addr:port' combination." msgstr "" -#: src/include/drbd/resource_conf.rb:639 +#: src/include/drbd/resource_conf.rb:644 msgid "Please enter a valid IP address." msgstr "" #. Checking the port is number -#: src/include/drbd/resource_conf.rb:646 +#: src/include/drbd/resource_conf.rb:651 msgid "Please enter a valid port number." msgstr "" #. myHelp("basic_conf"); -#: src/include/drbd/resource_conf.rb:714 +#: src/include/drbd/resource_conf.rb:719 msgid "Node names must not include \".\" , using the local hostname." msgstr "" -#: src/include/drbd/resource_conf.rb:734 +#: src/include/drbd/resource_conf.rb:739 msgid "Please fill out all fields." msgstr "" -#: src/include/drbd/resource_conf.rb:749 +#: src/include/drbd/resource_conf.rb:754 msgid "Please configure at least two nodes." msgstr "" #. No need to check integrity since it will disabled when configuring -#: src/include/drbd/resource_conf.rb:784 +#: src/include/drbd/resource_conf.rb:789 msgid "Enter the node name:" msgstr "" -#: src/include/drbd/resource_conf.rb:790 +#: src/include/drbd/resource_conf.rb:795 #, fuzzy #| msgid "Scheme name must be set." msgid "Node name must be different." @@ -699,83 +703,83 @@ #. #. Representation of the configuration of drbd. #. Input and output routines. -#: src/modules/Drbd.rb:112 +#: src/modules/Drbd.rb:114 msgid "Failed to merge separated DRBD conf files\n" msgstr "" -#: src/modules/Drbd.rb:134 +#: src/modules/Drbd.rb:136 #, fuzzy #| msgid "Unable to write to idmapd.conf." msgid "Failed to write drbd.conf.YaST2prepare" msgstr "Unable to write to idmapd.conf." #. DRBD read dialog caption -#: src/modules/Drbd.rb:189 +#: src/modules/Drbd.rb:191 #, fuzzy msgid "Initializing DRBD Configuration" msgstr "Initialising DSL Configuration" #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:197 +#: src/modules/Drbd.rb:199 #, fuzzy msgid "Read global settings" msgstr "Read global Samba settings" -#: src/modules/Drbd.rb:198 +#: src/modules/Drbd.rb:200 msgid "Read resources" msgstr "Read resources" -#: src/modules/Drbd.rb:199 +#: src/modules/Drbd.rb:201 #, fuzzy #| msgid "LVM configuration" msgid "Read LVM configurations" msgstr "LVM configuration" -#: src/modules/Drbd.rb:200 +#: src/modules/Drbd.rb:202 msgid "Read daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:201 src/modules/Drbd.rb:208 +#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210 #, fuzzy #| msgid "Read firewall settings" msgid "Read SuSEFirewall Settings" msgstr "Read firewall settings" -#: src/modules/Drbd.rb:204 +#: src/modules/Drbd.rb:206 #, fuzzy msgid "Reading global settings..." msgstr "Reading global Samba settings..." -#: src/modules/Drbd.rb:205 +#: src/modules/Drbd.rb:207 msgid "Reading resources..." msgstr "Reading resources..." -#: src/modules/Drbd.rb:206 +#: src/modules/Drbd.rb:208 #, fuzzy #| msgid "Reading the configuration..." msgid "Reading LVM configurations..." msgstr "Reading the configuration..." -#: src/modules/Drbd.rb:207 +#: src/modules/Drbd.rb:209 msgid "Reading daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:209 src/modules/Drbd.rb:664 +#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661 msgid "Finished" msgstr "Finished" #. new_map = remove(new_map, key); -#: src/modules/Drbd.rb:512 +#: src/modules/Drbd.rb:514 #, fuzzy #| msgid "Failed to save ipsec.conf:" msgid "Failed to backup drbd.conf" msgstr "Failed to save ipsec.conf:" -#: src/modules/Drbd.rb:521 +#: src/modules/Drbd.rb:523 msgid "Failed to clean drbd.conf for drbdadm test" msgstr "" -#: src/modules/Drbd.rb:545 +#: src/modules/Drbd.rb:547 #, fuzzy #| msgid "Configuration of Resource Groups" msgid "" @@ -783,12 +787,12 @@ "%2" msgstr "Configuration of Resource Groups" -#: src/modules/Drbd.rb:564 +#: src/modules/Drbd.rb:566 msgid "Failed to bring drbd.conf back" msgstr "" #. DRBD write dialog caption -#: src/modules/Drbd.rb:640 +#: src/modules/Drbd.rb:637 #, fuzzy msgid "Writing DRBD Configuration" msgstr "Writing NFS Configuration" @@ -797,57 +801,57 @@ #. won't change modified flag #. return true if !@modified #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:652 +#: src/modules/Drbd.rb:649 msgid "Write global settings" msgstr "Write global settings" -#: src/modules/Drbd.rb:653 +#: src/modules/Drbd.rb:650 msgid "Write resources" msgstr "Write resources" -#: src/modules/Drbd.rb:654 +#: src/modules/Drbd.rb:651 #, fuzzy #| msgid "Write configuration" msgid "Write LVM configurations" msgstr "Write configuration" -#: src/modules/Drbd.rb:655 +#: src/modules/Drbd.rb:652 #, fuzzy msgid "Set daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:656 +#: src/modules/Drbd.rb:653 #, fuzzy #| msgid "Write the firewall settings" msgid "Write the SuSEfirewall settings" msgstr "Write the firewall settings" -#: src/modules/Drbd.rb:659 +#: src/modules/Drbd.rb:656 msgid "Writing global settings..." msgstr "Writing global settings..." -#: src/modules/Drbd.rb:660 +#: src/modules/Drbd.rb:657 msgid "Writing resources..." msgstr "Writing resources..." -#: src/modules/Drbd.rb:661 +#: src/modules/Drbd.rb:658 #, fuzzy #| msgid "Writing configuration..." msgid "Writing LVM configurations..." msgstr "Writing configuration..." -#: src/modules/Drbd.rb:662 +#: src/modules/Drbd.rb:659 #, fuzzy msgid "Setting daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:663 +#: src/modules/Drbd.rb:660 #, fuzzy #| msgid "Writing the firewall settings..." msgid "Writing the SuSEFirewall settings" msgstr "Writing the firewall settings..." -#: src/modules/Drbd.rb:674 +#: src/modules/Drbd.rb:671 #, fuzzy #| msgid "Unable to create directory '%1'." msgid "Failed to make directory /etc/drbd.d" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/fcoe-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/fcoe-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/fcoe-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/firewall-services.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/firewall-services.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firewall-services.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: firewall-services\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:38+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/firewall.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/firewall.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firewall.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 16:36+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/firstboot.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/firstboot.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firstboot.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/fonts.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/fonts.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/fonts.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-12 09:12+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/ftp-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/ftp-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ftp-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ftp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/geo-cluster.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/geo-cluster.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/geo-cluster.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -60,10 +60,8 @@ #. #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ #. Initialization dialog caption -#: src/include/geo-cluster/complex.rb:83 -#: src/include/geo-cluster/dialogs.rb:480 -#: src/include/geo-cluster/dialogs.rb:829 -#: src/include/geo-cluster/wizards.rb:46 +#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480 +#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46 #: src/include/geo-cluster/wizards.rb:141 #, fuzzy #| msgid "GeoCluster Configuration" @@ -141,8 +139,7 @@ msgid "site" msgstr "site" -#: src/include/geo-cluster/dialogs.rb:93 -#: src/include/geo-cluster/dialogs.rb:240 +#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240 msgid "ticket" msgstr "ticket" @@ -295,8 +292,7 @@ msgstr "ticket can not be null" #. fill confs with global_files -#: src/include/geo-cluster/dialogs.rb:422 -#: src/include/geo-cluster/wizards.rb:48 +#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48 msgid "Firewall Configuration" msgstr "Firewall Configuration" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/http-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/http-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/http-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: http-server.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/inetd.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/inetd.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/inetd.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder <ke@suse.de>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/installation.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/installation.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/installation.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2008-05-16 13:44+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -509,7 +509,7 @@ msgstr "Alias for %1" #: src/lib/installation/clients/inst_addon_update_sources.rb:172 -#: src/lib/installation/clients/inst_system_analysis.rb:306 +#: src/lib/installation/clients/inst_system_analysis.rb:321 msgid "Unknown Product" msgstr "Unknown Product" @@ -550,16 +550,16 @@ #. 7 = Failed to connect to host. #. 28 = Operation timeout. #. push button -#: src/lib/installation/clients/inst_complex_welcome.rb:178 +#: src/lib/installation/clients/inst_complex_welcome.rb:184 #: src/lib/installation/clients/inst_download_release_notes.rb:126 -#: src/lib/installation/clients/inst_system_analysis.rb:304 +#: src/lib/installation/clients/inst_system_analysis.rb:319 #, fuzzy #| msgid "Release Notes" msgid "Re&lease Notes..." msgstr "Release Notes" #. help text for initial (first time) language screen -#: src/lib/installation/clients/inst_complex_welcome.rb:192 +#: src/lib/installation/clients/inst_complex_welcome.rb:198 #, fuzzy msgid "" "<p>\n" @@ -574,7 +574,7 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/lib/installation/clients/inst_complex_welcome.rb:200 +#: src/lib/installation/clients/inst_complex_welcome.rb:206 msgid "" "<p>\n" "The license must be accepted before the installation continues.\n" @@ -583,7 +583,7 @@ msgstr "" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:207 +#: src/lib/installation/clients/inst_complex_welcome.rb:213 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -594,7 +594,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:213 +#: src/lib/installation/clients/inst_complex_welcome.rb:219 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -607,7 +607,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:220 +#: src/lib/installation/clients/inst_complex_welcome.rb:226 #, fuzzy msgid "" "<p>\n" @@ -621,54 +621,54 @@ "</p>\n" #. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_complex_welcome.rb:236 -#: src/lib/installation/clients/inst_complex_welcome.rb:434 +#: src/lib/installation/clients/inst_complex_welcome.rb:242 +#: src/lib/installation/clients/inst_complex_welcome.rb:469 msgid "License Agreement" msgstr "License Agreement" #. combo box label #. combobox #. TRANSLATORS: Combo box -#: src/lib/installation/clients/inst_complex_welcome.rb:260 +#: src/lib/installation/clients/inst_complex_welcome.rb:266 #: src/lib/installation/clients/inst_release_notes.rb:217 #: src/lib/installation/clients/inst_release_notes.rb:429 msgid "&Language" msgstr "&Language" #. combo box label -#: src/lib/installation/clients/inst_complex_welcome.rb:270 +#: src/lib/installation/clients/inst_complex_welcome.rb:276 msgid "&Keyboard Layout" msgstr "&Keyboard Layout" #. TRANSLATORS: check-box -#: src/lib/installation/clients/inst_complex_welcome.rb:284 +#: src/lib/installation/clients/inst_complex_welcome.rb:290 #, fuzzy msgid "I &Agree to the License Terms." msgstr "Yes, I Agree to the License Agreement" #. Report error about missing license acceptance -#: src/lib/installation/clients/inst_complex_welcome.rb:311 +#: src/lib/installation/clients/inst_complex_welcome.rb:317 msgid "You must accept the license to install this product" msgstr "" #. TRANSLATORS: addition license information #. %1 is replaced with the filename. Please keep #. the translation VERY short. -#: src/lib/installation/clients/inst_complex_welcome.rb:402 +#: src/lib/installation/clients/inst_complex_welcome.rb:437 #, fuzzy #| msgid "Checking the installed system..." msgid "EULA location in the installed system: %s" msgstr "Checking the installed system..." #. this type of contents will be shown only for initial installation dialog -#: src/lib/installation/clients/inst_complex_welcome.rb:425 +#: src/lib/installation/clients/inst_complex_welcome.rb:460 #, fuzzy #| msgid "Keyboard &test:" msgid "K&eyboard Test" msgstr "Keyboard &test:" #. TRANSLATORS: button label -#: src/lib/installation/clients/inst_complex_welcome.rb:459 +#: src/lib/installation/clients/inst_complex_welcome.rb:494 #, fuzzy msgid "License &Translations..." msgstr "PTR: Reverse Translation" @@ -862,35 +862,35 @@ msgstr "" #. popup label -#: src/lib/installation/clients/inst_disks_activate.rb:63 +#: src/lib/installation/clients/inst_disks_activate.rb:65 msgid "Detecting Available Controllers" msgstr "Detecting Available Controllers" #. dialog caption -#: src/lib/installation/clients/inst_disks_activate.rb:79 +#: src/lib/installation/clients/inst_disks_activate.rb:81 msgid "Disk Activation" msgstr "Disk Activation" -#: src/lib/installation/clients/inst_disks_activate.rb:89 +#: src/lib/installation/clients/inst_disks_activate.rb:91 msgid "Configure &DASD Disks" msgstr "Configure &DASD Disks" -#: src/lib/installation/clients/inst_disks_activate.rb:95 +#: src/lib/installation/clients/inst_disks_activate.rb:97 msgid "Configure &ZFCP Disks" msgstr "Configure &ZFCP Disks" -#: src/lib/installation/clients/inst_disks_activate.rb:101 +#: src/lib/installation/clients/inst_disks_activate.rb:103 #, fuzzy #| msgid "Configure &Resources" msgid "Configure &FCoE Interfaces" msgstr "Configure &Resources" -#: src/lib/installation/clients/inst_disks_activate.rb:115 +#: src/lib/installation/clients/inst_disks_activate.rb:117 msgid "Configure &iSCSI Disks" msgstr "Configure &iSCSI Disks" #. Finish -#: src/lib/installation/clients/inst_disks_activate.rb:176 +#: src/lib/installation/clients/inst_disks_activate.rb:178 #, fuzzy #| msgid "Saving network configuration..." msgid "Net&work Configuration..." @@ -924,17 +924,17 @@ msgstr "Initialising the installation..." #. popup message, list of repositores is appended to the text -#: src/lib/installation/clients/inst_extrasources.rb:141 +#: src/lib/installation/clients/inst_extrasources.rb:142 msgid "Package updates have been found in these additional repositories:" msgstr "" #. yes/no popup question -#: src/lib/installation/clients/inst_extrasources.rb:159 +#: src/lib/installation/clients/inst_extrasources.rb:160 msgid "Start the software manager to check and install the updates?" msgstr "" #. check box -#: src/lib/installation/clients/inst_extrasources.rb:494 +#: src/lib/installation/clients/inst_extrasources.rb:501 #, fuzzy #| msgid "Show packages with status" msgid "Show &package updates" @@ -1290,96 +1290,96 @@ #. This dialog in not interactive #. always return `back when came from the previous dialog -#: src/lib/installation/clients/inst_system_analysis.rb:80 +#: src/lib/installation/clients/inst_system_analysis.rb:86 msgid "Analyzing the Computer" msgstr "Analysing the Computer" #. TRANSLATORS: progress steps in system probing -#: src/lib/installation/clients/inst_system_analysis.rb:99 +#: src/lib/installation/clients/inst_system_analysis.rb:105 msgid "Probe USB devices" msgstr "Probe USB devices" -#: src/lib/installation/clients/inst_system_analysis.rb:100 +#: src/lib/installation/clients/inst_system_analysis.rb:106 msgid "Probing USB devices..." msgstr "Probing USB devices..." -#: src/lib/installation/clients/inst_system_analysis.rb:103 +#: src/lib/installation/clients/inst_system_analysis.rb:109 msgid "Probe FireWire devices" msgstr "Probe FireWire devices" -#: src/lib/installation/clients/inst_system_analysis.rb:104 +#: src/lib/installation/clients/inst_system_analysis.rb:110 msgid "Probing FireWire devices..." msgstr "Probing FireWire devices..." -#: src/lib/installation/clients/inst_system_analysis.rb:107 +#: src/lib/installation/clients/inst_system_analysis.rb:113 msgid "Probe floppy disk devices" msgstr "Probe floppy disk devices" -#: src/lib/installation/clients/inst_system_analysis.rb:108 +#: src/lib/installation/clients/inst_system_analysis.rb:114 msgid "Probing floppy disk devices..." msgstr "Probing floppy disk devices..." -#: src/lib/installation/clients/inst_system_analysis.rb:112 +#: src/lib/installation/clients/inst_system_analysis.rb:118 msgid "Probe hard disk controllers" msgstr "Probe hard disk controllers" -#: src/lib/installation/clients/inst_system_analysis.rb:113 +#: src/lib/installation/clients/inst_system_analysis.rb:119 msgid "Probing hard disk controllers..." msgstr "Probing hard disk controllers..." -#: src/lib/installation/clients/inst_system_analysis.rb:116 +#: src/lib/installation/clients/inst_system_analysis.rb:122 msgid "Load kernel modules for hard disk controllers" msgstr "Load kernel modules for hard disk controllers" -#: src/lib/installation/clients/inst_system_analysis.rb:117 +#: src/lib/installation/clients/inst_system_analysis.rb:123 msgid "Loading kernel modules for hard disk controllers..." msgstr "Loading kernel modules for hard disk controllers..." -#: src/lib/installation/clients/inst_system_analysis.rb:120 +#: src/lib/installation/clients/inst_system_analysis.rb:126 msgid "Probe hard disks" msgstr "Probe hard disks" -#: src/lib/installation/clients/inst_system_analysis.rb:121 +#: src/lib/installation/clients/inst_system_analysis.rb:127 msgid "Probing hard disks..." msgstr "Probing hard disks..." #. FATE #302980: Simplified user config during installation -#: src/lib/installation/clients/inst_system_analysis.rb:128 +#: src/lib/installation/clients/inst_system_analysis.rb:134 #, fuzzy msgid "Search for system files" msgstr "Search for Patch Name" -#: src/lib/installation/clients/inst_system_analysis.rb:129 +#: src/lib/installation/clients/inst_system_analysis.rb:135 #, fuzzy msgid "Searching for system files..." msgstr "Searching for modified files" -#: src/lib/installation/clients/inst_system_analysis.rb:132 +#: src/lib/installation/clients/inst_system_analysis.rb:138 #, fuzzy #| msgid "Initialize package manager" msgid "Initialize software manager" msgstr "Initialise package manager" -#: src/lib/installation/clients/inst_system_analysis.rb:133 +#: src/lib/installation/clients/inst_system_analysis.rb:139 #, fuzzy #| msgid "Initializing package manager..." msgid "Initializing software manager..." msgstr "Initialising package manager..." #. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_system_analysis.rb:138 +#: src/lib/installation/clients/inst_system_analysis.rb:144 msgid "System Probing" msgstr "System Probing" #. TRANSLATORS: dialog help -#: src/lib/installation/clients/inst_system_analysis.rb:144 +#: src/lib/installation/clients/inst_system_analysis.rb:150 #, fuzzy #| msgid "Please wait while computer hardware and installed systems are being probed..." msgid "YaST is probing computer hardware and installed systems now." msgstr "Please wait while computer hardware and installed systems are being probed..." #. additonal error when HW was not found -#: src/lib/installation/clients/inst_system_analysis.rb:242 +#: src/lib/installation/clients/inst_system_analysis.rb:257 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1392,7 +1392,7 @@ "Please check your hardware!\n" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:256 +#: src/lib/installation/clients/inst_system_analysis.rb:271 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1405,7 +1405,7 @@ "No hard disks were found for the installation.\n" "Please check your hardware!\n" -#: src/lib/installation/clients/inst_system_analysis.rb:266 +#: src/lib/installation/clients/inst_system_analysis.rb:281 msgid "" "No hard disks were found for the installation.\n" "During an automatic installation, they might be detected later.\n" @@ -1413,7 +1413,7 @@ msgstr "" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:277 +#: src/lib/installation/clients/inst_system_analysis.rb:292 #, fuzzy #| msgid "" #| "No hard disks and no hard disk controllers were\n" @@ -1430,7 +1430,7 @@ "Check your hardware.\n" #. popup message -#: src/lib/installation/clients/inst_system_analysis.rb:322 +#: src/lib/installation/clients/inst_system_analysis.rb:337 #, fuzzy msgid "" "Failed to initialize the software repositories.\n" @@ -1439,32 +1439,8 @@ "Failed to initialise repositories.\n" "Aborting the installation." -#. TRANSLATORS: error message -#: src/lib/installation/clients/inst_update_installer.rb:225 -msgid "" -"<p>Cannot obtain the installer update repository URL\n" -"from the registration server.</p>" -msgstr "" - -#. TRANSLATORS: part of an error message, %s is the default repository -#. URL from control.xml -#: src/lib/installation/clients/inst_update_installer.rb:231 -msgid "<p>The default URL %s will be used.<p>" -msgstr "" - -#. Ask the user to chose a registration server -#. -#. @param services [Array<SlpServiceClass::Service>] Array of registration servers -#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected; -#. :cancel if the dialog was dismissed. -#: src/lib/installation/clients/inst_update_installer.rb:308 -msgid "" -"Select a detected registration server from the list\n" -"to search for installer updates." -msgstr "" - #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:389 +#: src/lib/installation/clients/inst_update_installer.rb:187 msgid "" "A valid update could not be found at\n" "%s.\n" @@ -1472,7 +1448,7 @@ msgstr "" #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:395 +#: src/lib/installation/clients/inst_update_installer.rb:193 msgid "" "Could not fetch update from\n" "%s.\n" @@ -1484,10 +1460,9 @@ #. Ask the user about checking network configuration. If she/he accepts, #. the `inst_lan` client will be launched. #. -#. @param url [URI] URL to show in the message #. @return [Boolean] true if the network configuration client was launched; #. false if the network is not configured. -#: src/lib/installation/clients/inst_update_installer.rb:425 +#: src/lib/installation/clients/inst_update_installer.rb:221 msgid "" "\n" "Would you like to check your network configuration\n" @@ -1497,7 +1472,7 @@ #. Note: the proxy cannot be configured in the YaST installer yet, #. it needs to be set via the "proxy" boot option. #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:470 +#: src/lib/installation/clients/inst_update_installer.rb:265 msgid "" "Downloading the optional installer updates from \n" "%s\n" @@ -1510,58 +1485,6 @@ "then use the \"proxy\" boot parameter.\n" msgstr "" -#. TRANSLATORS: progress label -#: src/lib/installation/clients/inst_update_installer.rb:579 -#, fuzzy -msgid "Add Update Repository" -msgstr "Available Repositories" - -#: src/lib/installation/clients/inst_update_installer.rb:580 -#, fuzzy -#| msgid "Downloading Package" -msgid "Download the Packages" -msgstr "Downloading Package" - -#: src/lib/installation/clients/inst_update_installer.rb:581 -#, fuzzy -#| msgid "Copy the packages" -msgid "Apply the Packages" -msgstr "Copy the packages" - -#: src/lib/installation/clients/inst_update_installer.rb:582 -#, fuzzy -#| msgid "&Restart" -msgid "Restart" -msgstr "&Restart" - -#: src/lib/installation/clients/inst_update_installer.rb:585 -#, fuzzy -#| msgid "Select an AutoYast Profile" -msgid "Fetching AutoYast Profile" -msgstr "Select an AutoYast Profile" - -#. TRANSLATORS: dialog title -#. TRANSLATORS: progress title -#: src/lib/installation/clients/inst_update_installer.rb:595 -#: src/lib/installation/clients/inst_update_installer.rb:597 -#, fuzzy -#| msgid "Updating the sound volume..." -msgid "Updating the Installer..." -msgstr "Updating the sound volume..." - -#. Fetch the profile from the given URI -#. -#. @return [Hash, nil] current profile if fetched or exists; nil otherwise -#. -#. @see Yast::Profile.current -#: src/lib/installation/clients/inst_update_installer.rb:668 -#, fuzzy -#| msgid "Error reading control file." -msgid "" -"Error while parsing the control file.\n" -"\n" -msgstr "Error reading control file." - #. TRANSLATORS: Table item status (repository) #: src/lib/installation/clients/inst_upgrade_urls.rb:109 #, fuzzy @@ -1618,8 +1541,8 @@ #. menu button #. menu button #: src/lib/installation/clients/inst_upgrade_urls.rb:247 -#: src/lib/installation/proposal_runner.rb:651 -#: src/lib/installation/proposal_runner.rb:766 +#: src/lib/installation/proposal_runner.rb:647 +#: src/lib/installation/proposal_runner.rb:762 msgid "&Change..." msgstr "&Change..." @@ -1930,11 +1853,8 @@ msgstr "" #. proposal part - bootloader label -#. For some reason the CheckBoxFrame Label is cut if the label size -#. exceeds the CheckBoxFrame content's width. MinWidth with label length -#. is used to avoid this issue. #: src/lib/installation/clients/ssh_import_proposal.rb:21 -#: src/lib/installation/dialogs/ssh_import.rb:98 +#: src/lib/installation/dialogs/ssh_import.rb:91 #, fuzzy #| msgid "Writing the system configuration" msgid "Import SSH Host Keys and Configuration" @@ -2016,16 +1936,16 @@ msgstr "Copying log files to installed system..." #. Event callback for the 'ok' button -#: src/lib/installation/dialogs/ssh_import.rb:65 +#: src/lib/installation/dialogs/ssh_import.rb:69 msgid "I would like to import SSH keys from a previous installation" msgstr "" -#: src/lib/installation/dialogs/ssh_import.rb:102 +#: src/lib/installation/dialogs/ssh_import.rb:95 msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>" msgstr "" #. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0 -#: src/lib/installation/dialogs/ssh_import.rb:115 +#: src/lib/installation/dialogs/ssh_import.rb:108 #, fuzzy #| msgid "Device" msgid "&Device" @@ -2033,11 +1953,11 @@ #. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device} #. is a string like /dev/sda1 -#: src/lib/installation/dialogs/ssh_import.rb:136 +#: src/lib/installation/dialogs/ssh_import.rb:129 msgid "%{system_name} at %{device}" msgstr "" -#: src/lib/installation/dialogs/ssh_import.rb:141 +#: src/lib/installation/dialogs/ssh_import.rb:134 #, fuzzy #| msgid "&Skip Configuration" msgid "Import SSH Configuration" @@ -2066,7 +1986,7 @@ msgstr "Skipping configuration upon user request" #. error message is a popup -#: src/lib/installation/proposal_runner.rb:274 +#: src/lib/installation/proposal_runner.rb:272 msgid "" "The proposal contains an error that must be\n" "resolved before continuing.\n" @@ -2075,26 +1995,26 @@ "resolved before continuing.\n" #. busy message -#: src/lib/installation/proposal_runner.rb:383 +#: src/lib/installation/proposal_runner.rb:381 #, fuzzy msgid "Adapting the proposal to the current settings..." msgstr "Cannot read the current settings." #. busy message; #. Initial contents of proposal subwindow while proposals are calculated -#: src/lib/installation/proposal_runner.rb:387 -#: src/lib/installation/proposal_runner.rb:671 +#: src/lib/installation/proposal_runner.rb:385 +#: src/lib/installation/proposal_runner.rb:667 msgid "Analyzing your system..." msgstr "Analysing your system..." #. fallback proposal, means usually an internal error -#: src/lib/installation/proposal_runner.rb:489 +#: src/lib/installation/proposal_runner.rb:487 msgid "ERROR: No proposal" msgstr "ERROR: No proposal" #. Submodules handle their own error reporting #. text for a message box -#: src/lib/installation/proposal_runner.rb:530 +#: src/lib/installation/proposal_runner.rb:526 msgid "" "Configuration saved.\n" "There were errors." @@ -2107,40 +2027,40 @@ #. Translators: About 40 characters max, #. use newlines for longer translations. #. radio button -#: src/lib/installation/proposal_runner.rb:625 +#: src/lib/installation/proposal_runner.rb:621 msgid "&Skip Configuration" msgstr "&Skip Configuration" #. radio button -#: src/lib/installation/proposal_runner.rb:634 +#: src/lib/installation/proposal_runner.rb:630 msgid "&Use Following Configuration" msgstr "&Use Following Configuration" #. Help message between headline and installation proposal / settings summary. #. May contain newlines, but don't make it very much longer than the original. -#: src/lib/installation/proposal_runner.rb:697 +#: src/lib/installation/proposal_runner.rb:693 #, fuzzy #| msgid "Click any headline to make changes or use the \"Change...\" menu below." msgid "Click a headline to make changes or use the \"Change...\" menu below." msgstr "Click any headline to make changes or use the \"Change...\" menu below." -#: src/lib/installation/proposal_runner.rb:701 +#: src/lib/installation/proposal_runner.rb:697 #, fuzzy #| msgid "Click any headline to make changes or use the \"Change...\" menu below." msgid "Click a headline to make changes." msgstr "Click any headline to make changes or use the \"Change...\" menu below." #. menu button item -#: src/lib/installation/proposal_runner.rb:761 +#: src/lib/installation/proposal_runner.rb:757 msgid "&Reset to defaults" msgstr "&Reset to defaults" #. FATE #120373 -#: src/lib/installation/proposal_runner.rb:783 +#: src/lib/installation/proposal_runner.rb:779 msgid "&Update" msgstr "&Update" -#: src/lib/installation/proposal_runner.rb:783 +#: src/lib/installation/proposal_runner.rb:779 msgid "&Install" msgstr "&Install" @@ -2181,7 +2101,7 @@ #. Help text for installation proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:435 +#: src/lib/installation/proposal_store.rb:426 #, fuzzy msgid "" "<p>\n" @@ -2195,7 +2115,7 @@ #. so update #. Help text for update proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:443 +#: src/lib/installation/proposal_store.rb:434 #, fuzzy msgid "" "<p>\n" @@ -2208,7 +2128,7 @@ #. Help text for network configuration proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:452 +#: src/lib/installation/proposal_store.rb:443 msgid "" "<p>\n" "Put the network settings into effect by pressing <b>Next</b>.\n" @@ -2220,7 +2140,7 @@ #. Help text for service configuration proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:460 +#: src/lib/installation/proposal_store.rb:451 msgid "" "<p>\n" "Put the service settings into effect by pressing <b>Next</b>.\n" @@ -2232,7 +2152,7 @@ #. Help text for hardware configuration proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:468 +#: src/lib/installation/proposal_store.rb:459 msgid "" "<p>\n" "Put the hardware settings into effect by pressing <b>Next</b>.\n" @@ -2243,12 +2163,12 @@ "</p>\n" #. Proposal in uml module -#: src/lib/installation/proposal_store.rb:475 +#: src/lib/installation/proposal_store.rb:466 msgid "<P><B>UML Installation Proposal</B></P>" msgstr "<P><B>UML Installation Proposal</B></P>" #. help text -#: src/lib/installation/proposal_store.rb:477 +#: src/lib/installation/proposal_store.rb:468 msgid "" "<P>UML (User Mode Linux) installation allows you to start independent\n" "Linux virtual machines in the host system.</P>" @@ -2259,7 +2179,7 @@ #. Generic help text for other proposals (not basic installation or #. hardhware configuration. #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:491 +#: src/lib/installation/proposal_store.rb:482 msgid "" "<p>\n" "To use the settings as displayed, press <b>Next</b>.\n" @@ -2279,7 +2199,7 @@ msgstr "Remote Administration" #. A Continue-Cancel popup -#: src/lib/installation/select_system_role.rb:80 +#: src/lib/installation/select_system_role.rb:79 msgid "Changing the system role may undo adjustments you may have done." msgstr "" @@ -2300,7 +2220,7 @@ #. it's an openSUSE, Ubuntu...) #: src/lib/installation/ssh_config.rb:64 msgid "Linux" -msgstr "Linux" +msgstr "" #. Build a formatted summary based on the status of the importer #. @@ -2330,21 +2250,21 @@ #. autoyast tried to read a file but had no success. #: src/lib/transfer/file_from_url.rb:156 msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." -msgstr "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." +msgstr "" #. autoyast tried to read a file but had no success. #: src/lib/transfer/file_from_url.rb:176 msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2." -msgstr "Cannot find URL '%1' via protocol FTP. Server returned code %2." +msgstr "" #. FIXME: I have doubts this will ever work. Too early. #: src/lib/transfer/file_from_url.rb:192 msgid "Reading file on %1/%2 failed.\n" -msgstr "Reading file on %1/%2 failed.\n" +msgstr "" #: src/lib/transfer/file_from_url.rb:208 msgid "Reading file on %1 failed.\n" -msgstr "Reading file on %1 failed.\n" +msgstr "" #. autoyast tried to mount the CD but had no success. #. autoyast tried to mount a NFS directory which failed @@ -2352,18 +2272,18 @@ #: src/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327 #: src/lib/transfer/file_from_url.rb:371 msgid "Mounting %1 failed." -msgstr "Mounting %1 failed." +msgstr "" #. autoyast tried to read a file but had no success. #: src/lib/transfer/file_from_url.rb:302 msgid "Reading a file on CD failed. Path: %1/%2." -msgstr "Reading a file on CD failed. Path: %1/%2." +msgstr "" #. autoyast tried to copy a file via NFS which failed #. autoyast tried to copy a file via NFS which failed #: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394 msgid "Remote file %1 cannot be retrieved" -msgstr "Remote file %1 cannot be retrieved" +msgstr "" #. this is workaround for bnc#849767 #. because of changes in autoyast startup this code is now @@ -2376,12 +2296,12 @@ #. autoyast tried to copy a file but that file can't be found #: src/lib/transfer/file_from_url.rb:539 msgid "File %1 cannot be found" -msgstr "File %1 cannot be found" +msgstr "" #. Device #: src/lib/transfer/file_from_url.rb:561 msgid "Cannot find URL '%1' via protocol TFTP." -msgstr "Cannot find URL '%1' via protocol TFTP." +msgstr "" #. the user wanted autoyast to fetch it's profile via an unknown protocol #: src/lib/transfer/file_from_url.rb:568 Modified: branches/plus-SLE12-SP2/yast/en_GB/po/instserver.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/instserver.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/instserver.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/iplb.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/iplb.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iplb.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 19:20+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-lio-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-lio-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-lio-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" @@ -45,8 +45,7 @@ msgstr "Service" #. second tab - global authentication -#: src/include/iscsi-lio-server/dialogs.rb:73 -#: src/modules/IscsiLioServer.rb:427 +#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427 msgid "Global" msgstr "Global" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/isns.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/isns.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/isns.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/journal.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/journal.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/journal.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/kdump.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/kdump.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/kdump.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 19:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -391,7 +391,7 @@ #. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text #. delete crashkernel parameter from bootloader -#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:502 +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501 #, fuzzy msgid "To apply changes a reboot is necessary." msgstr "To apply this change reboot is needed." @@ -1287,146 +1287,146 @@ #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:399 +#: src/modules/Kdump.rb:398 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." msgstr "" #. Kdump read dialog caption -#: src/modules/Kdump.rb:512 +#: src/modules/Kdump.rb:511 msgid "Initializing kdump Configuration" msgstr "Initialising kdump Configuration" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:521 src/modules/Kdump.rb:529 +#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528 msgid "Reading the config file..." msgstr "Reading the config file..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:523 +#: src/modules/Kdump.rb:522 #, fuzzy msgid "Reading kernel boot options..." msgstr "Read kernel boot options" #. Progress stage 4/4 -#: src/modules/Kdump.rb:525 +#: src/modules/Kdump.rb:524 msgid "Calculating memory limits..." msgstr "" #. Progress step 2/4 -#: src/modules/Kdump.rb:531 +#: src/modules/Kdump.rb:530 msgid "Reading partitions of disks..." msgstr "Reading partitions of disks..." #. Progress finished 3/4 -#: src/modules/Kdump.rb:533 +#: src/modules/Kdump.rb:532 #, fuzzy #| msgid "Reading available memory..." msgid "Reading available memory and calibrating usage..." msgstr "Reading available memory..." #. Error message -#: src/modules/Kdump.rb:545 +#: src/modules/Kdump.rb:544 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "Cannot read config file /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:553 +#: src/modules/Kdump.rb:552 #, fuzzy msgid "Cannot read kernel boot options." msgstr "Cannot read kernel boot options" #. Error message -#: src/modules/Kdump.rb:561 +#: src/modules/Kdump.rb:560 #, fuzzy msgid "Cannot read available memory." msgstr "Cannot read available memory" #. Kdump read dialog caption -#: src/modules/Kdump.rb:587 +#: src/modules/Kdump.rb:586 msgid "Saving kdump Configuration" msgstr "Saving kdump Configuration" #. Progress stage 1/2 -#: src/modules/Kdump.rb:616 +#: src/modules/Kdump.rb:615 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Kdump.rb:618 +#: src/modules/Kdump.rb:617 msgid "Update boot options" msgstr "Update boot options" #. Progress step 1/2 -#: src/modules/Kdump.rb:622 +#: src/modules/Kdump.rb:621 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Kdump.rb:624 +#: src/modules/Kdump.rb:623 msgid "Updating boot options..." msgstr "Updating boot options..." #. Progress finished -#: src/modules/Kdump.rb:626 +#: src/modules/Kdump.rb:625 msgid "Finished" msgstr "Finished" #. Error message -#: src/modules/Kdump.rb:636 +#: src/modules/Kdump.rb:635 msgid "Cannot write settings." msgstr "Cannot write settings." #. Error message -#: src/modules/Kdump.rb:645 +#: src/modules/Kdump.rb:644 msgid "Adding crashkernel parameter to bootloader fault." msgstr "Adding crashkernel parameter to bootloader fault." #. Create a textual summary #. @return summary of the current configuration -#: src/modules/Kdump.rb:763 +#: src/modules/Kdump.rb:764 #, fuzzy msgid "Kdump status: %1" msgstr "Kdump runlevel: %1" -#: src/modules/Kdump.rb:764 +#: src/modules/Kdump.rb:765 msgid "enabled" msgstr "enabled" -#: src/modules/Kdump.rb:764 +#: src/modules/Kdump.rb:765 msgid "disabled" msgstr "disabled" -#: src/modules/Kdump.rb:771 +#: src/modules/Kdump.rb:772 #, fuzzy msgid "Value(s) of crashkernel option: %1" msgstr "Empty value for option: %1" -#: src/modules/Kdump.rb:778 +#: src/modules/Kdump.rb:779 #, fuzzy msgid "Dump format: %1" msgstr "Dump Format: %1" -#: src/modules/Kdump.rb:785 +#: src/modules/Kdump.rb:786 #, fuzzy msgid "Target of dumps: %1" msgstr "Numbers of old dumps: %1" -#: src/modules/Kdump.rb:792 +#: src/modules/Kdump.rb:793 #, fuzzy msgid "Number of dumps: %1" msgstr "Numbers of old dumps: %1" #. TRANSLATORS: warning message in installation proposal, #. do not translate %{requested} and %{available} - they are replaced with actual sizes later -#: src/modules/Kdump.rb:884 +#: src/modules/Kdump.rb:885 msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available." msgstr "" #. Trying to use fadump on unsupported hardware -#: src/modules/Kdump.rb:971 +#: src/modules/Kdump.rb:972 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." Modified: branches/plus-SLE12-SP2/yast/en_GB/po/languages_db.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/languages_db.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/languages_db.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/ldap-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/ldap-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ldap-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 19:55+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/ldap.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/ldap.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ldap.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/mail.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/mail.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/mail.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2008-05-21 15:49+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -333,8 +333,8 @@ msgid "TLS encryption" msgstr "" -#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 -#: src/modules/Mail.rb:1338 src/modules/Mail.rb:1341 +#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 +#: src/modules/Mail.rb:1341 msgid "No" msgstr "No" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/multipath.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/multipath.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/multipath.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/network.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/network.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/network.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2009-10-08 07:09+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -743,7 +743,7 @@ msgid "Device" msgstr "Device" -#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:408 +#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:399 msgid "Options" msgstr "Options" @@ -823,13 +823,13 @@ #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1340 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371 msgid "Warning: no encryption is used." msgstr "Warning: no encryption is used." #. Hyperlink: Change the configuration of an interface #. Hyperlink: Change the configuration of an interface -#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1342 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373 msgid "Change." msgstr "Change." @@ -1204,14 +1204,14 @@ #. ComboBox label #. ComboBox label #: src/include/network/lan/address.rb:156 -#: src/include/network/lan/hardware.rb:360 +#: src/include/network/lan/hardware.rb:351 msgid "&Device Type" msgstr "&Device Type" #. ComboBox label #. TextEntry label #: src/include/network/lan/address.rb:174 -#: src/include/network/lan/hardware.rb:346 +#: src/include/network/lan/hardware.rb:337 msgid "&Configuration Name" msgstr "&Configuration Name" @@ -1225,7 +1225,7 @@ msgstr "Unknown group" #: src/include/network/lan/address.rb:193 -#: src/include/network/lan/address.rb:1313 +#: src/include/network/lan/address.rb:1307 #, fuzzy msgid "Bridged Devices" msgstr "Modem Devices" @@ -1313,7 +1313,7 @@ #. TextEntry label #. TextEntry label #: src/include/network/lan/address.rb:332 -#: src/include/network/lan/virtual.rb:207 +#: src/include/network/lan/virtual.rb:210 #: src/include/network/services/host.rb:330 msgid "&IP Address" msgstr "&IP Address" @@ -1405,56 +1405,57 @@ "Duplicate IP address detected.\n" "Really continue?\n" -#. Stores content of IFPLUGD_PRIORITY widget into internal variables -#: src/include/network/lan/address.rb:1193 +#. @param [Array<String>] types network card types +#. @return their descriptions for CWM +#: src/include/network/lan/address.rb:1187 msgid "&General" msgstr "&General" #. TODO: "MANDATORY", -#: src/include/network/lan/address.rb:1204 +#: src/include/network/lan/address.rb:1198 msgid "Device Activation" msgstr "Device Activation" -#: src/include/network/lan/address.rb:1208 +#: src/include/network/lan/address.rb:1202 msgid "Firewall Zone" msgstr "Firewall Zone" -#: src/include/network/lan/address.rb:1213 +#: src/include/network/lan/address.rb:1207 msgid "Maximum Transfer Unit (MTU)" msgstr "Maximum Transfer Unit (MTU)" #. FIXME: we have helps per widget and for the whole #. tab set but not for one tab -#: src/include/network/lan/address.rb:1223 +#: src/include/network/lan/address.rb:1217 msgid "<p>Configure the detailed network card settings here.</p>" msgstr "<p>Configure the detailed network card settings here.</p>" #. FIXME: here it does not complain about missing #. shortcuts -#: src/include/network/lan/address.rb:1290 +#: src/include/network/lan/address.rb:1284 msgid "&Address" msgstr "&Address" #. Address tab help -#: src/include/network/lan/address.rb:1293 +#: src/include/network/lan/address.rb:1287 msgid "<p>Configure your IP address.</p>" msgstr "<p>Configure your IP address.</p>" -#: src/include/network/lan/address.rb:1299 +#: src/include/network/lan/address.rb:1293 msgid "&Hardware" msgstr "&Hardware" -#: src/include/network/lan/address.rb:1306 +#: src/include/network/lan/address.rb:1300 #, fuzzy msgid "&Bond Slaves" msgstr "Bond &Slaves" -#: src/include/network/lan/address.rb:1320 +#: src/include/network/lan/address.rb:1314 msgid "&Wireless" msgstr "&Wireless" #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/lan/address.rb:1404 +#: src/include/network/lan/address.rb:1398 #, fuzzy #| msgid "Swap &Priority" msgid "Ifplugd Priority" @@ -1462,7 +1463,7 @@ #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/lan/address.rb:1410 +#: src/include/network/lan/address.rb:1404 msgid "" "<p><b><big>IFPLUGD PRIORITY</big></b></p> \n" "<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n" @@ -1472,12 +1473,12 @@ msgstr "" #. Address dialog caption -#: src/include/network/lan/address.rb:1493 +#: src/include/network/lan/address.rb:1486 msgid "Network Card Setup" msgstr "Network Card Setup" #. Translators: Warn the user about not desired effect -#: src/include/network/lan/address.rb:1618 +#: src/include/network/lan/address.rb:1617 msgid "" "The interfaces selected share the same physical port and bonding them \n" "may not have the desired effect of redundancy.\n" @@ -1862,7 +1863,7 @@ msgstr "&Change Hostname via DHCP" #. Manual network card setup help 1/4 -#: src/include/network/lan/hardware.rb:91 +#: src/include/network/lan/hardware.rb:82 #, fuzzy msgid "" "<p>Set up hardware-specific options for \n" @@ -1871,20 +1872,20 @@ #. Manual network card setup help 2/4 #. translators: do not translated udev, MAC, BusID -#: src/include/network/lan/hardware.rb:100 +#: src/include/network/lan/hardware.rb:91 msgid "" "<p><b>Device Type</b>. Various device types are available, select \n" "one according your needs.</p>" msgstr "" -#: src/include/network/lan/hardware.rb:108 +#: src/include/network/lan/hardware.rb:99 msgid "" "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n" "associating the MAC address or BusID of the network device with its name (for\n" "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n" msgstr "" -#: src/include/network/lan/hardware.rb:114 +#: src/include/network/lan/hardware.rb:105 msgid "" "<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n" "Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n" @@ -1892,7 +1893,7 @@ msgstr "" #. Manual network card setup help 2/4 -#: src/include/network/lan/hardware.rb:127 +#: src/include/network/lan/hardware.rb:118 msgid "" "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n" "for your network device here. If the device is already configured, see if there is more than one driver available for\n" @@ -1900,7 +1901,7 @@ msgstr "" #. Manual networ card setup help 3/4 -#: src/include/network/lan/hardware.rb:134 +#: src/include/network/lan/hardware.rb:125 #, fuzzy msgid "" "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n" @@ -1912,12 +1913,12 @@ "for example, <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are configured\n" "with the same module name, options will be merged while saving.</p>" -#: src/include/network/lan/hardware.rb:140 +#: src/include/network/lan/hardware.rb:131 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n" msgstr "" #. Manual dialog help 4/4 -#: src/include/network/lan/hardware.rb:149 +#: src/include/network/lan/hardware.rb:140 msgid "" "<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n" "If you have a <b>USB</b> network card, select USB.</p>\n" @@ -1927,7 +1928,7 @@ #. overwrite help #. Manual dialog help 5/4 -#: src/include/network/lan/hardware.rb:158 +#: src/include/network/lan/hardware.rb:149 msgid "" "<p>Here, set up your networking device. The values will be\n" "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" @@ -1936,7 +1937,7 @@ "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" #. Manual dialog help 6/4 -#: src/include/network/lan/hardware.rb:162 +#: src/include/network/lan/hardware.rb:153 msgid "" "<p>Options for the module should be written in the format specified\n" "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>" @@ -1945,69 +1946,69 @@ "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>" #. CheckBox label -#: src/include/network/lan/hardware.rb:290 +#: src/include/network/lan/hardware.rb:281 msgid "&PCMCIA" msgstr "&PCMCIA" #. CheckBox label -#: src/include/network/lan/hardware.rb:299 +#: src/include/network/lan/hardware.rb:290 msgid "&USB" msgstr "&USB" #. #116211 - allow user to change modules from list #. Frame label -#: src/include/network/lan/hardware.rb:311 +#: src/include/network/lan/hardware.rb:302 msgid "&Kernel Module" msgstr "&Kernel Module" #. Text entry label -#: src/include/network/lan/hardware.rb:321 +#: src/include/network/lan/hardware.rb:312 msgid "&Module Name" msgstr "&Module Name" -#: src/include/network/lan/hardware.rb:374 +#: src/include/network/lan/hardware.rb:365 #, fuzzy #| msgid "Udev rules" msgid "Udev Rules" msgstr "Udev rules" -#: src/include/network/lan/hardware.rb:376 +#: src/include/network/lan/hardware.rb:367 msgid "Device Name" msgstr "Device Name" -#: src/include/network/lan/hardware.rb:377 +#: src/include/network/lan/hardware.rb:368 msgid "Change" msgstr "Change" -#: src/include/network/lan/hardware.rb:388 +#: src/include/network/lan/hardware.rb:379 #, fuzzy #| msgid "Server Identification" msgid "Show Visible Port Identification" msgstr "Server Identification" #. translators: how many seconds will card be blinking -#: src/include/network/lan/hardware.rb:393 +#: src/include/network/lan/hardware.rb:384 msgid "Seconds" msgstr "Seconds" -#: src/include/network/lan/hardware.rb:398 +#: src/include/network/lan/hardware.rb:389 #, fuzzy #| msgid "Blin" msgid "Blink" msgstr "Blin" -#: src/include/network/lan/hardware.rb:403 +#: src/include/network/lan/hardware.rb:394 #, fuzzy msgid "Ethtool Options" msgstr "&Additional ipppd options" #. Manual selection caption -#: src/include/network/lan/hardware.rb:481 +#: src/include/network/lan/hardware.rb:472 msgid "Manual Network Card Selection" msgstr "Manual Network Card Selection" #. Manual selection help -#: src/include/network/lan/hardware.rb:484 +#: src/include/network/lan/hardware.rb:475 msgid "" "<p>Select the network card to configure. Search\n" "for a particular network card by entering the name in the search entry.</p>" @@ -2017,37 +2018,28 @@ #. Selection box label #. Selection box title -#: src/include/network/lan/hardware.rb:494 -#: src/include/network/lan/hardware.rb:546 +#: src/include/network/lan/hardware.rb:485 +#: src/include/network/lan/hardware.rb:537 msgid "&Network Card" msgstr "&Network Card" #. Text entry field -#: src/include/network/lan/hardware.rb:498 +#: src/include/network/lan/hardware.rb:489 msgid "&Search" msgstr "&Search" #. bnc#767946 -#: src/include/network/lan/hardware.rb:804 +#: src/include/network/lan/hardware.rb:796 #, fuzzy msgid "" -"Configuration name %s already exists.\n" +"Configuration name %1 already exists.\n" "Choose a different one." msgstr "" "Configuration name %1 (%2) already exists.\n" "Choose a different one." -#: src/include/network/lan/hardware.rb:810 -#, fuzzy -msgid "" -"Configuration name %s is invalid.\n" -"Choose a different one." -msgstr "" -"Configuration name %1 (%2) already exists.\n" -"Choose a different one." - #. S/390 dialog caption -#: src/include/network/lan/hardware.rb:866 +#: src/include/network/lan/hardware.rb:853 msgid "S/390 Network Card Configuration" msgstr "S/390 Network Card Configuration" @@ -2055,134 +2047,134 @@ #. Frame label #. Frame label #. Frame label -#: src/include/network/lan/hardware.rb:885 -#: src/include/network/lan/hardware.rb:987 -#: src/include/network/lan/hardware.rb:1054 -#: src/include/network/lan/hardware.rb:1091 +#: src/include/network/lan/hardware.rb:872 +#: src/include/network/lan/hardware.rb:974 +#: src/include/network/lan/hardware.rb:1041 +#: src/include/network/lan/hardware.rb:1078 msgid "S/390 Device Settings" msgstr "S/390 Device Settings" #. TextEntry label -#: src/include/network/lan/hardware.rb:895 +#: src/include/network/lan/hardware.rb:882 msgid "&Port Name" msgstr "&Port Name" -#: src/include/network/lan/hardware.rb:900 +#: src/include/network/lan/hardware.rb:887 msgid "Port Number" msgstr "Port Number" #. CheckBox label -#: src/include/network/lan/hardware.rb:914 +#: src/include/network/lan/hardware.rb:901 msgid "&Enable IPA Takeover" msgstr "&Enable IPA Takeover" #. CheckBox label -#: src/include/network/lan/hardware.rb:921 +#: src/include/network/lan/hardware.rb:908 msgid "Enable &Layer 2 Support" msgstr "Enable &Layer 2 Support" #. TextEntry label -#: src/include/network/lan/hardware.rb:928 +#: src/include/network/lan/hardware.rb:915 msgid "Layer2 &MAC Address" msgstr "Layer2 &MAC Address" -#: src/include/network/lan/hardware.rb:936 -#: src/include/network/lan/hardware.rb:1012 -#: src/include/network/lan/hardware.rb:1066 +#: src/include/network/lan/hardware.rb:923 +#: src/include/network/lan/hardware.rb:999 +#: src/include/network/lan/hardware.rb:1053 #, fuzzy msgid "Read Channel" msgstr "R&ead Channel" -#: src/include/network/lan/hardware.rb:942 -#: src/include/network/lan/hardware.rb:1018 -#: src/include/network/lan/hardware.rb:1072 +#: src/include/network/lan/hardware.rb:929 +#: src/include/network/lan/hardware.rb:1005 +#: src/include/network/lan/hardware.rb:1059 #, fuzzy msgid "Write Channel" msgstr "&Write Channel" -#: src/include/network/lan/hardware.rb:948 +#: src/include/network/lan/hardware.rb:935 #, fuzzy msgid "Control Channel" msgstr "Control file changed." #. S/390 dialog help: QETH Port name -#: src/include/network/lan/hardware.rb:959 +#: src/include/network/lan/hardware.rb:946 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>" msgstr "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>" #. S/390 dialog help: QETH Options -#: src/include/network/lan/hardware.rb:963 +#: src/include/network/lan/hardware.rb:950 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" msgstr "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" -#: src/include/network/lan/hardware.rb:966 +#: src/include/network/lan/hardware.rb:953 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" msgstr "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" -#: src/include/network/lan/hardware.rb:969 +#: src/include/network/lan/hardware.rb:956 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" -#: src/include/network/lan/hardware.rb:972 +#: src/include/network/lan/hardware.rb:959 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" #. TextEntry label -#: src/include/network/lan/hardware.rb:996 +#: src/include/network/lan/hardware.rb:983 msgid "&Port Number" msgstr "&Port Number" #. TextEntry label -#: src/include/network/lan/hardware.rb:1004 +#: src/include/network/lan/hardware.rb:991 msgid "&LANCMD Time-Out" msgstr "&LANCMD Time-Out" #. S/390 dialog help: LCS -#: src/include/network/lan/hardware.rb:1029 +#: src/include/network/lan/hardware.rb:1016 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>" msgstr "<p>Choose the <b>Port Number</b> for this interface.</p>" -#: src/include/network/lan/hardware.rb:1030 +#: src/include/network/lan/hardware.rb:1017 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>" msgstr "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1035 +#: src/include/network/lan/hardware.rb:1022 msgid "Compatibility Mode" msgstr "Compatibility Mode" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1037 +#: src/include/network/lan/hardware.rb:1024 msgid "Extended Mode" msgstr "Extended Mode" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1039 +#: src/include/network/lan/hardware.rb:1026 msgid "CTC-Based tty (Linux to Linux Connections)" msgstr "CTC-Based tty (Linux to Linux Connections)" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1041 +#: src/include/network/lan/hardware.rb:1028 msgid "Compatibility Mode with OS/390 and z/OS" msgstr "Compatibility Mode with OS/390 and z/OS" #. TextEntry label -#: src/include/network/lan/hardware.rb:1060 +#: src/include/network/lan/hardware.rb:1047 msgid "&Protocol" msgstr "&Protocol" #. S/390 dialog help: CTC -#: src/include/network/lan/hardware.rb:1083 +#: src/include/network/lan/hardware.rb:1070 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>" msgstr "<p>Choose the <b>Protocol</b> for this interface.</p>" #. TextEntry label, #42789 -#: src/include/network/lan/hardware.rb:1100 +#: src/include/network/lan/hardware.rb:1087 msgid "&Peer Name" msgstr "&Peer Name" #. S/390 dialog help: IUCV, #42789 -#: src/include/network/lan/hardware.rb:1111 +#: src/include/network/lan/hardware.rb:1098 msgid "" "<p>Enter the name of the IUCV peer,\n" "for example, the z/VM user name with which to connect (case-sensitive).</p>\n" @@ -2190,7 +2182,7 @@ "<p>Enter the name of the IUCV peer,\n" "for example, the z/VM user name with which to connect (case-sensitive).</p>\n" -#: src/include/network/lan/hardware.rb:1224 +#: src/include/network/lan/hardware.rb:1211 #, fuzzy msgid "" "An error occurred while creating device.\n" @@ -2199,7 +2191,7 @@ #. Manual network card configuration dialog #. @return dialog result -#: src/include/network/lan/hardware.rb:1246 +#: src/include/network/lan/hardware.rb:1233 msgid "Hardware Dialog" msgstr "Hardware Dialogue" @@ -2839,31 +2831,31 @@ "available options.</p>" #. TextEntry label -#: src/include/network/lan/virtual.rb:203 +#: src/include/network/lan/virtual.rb:206 #, fuzzy #| msgid "IP Address" msgid "IPv4 &Address Label" msgstr "IP Address" #. TextEntry label -#: src/include/network/lan/virtual.rb:211 +#: src/include/network/lan/virtual.rb:214 msgid "Net&mask" msgstr "Net&mask" #. Popup::Error text -#: src/include/network/lan/virtual.rb:241 +#: src/include/network/lan/virtual.rb:244 msgid "Label is too long." msgstr "" #. Popup::Error text #. Popup::Error text -#: src/include/network/lan/virtual.rb:251 +#: src/include/network/lan/virtual.rb:254 #: src/include/network/services/host.rb:375 msgid "The IP address is invalid." msgstr "The IP address is invalid." #. Popup::Error text -#: src/include/network/lan/virtual.rb:260 +#: src/include/network/lan/virtual.rb:263 msgid "The subnet mask is invalid." msgstr "The subnet mask is invalid." @@ -3504,33 +3496,33 @@ #. if listed any items, disable them, if show_popup, show warning popup #. #. returns true if items were disabled -#: src/include/network/routines.rb:833 +#: src/include/network/routines.rb:829 msgid "" "Network is currently handled by NetworkManager\n" "or completely disabled. YaST is unable to configure some options." msgstr "" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:893 +#: src/include/network/routines.rb:889 msgid "Network Cards" msgstr "Network Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:897 +#: src/include/network/routines.rb:893 msgid "Modems" msgstr "Modems" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:901 +#: src/include/network/routines.rb:897 msgid "ISDN Cards" msgstr "ISDN Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:905 +#: src/include/network/routines.rb:901 msgid "DSL Devices" msgstr "DSL Devices" -#: src/include/network/routines.rb:910 +#: src/include/network/routines.rb:906 msgid "All Network Devices" msgstr "All Network Devices" @@ -4507,42 +4499,42 @@ #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1237 src/modules/LanItems.rb:1241 -#: src/modules/LanItems.rb:1245 +#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272 +#: src/modules/LanItems.rb:1276 msgid "Started automatically at boot" msgstr "Started automatically at boot" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1249 +#: src/modules/LanItems.rb:1280 msgid "Started automatically on cable connection" msgstr "Started automatically on cable connection" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1253 +#: src/modules/LanItems.rb:1284 msgid "Managed by NetworkManager" msgstr "Managed by NetworkManager" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1257 +#: src/modules/LanItems.rb:1288 msgid "Will not be started at all" msgstr "Will not be started at all" -#: src/modules/LanItems.rb:1263 +#: src/modules/LanItems.rb:1294 msgid "Started manually" msgstr "Started manually" #. do nothing -#: src/modules/LanItems.rb:1275 +#: src/modules/LanItems.rb:1306 #, fuzzy msgid "IP address assigned using" msgstr "IP address assigned using DHCP" -#: src/modules/LanItems.rb:1279 +#: src/modules/LanItems.rb:1310 #, fuzzy msgid "IP address: %s/%s" msgstr "IP Address: %1" -#: src/modules/LanItems.rb:1282 +#: src/modules/LanItems.rb:1313 #, fuzzy #| msgid "IP address: %1, subnet mask %2" msgid "IP address: %s, subnet mask %s" @@ -4550,58 +4542,58 @@ #. FIXME: side effect: sets @type. No reason for that. It should only build item #. overview. Check and remove. -#: src/modules/LanItems.rb:1306 +#: src/modules/LanItems.rb:1337 msgid "Not configured" msgstr "Not configured" #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1328 src/modules/LanItems.rb:1390 +#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421 #, fuzzy #| msgid "Device Name: %1" msgid "Device Name: %s" msgstr "Device Name: %1" -#: src/modules/LanItems.rb:1349 +#: src/modules/LanItems.rb:1380 #, fuzzy #| msgid "Bond slaves" msgid "Bonding slaves" msgstr "Bond slaves" -#: src/modules/LanItems.rb:1363 +#: src/modules/LanItems.rb:1394 msgid "enslaved in %s" msgstr "" -#: src/modules/LanItems.rb:1364 +#: src/modules/LanItems.rb:1395 msgid "Bonding master" msgstr "" -#: src/modules/LanItems.rb:1378 +#: src/modules/LanItems.rb:1409 #, fuzzy msgid "Not connected" msgstr "(not connected)" -#: src/modules/LanItems.rb:1379 +#: src/modules/LanItems.rb:1410 msgid "No hwinfo" msgstr "" -#: src/modules/LanItems.rb:1396 +#: src/modules/LanItems.rb:1427 #, fuzzy msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details." msgstr "<p>Unable to configure network card because kernel device is not present</p>" -#: src/modules/LanItems.rb:1402 +#: src/modules/LanItems.rb:1433 #, fuzzy msgid "" "The device is not configured. Press <b>Edit</b>\n" "to configure.\n" msgstr "<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B> to configure</LI></UL></P>" -#: src/modules/LanItems.rb:1409 +#: src/modules/LanItems.rb:1440 #, fuzzy msgid "Needed firmware" msgstr "Needed Information" -#: src/modules/LanItems.rb:1409 +#: src/modules/LanItems.rb:1440 msgid "unknown" msgstr "unknown" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/nfs.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/nfs.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nfs.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder <ke@suse.de>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/nfs_server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/nfs_server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nfs_server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:05+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/nis.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/nis.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nis.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2004-03-18 11:36+0100\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/nis_server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/nis_server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nis_server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:06+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/ntp-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/ntp-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ntp-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 20:07+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -494,14 +494,12 @@ msgstr "NTP Server" #. TRANSLATORS: frame label -#: src/include/ntp-client/dialogs.rb:320 -#: src/include/ntp-client/widgets.rb:1492 +#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492 msgid "Local NTP Server" msgstr "Local NTP Server" #. TRANSLATORS: frame label -#: src/include/ntp-client/dialogs.rb:364 -#: src/include/ntp-client/widgets.rb:1493 +#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493 msgid "Public NTP Server" msgstr "Public NTP Server" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/oneclickinstall.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/oneclickinstall.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/oneclickinstall.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-12 09:13+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/online-update-configuration.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/online-update-configuration.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/online-update-configuration.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/online-update.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/online-update.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/online-update.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:11+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/opensuse_mirror.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/opensuse_mirror.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/opensuse_mirror.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-12 09:13+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/packager.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/packager.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/packager.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2007-08-16 20:13+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -891,7 +891,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1307 +#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1328 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "Details:" @@ -899,7 +899,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1315 +#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1336 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "Try again?" @@ -1587,7 +1587,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:323 -#: src/modules/Packages.rb:1302 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306 #, fuzzy msgid "" "Unable to create repository\n" @@ -1633,7 +1633,7 @@ #. popup error #. popup error #: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624 -#: src/modules/ProductLicense.rb:574 src/modules/ProductLicense.rb:767 +#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726 #, fuzzy msgid "An error occurred while preparing the installation system." msgstr "An error occurred during the installation of" @@ -1657,8 +1657,8 @@ #. FATE #302398: PATTERNS keyword in content file #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1733 -#: src/modules/AddOnProduct.rb:1739 src/modules/Packages.rb:450 +#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781 +#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471 msgid "Unknown Product" msgstr "Unknown Product" @@ -1670,7 +1670,7 @@ #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1439 +#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442 #, fuzzy msgid "Unable to use additional products." msgstr "Insert the add-on product CD" @@ -1687,47 +1687,47 @@ msgstr "URL: %1, Directory: %2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1374 +#: src/modules/AddOnProduct.rb:1376 #, fuzzy msgid "Additional Products" msgstr "Additional &LDAP Groups" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1379 +#: src/modules/AddOnProduct.rb:1382 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" msgstr "" -#: src/modules/AddOnProduct.rb:1390 +#: src/modules/AddOnProduct.rb:1393 #, fuzzy msgid "Additional Products to Select" msgstr "Additional Group Settings" #. push button label -#: src/modules/AddOnProduct.rb:1397 +#: src/modules/AddOnProduct.rb:1400 #, fuzzy msgid "Add Selected &Products" msgstr "Add-On Products" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1529 +#: src/modules/AddOnProduct.rb:1532 #, fuzzy #| msgid "Insert the add-on product CD" msgid "Insert the addon %1 medium" msgstr "Insert the add-on product CD" #. %1 is the product name, %2 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1534 +#: src/modules/AddOnProduct.rb:1537 #, fuzzy #| msgid "Insert the first installation medium." msgid "Insert the %1 %2 medium" msgstr "Insert the first installation medium." #. TRANSLATORS: error message, %1 is replaced with product URL -#: src/modules/AddOnProduct.rb:1581 +#: src/modules/AddOnProduct.rb:1589 #, fuzzy -msgid "Unable to add product %s." +msgid "Unable to add product %1." msgstr "Unable to write %1." #. update the trusted flag @@ -1882,85 +1882,85 @@ msgstr "Applying delta" #. warning text -#: src/modules/Packages.rb:290 +#: src/modules/Packages.rb:311 #, fuzzy msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution." msgstr "However, you are trying to install a 32-bit distribution." #. help text for software proposal -#: src/modules/Packages.rb:306 +#: src/modules/Packages.rb:327 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>" msgstr "" #. (see bnc#178357 why these numbers) #. translators: help text for software proposal -#: src/modules/Packages.rb:318 +#: src/modules/Packages.rb:339 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>" msgstr "" #. help text for software proposal -#: src/modules/Packages.rb:323 +#: src/modules/Packages.rb:344 msgid "" "<P>The total 'size to download' is the size of the packages which will be\n" "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n" msgstr "" #. help text for software proposal - header -#: src/modules/Packages.rb:332 +#: src/modules/Packages.rb:353 #, fuzzy msgid "<P><B>Software Proposal</B></P>" msgstr "<P><B>UML Installation Proposal</B></P>" #. installation proposal - SW summary, %1 is name of the installed product #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) -#: src/modules/Packages.rb:349 +#: src/modules/Packages.rb:370 msgid "Product: %1" msgstr "Product: %1" #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) -#: src/modules/Packages.rb:363 +#: src/modules/Packages.rb:384 #, fuzzy msgid "System Type: %1" msgstr "System: %1" -#: src/modules/Packages.rb:374 +#: src/modules/Packages.rb:395 #, fuzzy msgid "Patterns:<br>" msgstr "Patterns" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:384 +#: src/modules/Packages.rb:405 msgid "Size of Packages to Install: %1" msgstr "Size of Packages to Install: %1" #. installation proposal - SW summary, %1 is download size of the selected packages #. which will be installed from an ftp or http repository (in MB or GB) -#: src/modules/Packages.rb:397 +#: src/modules/Packages.rb:418 #, fuzzy msgid "Downloading from Remote Repositories: %1" msgstr "Download of Release Notes" -#: src/modules/Packages.rb:459 +#: src/modules/Packages.rb:480 msgid "These add-on products have been marked for auto-removal: %1" msgstr "" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:483 +#: src/modules/Packages.rb:504 msgid "Contact the vendors of these add-ons to provide you with new installation media." msgstr "" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:487 +#: src/modules/Packages.rb:508 msgid "Contact the vendor of the add-on to provide you with a new installation media." msgstr "" #. error message: %1: e.g. "/usr", %2: "/dev/sda2" -#: src/modules/Packages.rb:528 +#: src/modules/Packages.rb:549 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation." msgstr "" #. error message: %1: e.g. "/local", %2: "/dev/sda2" -#: src/modules/Packages.rb:548 +#: src/modules/Packages.rb:569 #, fuzzy #| msgid "" #| "There is not enough free space in directory %1.\n" @@ -1971,43 +1971,43 @@ "Continue anyway?\n" #. summary warning -#: src/modules/Packages.rb:591 +#: src/modules/Packages.rb:612 #, fuzzy msgid "Not enough disk space." msgstr "more disk space." #. summary warning -#: src/modules/Packages.rb:593 +#: src/modules/Packages.rb:614 #, fuzzy msgid "Not enough disk space. Remove some packages in the single selection." msgstr "Not enough disk space. Remove some packages in the single selection." #. add a backslash if it's missing -#: src/modules/Packages.rb:614 +#: src/modules/Packages.rb:635 #, fuzzy msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "No free space available on %1" #. newly installed products -#: src/modules/Packages.rb:683 +#: src/modules/Packages.rb:704 #, fuzzy #| msgid "Package %1 will be installed" msgid "New product <b>%s</b> will be installed" msgstr "Package %1 will be installed" #. product update: %s is a product name -#: src/modules/Packages.rb:693 +#: src/modules/Packages.rb:714 #, fuzzy #| msgid "%1 packages will be updated" msgid "Product <b>%s</b> will be updated" msgstr "%1 packages will be updated" #. product update: %{old_product} is an old product, %{new_product} is the new one -#: src/modules/Packages.rb:695 +#: src/modules/Packages.rb:716 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>" msgstr "" -#: src/modules/Packages.rb:702 +#: src/modules/Packages.rb:723 #, fuzzy #| msgid "Package %1 will be installed." msgid "Product <b>%s</b> will stay installed" @@ -2015,11 +2015,11 @@ #. Removing another product might be an issue #. (just warn if removed by user or by YaST) -#: src/modules/Packages.rb:712 +#: src/modules/Packages.rb:733 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "" -#: src/modules/Packages.rb:713 +#: src/modules/Packages.rb:734 #, fuzzy #| msgid "%1 packages will be updated" msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed." @@ -2027,7 +2027,7 @@ #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:739 +#: src/modules/Packages.rb:760 msgid "" "<ul><li><b>Some products are marked for automatic removal.</b></li>\n" "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n" @@ -2038,13 +2038,13 @@ msgstr "" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1323 +#: src/modules/Packages.rb:1344 #, fuzzy msgid "No repository found at '%1'." msgstr "No source found at '%1'." #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1596 +#: src/modules/Packages.rb:1617 #, fuzzy #| msgid "" #| "<p><b>These are the release notes made for the first initial release. They are\n" @@ -2062,29 +2062,29 @@ "from the SUSE Linux Web server.</b></p>" #. popup - information label -#: src/modules/Packages.rb:1623 +#: src/modules/Packages.rb:1644 #, fuzzy msgid "Integrating booted media..." msgstr "Installing boot manager..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1645 +#: src/modules/Packages.rb:1666 #, fuzzy msgid "Failed to integrate the service pack repository." msgstr "Failed to integrate service pack source" #. popup - information label -#: src/modules/Packages.rb:1678 +#: src/modules/Packages.rb:1699 #, fuzzy msgid "Initializing repositories..." msgstr "Initialising fonts..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1910 +#: src/modules/Packages.rb:1931 msgid "Insert %1 CD 1" msgstr "Insert %1 CD 1" -#: src/modules/Packages.rb:1912 +#: src/modules/Packages.rb:1933 #, fuzzy msgid "%1 CD 1 not found" msgstr "" @@ -2092,7 +2092,7 @@ "CA not found" #. an error message -#: src/modules/Packages.rb:2022 +#: src/modules/Packages.rb:2043 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -2101,19 +2101,19 @@ "Check the log file %1 for more details." #. bnc #436925 -#: src/modules/Packages.rb:2283 +#: src/modules/Packages.rb:2304 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." msgstr "" #. popup label -#: src/modules/Packages.rb:2301 +#: src/modules/Packages.rb:2322 msgid "Evaluating package selection..." msgstr "Evaluating package selection..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2633 +#: src/modules/Packages.rb:2627 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -2122,22 +2122,22 @@ #. Sets that the license (file) has been already accepted #. #. @param [String] license_ident file name -#: src/modules/ProductLicense.rb:157 src/modules/ProductLicense.rb:164 +#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159 #, fuzzy msgid "Cannot read license file %1" msgstr "Cannot read file %1" -#: src/modules/ProductLicense.rb:158 +#: src/modules/ProductLicense.rb:153 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image." msgstr "" #. combo box -#: src/modules/ProductLicense.rb:302 +#: src/modules/ProductLicense.rb:297 msgid "&Language" msgstr "&Language" #. check box label -#: src/modules/ProductLicense.rb:391 +#: src/modules/ProductLicense.rb:347 #, fuzzy #| msgid "Yes, I Agree to the License Agreement" msgid "I &Agree to the License Terms." @@ -2145,7 +2145,7 @@ #. TRANSLATORS: addition license information #. %s is replaced with the directory name -#: src/modules/ProductLicense.rb:416 +#: src/modules/ProductLicense.rb:372 msgid "" "This EULA can be found in the directory\n" "%s" @@ -2153,7 +2153,7 @@ #. TRANSLATORS: addition license information #. %s is replaced with the filename -#: src/modules/ProductLicense.rb:420 +#: src/modules/ProductLicense.rb:376 #, fuzzy msgid "" "If you want to print this EULA, you can find it\n" @@ -2163,7 +2163,7 @@ "check the EULA.txt file on the first media" #. help text -#: src/modules/ProductLicense.rb:438 +#: src/modules/ProductLicense.rb:394 msgid "" "<p>Read the license agreement carefully and select\n" "one of the available options. If you do not agree to the license agreement,\n" @@ -2177,41 +2177,47 @@ #. #459391 #. If a progress is running open another dialog #. dialog caption -#: src/modules/ProductLicense.rb:448 src/modules/ProductLicense.rb:1197 -#: src/modules/ProductLicense.rb:1270 +#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144 +#: src/modules/ProductLicense.rb:1217 msgid "License Agreement" msgstr "License Agreement" #. popup question -#: src/modules/ProductLicense.rb:1061 +#: src/modules/ProductLicense.rb:1017 #, fuzzy msgid "Really abort the add-on product installation?" msgstr "Really abort the installation?" -#. text changed due to bug #162499 -#. TRANSLATORS: text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1095 +#. text asking whether to refuse a license (Yes-No popup) +#: src/modules/ProductLicense.rb:1041 msgid "" +"Refusing the license agreement cancels the installation.\n" +"Really refuse the agreement?" +msgstr "" + +#. text asking whether to refuse a license (Yes-No popup) +#: src/modules/ProductLicense.rb:1044 +msgid "" "Refusing the license agreement cancels the add-on\n" "product installation. Really refuse the agreement?" msgstr "" #. timed ok/cancel popup -#: src/modules/ProductLicense.rb:1107 +#: src/modules/ProductLicense.rb:1054 #, fuzzy msgid "The system is shutting down..." msgstr "System is shutting down..." #. TRANSLATORS: %s is an extension name #. e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/modules/ProductLicense.rb:1206 +#: src/modules/ProductLicense.rb:1153 #, fuzzy #| msgid "License Agreement" msgid "%s License Agreement" msgstr "License Agreement" #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found -#: src/modules/ProductLicense.rb:1622 +#: src/modules/ProductLicense.rb:1573 msgid "" "If you want to print this EULA, you can download it from\n" "%{license_url}" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/pam.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/pam.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/pam.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2004-MO-DA HO:MI+ZONE\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/pkg-bindings.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/pkg-bindings.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/pkg-bindings.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2008-05-05 12:07+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/printer.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/printer.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/printer.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2007-08-16 20:16+0100\n" "Last-Translator: Karl Eichwalder\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/product-creator.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/product-creator.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/product-creator.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/proxy.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/proxy.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/proxy.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/rear.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/rear.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/rear.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/registration.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/registration.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/registration.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-15 17:44+0200\n" "PO-Revision-Date: 2008-03-27 23:04+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -354,14 +354,15 @@ msgid "Importing '%s' certificate..." msgstr "" -#. workaround after string freeze -#: src/lib/registration/connect_helpers.rb:264 +#. try to use a translatable message first, if not found then use +#. the original error message from openSSL +#: src/lib/registration/connect_helpers.rb:261 msgid "Secure connection error: %s" msgstr "" #. TRANSLATORS: error message, %s is a server URL, #. e.g. https://smt.example.com -#: src/lib/registration/connect_helpers.rb:283 +#: src/lib/registration/connect_helpers.rb:280 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -371,7 +372,7 @@ #. FIXME: use a better message, this one has been reused after the text freeze #. error message, the entered URL is not valid. -#: src/lib/registration/connect_helpers.rb:295 +#: src/lib/registration/connect_helpers.rb:292 #: src/lib/registration/ui/base_system_registration_dialog.rb:544 #, fuzzy #| msgid "Invalid value." @@ -379,13 +380,13 @@ msgstr "Invalid value." #. Error popup -#: src/lib/registration/connect_helpers.rb:299 +#: src/lib/registration/connect_helpers.rb:296 msgid "" "Network is not configured, the registration server cannot be reached.\n" "Do you want to configure the network now?" msgstr "" -#: src/lib/registration/connect_helpers.rb:306 +#: src/lib/registration/connect_helpers.rb:303 msgid "Network error, check the network configuration." msgstr "" @@ -636,11 +637,11 @@ #. create the main dialog definition #. @return [Yast::Term] the main UI dialog term -#: src/lib/registration/ui/addon_selection_base_dialog.rb:90 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:91 msgid "&Filter Out Beta Versions" msgstr "" -#: src/lib/registration/ui/addon_selection_base_dialog.rb:92 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:93 #, fuzzy #| msgid "Details..." msgid "Details" @@ -648,13 +649,13 @@ #. addon description widget #. @return [Yast::Term] the addon details widget -#: src/lib/registration/ui/addon_selection_base_dialog.rb:102 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:103 msgid "Select an extension or a module to show details here" msgstr "" #. checkbox label for an unavailable extension #. (%s is an extension name) -#: src/lib/registration/ui/addon_selection_base_dialog.rb:115 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:116 #, fuzzy #| msgid "is not available" msgid "%s (not available)" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/relocation-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/relocation-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/relocation-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/samba-client.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/samba-client.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-client.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/samba-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/samba-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/samba-users.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/samba-users.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-users.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:22+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/scanner.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/scanner.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/scanner.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/security.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/security.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/security.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:54+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -1302,10 +1302,6 @@ msgid "Predefined Security Configurations" msgstr "Predefined Configurations" -#: src/include/security/wizards.rb:62 -msgid "Security" -msgstr "Security" - #. Dialog caption #: src/include/security/wizards.rb:159 msgid "Security Configuration" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/services-manager.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/services-manager.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/services-manager.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2014-05-19 09:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/slp-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/slp-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/slp-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:24+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/snapper.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/snapper.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/snapper.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:05+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/sound.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/sound.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sound.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/squid.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/squid.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/squid.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: squid\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/sshd.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/sshd.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sshd.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sshd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:42+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/storage.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/storage.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/storage.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-12-02 10:13+0100\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -114,8 +114,7 @@ msgstr "&Create Partition Setup..." #. popup text -#: src/clients/inst_disk_proposal.rb:123 -#: src/clients/partitions_proposal.rb:105 +#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105 msgid "" "No automatic proposal possible.\n" "Specify mount points manually in the 'Partitioner' dialog." @@ -1132,15 +1131,14 @@ #: src/include/partitioning/custom_part_check_generated.rb:298 msgid "" "Warning:\n" -"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n" -"on MS-DOS or type 0x00 GPT PReP Boot on GPT.\n" +"Your system needs a boot partition with type 0x41 PReP/CHRP.\n" "Please, consider creating one.\n" "\n" "Really use this setup?\n" msgstr "" #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:314 +#: src/include/partitioning/custom_part_check_generated.rb:313 #, fuzzy msgid "" "Warning:\n" @@ -1162,7 +1160,7 @@ "Change this?\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:334 +#: src/include/partitioning/custom_part_check_generated.rb:333 #, fuzzy msgid "" "Warning:\n" @@ -1178,7 +1176,7 @@ "Do you want to do this?\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:351 +#: src/include/partitioning/custom_part_check_generated.rb:350 msgid "" "Warning: There is no partition of type bios_grub present.\n" "Such a partition is recommended (required with Btrfs) when Grub2 is\n" @@ -1190,14 +1188,13 @@ #. popup text #. If the user chooses 'no' here, the system will not be able to #. boot from the hard drive! -#: src/include/partitioning/custom_part_check_generated.rb:371 +#: src/include/partitioning/custom_part_check_generated.rb:370 #, fuzzy msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" "(approx. %1) is required. Consider creating one\n" -"with type 0x41 PReP/CHRP on MS-DOS or type 0x00 GPT\n" -"PReP Boot on GPT.\n" +"with type 0x41 PReP/CHRP.\n" "\n" "Really use the setup without /boot partition?\n" msgstr "" @@ -1210,7 +1207,7 @@ "Do you want to change your setup?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:391 +#: src/include/partitioning/custom_part_check_generated.rb:389 #, fuzzy msgid "" "Warning: According to your setup, you intend to\n" @@ -1231,7 +1228,7 @@ "\n" "Change this?\n" -#: src/include/partitioning/custom_part_check_generated.rb:417 +#: src/include/partitioning/custom_part_check_generated.rb:415 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1240,7 +1237,7 @@ msgstr "" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:435 +#: src/include/partitioning/custom_part_check_generated.rb:433 #, fuzzy msgid "" "Warning: With your current setup, your %1\n" @@ -1258,7 +1255,7 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:453 +#: src/include/partitioning/custom_part_check_generated.rb:451 #, fuzzy msgid "" "Warning: With your current setup, your %2 installation\n" @@ -1284,7 +1281,7 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:475 +#: src/include/partitioning/custom_part_check_generated.rb:473 #, fuzzy msgid "" "Warning: With your current setup, your %2 installation will\n" @@ -1310,13 +1307,13 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:498 +#: src/include/partitioning/custom_part_check_generated.rb:496 #, fuzzy msgid "Really use this setup?" msgstr "Really delete this entry?" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:506 +#: src/include/partitioning/custom_part_check_generated.rb:504 #, fuzzy msgid "" "\n" @@ -1339,7 +1336,7 @@ "Do you want to change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:522 +#: src/include/partitioning/custom_part_check_generated.rb:520 #, fuzzy msgid "" "\n" @@ -1355,7 +1352,7 @@ "particularly in any of the following cases:\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:529 +#: src/include/partitioning/custom_part_check_generated.rb:527 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1368,7 +1365,7 @@ "- if this partition does not yet contain a file system\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:536 +#: src/include/partitioning/custom_part_check_generated.rb:534 #, fuzzy #| msgid "" #| "If in doubt, you might want to go back and mark this partition for\n" @@ -1384,7 +1381,7 @@ "like /, /boot, /usr, /opt, or /var.\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:542 +#: src/include/partitioning/custom_part_check_generated.rb:540 #, fuzzy msgid "" "If you decide to format the partition, all data on it will be lost.\n" @@ -1396,7 +1393,7 @@ "Do you want to change your setup?\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:603 +#: src/include/partitioning/custom_part_check_generated.rb:601 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1405,7 +1402,7 @@ "Remove it from the RAID before editing it.\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:614 +#: src/include/partitioning/custom_part_check_generated.rb:612 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1414,7 +1411,7 @@ "Remove it from the volume group before editing it.\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:624 +#: src/include/partitioning/custom_part_check_generated.rb:622 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1423,7 +1420,7 @@ "Remove the volume before editing it.\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:657 +#: src/include/partitioning/custom_part_check_generated.rb:655 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1432,7 +1429,7 @@ "Remove it from the RAID before deleting it.\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:668 +#: src/include/partitioning/custom_part_check_generated.rb:666 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1440,13 +1437,13 @@ "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" -#: src/include/partitioning/custom_part_check_generated.rb:680 +#: src/include/partitioning/custom_part_check_generated.rb:678 #, fuzzy msgid "It cannot be deleted while mounted." msgstr "The selected scheme cannot be deleted." #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:716 +#: src/include/partitioning/custom_part_check_generated.rb:714 #, fuzzy #| msgid "" #| "The device (%1) cannot be removed\n" @@ -1461,7 +1458,7 @@ "partition with higher number is in use.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:792 +#: src/include/partitioning/custom_part_check_generated.rb:790 #, fuzzy #| msgid "" #| "The selected extended partition contains partitions which are currently mounted:\n" @@ -1480,7 +1477,7 @@ "Please choose Cancel unless you know exactly what you are doing.\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:810 +#: src/include/partitioning/custom_part_check_generated.rb:808 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1495,7 +1492,7 @@ "before deleting the extended partition.\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:821 +#: src/include/partitioning/custom_part_check_generated.rb:819 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1510,7 +1507,7 @@ "deleting the extended partition.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:832 +#: src/include/partitioning/custom_part_check_generated.rb:830 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -2801,11 +2798,9 @@ #. Package: yast2-storage #. Summary: Expert Partitioner #. Authors: Arvin Schnell <aschnell@suse.de> -#: src/include/partitioning/ep-btrfs.rb:40 -#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61 -#: src/include/partitioning/ep-loop.rb:37 -#: src/include/partitioning/ep-lvm.rb:64 -#: src/include/partitioning/ep-raid.rb:38 +#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36 +#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37 +#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38 msgid "Edit" msgstr "Edit" @@ -2836,9 +2831,8 @@ #. Package: yast2-storage #. Summary: Expert Partitioner #. Authors: Arvin Schnell <aschnell@suse.de> -#: src/include/partitioning/ep-btrfs.rb:45 -#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64 -#: src/include/partitioning/ep-loop.rb:37 +#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43 +#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37 #: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66 #: src/include/partitioning/ep-raid.rb:40 #: src/include/partitioning/ep-tmpfs.rb:36 @@ -2861,8 +2855,7 @@ #: src/include/partitioning/ep-btrfs.rb:140 #: src/include/partitioning/ep-btrfs.rb:205 #: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86 -#: src/include/partitioning/ep-loop.rb:54 -#: src/include/partitioning/ep-lvm.rb:86 +#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86 #: src/include/partitioning/ep-raid.rb:59 msgid "Edit..." msgstr "Edit..." @@ -2879,8 +2872,7 @@ #. push button text #: src/include/partitioning/ep-btrfs.rb:145 #: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56 -#: src/include/partitioning/ep-lvm.rb:90 -#: src/include/partitioning/ep-raid.rb:63 +#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63 #: src/include/partitioning/ep-tmpfs.rb:112 #: src/include/partitioning/ep-tmpfs.rb:170 #, fuzzy @@ -3557,7 +3549,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5251 +#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250 msgid "The disk is in use and cannot be modified." msgstr "" @@ -3766,8 +3758,7 @@ msgstr "Move &Up" #: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43 -#: src/include/partitioning/ep-lvm.rb:65 -#: src/include/partitioning/ep-raid.rb:39 +#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39 #, fuzzy msgid "Resize" msgstr "Re&size" @@ -3869,8 +3860,7 @@ #. push button text #. push button text -#: src/include/partitioning/ep-hd.rb:496 -#: src/include/partitioning/ep-lvm.rb:213 +#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213 #: src/include/partitioning/ep-lvm.rb:337 #: src/include/partitioning/ep-tmpfs.rb:110 #, fuzzy @@ -6634,7 +6624,7 @@ msgstr "Continue resizing the %1?" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5263 +#: src/modules/Storage.rb:5262 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6644,7 +6634,7 @@ "Partition %1 cannot be resized\n" "because the file system could not be mounted.\n" -#: src/modules/Storage.rb:5289 +#: src/modules/Storage.rb:5288 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6654,7 +6644,7 @@ "Device %1 cannot be modified because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5303 +#: src/modules/Storage.rb:5302 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6664,7 +6654,7 @@ "Device %1 cannot be modified because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5332 +#: src/modules/Storage.rb:5331 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6674,7 +6664,7 @@ "Device %1 cannot be removed because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5341 +#: src/modules/Storage.rb:5340 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6684,7 +6674,7 @@ "Device %1 cannot be removed because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5370 +#: src/modules/Storage.rb:5369 #, fuzzy #| msgid "" #| "\n" @@ -6702,7 +6692,7 @@ "device %2 which contains activated swap that is needed to run \n" "the installation.\n" -#: src/modules/Storage.rb:5381 +#: src/modules/Storage.rb:5380 #, fuzzy #| msgid "" #| "\n" @@ -6718,7 +6708,7 @@ "device %2 which contains data needed to perform the installation.\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5403 +#: src/modules/Storage.rb:5402 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6732,20 +6722,20 @@ "because the file system could not be mounted.\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5492 +#: src/modules/Storage.rb:5491 #, fuzzy #| msgid "Copying root filesystem..." msgid "Nothing assigned as root filesystem!" msgstr "Copying root filesystem..." -#: src/modules/Storage.rb:5493 +#: src/modules/Storage.rb:5492 msgid "Installation will most certainly fail fatally!" msgstr "" #. Set rather than Add, there might be some packs left over #. from previous 'MakeProposal' we don't need now #. This also covers the case when AddPackagesList returns [] or nil -#: src/modules/Storage.rb:6043 +#: src/modules/Storage.rb:6042 #, fuzzy #| msgid "writing the firewall rules failed" msgid "Adding the following resolvables failed: %1" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/sudo.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/sudo.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sudo.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sudo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:39+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/support.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/support.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/support.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-05-19 09:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/sysconfig.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/sysconfig.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sysconfig.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2004-03-18 15:42+0100\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/tftp-server.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/tftp-server.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/tftp-server.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley@suse.co.uk>\n" "Language-Team: English <i18n@suse.de>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/timezone_db.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/timezone_db.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/timezone_db.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: timezone_db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:36+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/tune.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/tune.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/tune.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tune\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:33+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/update.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/update.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/update.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:32+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -184,9 +184,9 @@ #. TRANSLATORS: label for an unknown installed system #: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74 #: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106 -#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:157 -#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448 -#: src/modules/RootPart.rb:2005 +#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:156 +#: src/modules/RootPart.rb:1441 src/modules/RootPart.rb:1447 +#: src/modules/RootPart.rb:1994 msgid "Unknown" msgstr "Unknown" @@ -294,6 +294,19 @@ "Do you really want\n" "to reset your detailed selection?" +#. error report +#. inform user in the proposal about the failed mount +#. error report +#: src/clients/inst_update_partition_auto.rb:79 +#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385 +msgid "Failed to mount target system" +msgstr "Failed to mount target system" + +#. Correctly mounted but incomplete installation found +#: src/clients/inst_update_partition_auto.rb:84 +msgid "A possibly incomplete installation has been detected." +msgstr "" + #. proposal for packages during update, %1 is count of packages #: src/clients/packages_proposal.rb:119 msgid "Packages to Update: %1" @@ -341,14 +354,6 @@ msgid "%1 on root partition %2" msgstr "%1 on root partition %2" -#. inform user in the proposal about the failed mount -#. error report -#. error report -#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385 -#: src/lib/update/clients/inst_update_partition_auto.rb:64 -msgid "Failed to mount target system" -msgstr "Failed to mount target system" - #. this is a heading #: src/clients/rootpart_proposal.rb:149 msgid "Selected for Update" @@ -609,13 +614,8 @@ msgid "&Yes, Continue" msgstr "&Continue" -#. Correctly mounted but incomplete installation found -#: src/lib/update/clients/inst_update_partition_auto.rb:69 -msgid "A possibly incomplete installation has been detected." -msgstr "" - #. Link to SDB article concerning renaming of devices. -#: src/modules/RootPart.rb:110 +#: src/modules/RootPart.rb:109 #, fuzzy msgid "" "See the SDB article at %1 for details\n" @@ -625,17 +625,17 @@ "about how to solve this problem." #. label - name of sustem to update -#: src/modules/RootPart.rb:148 +#: src/modules/RootPart.rb:147 msgid "Unknown Linux System" msgstr "Unknown Linux System" #. label - name of sustem to update -#: src/modules/RootPart.rb:153 +#: src/modules/RootPart.rb:152 msgid "Non-Linux System" msgstr "Non-Linux System" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.rb:309 +#: src/modules/RootPart.rb:308 msgid "" "Cannot unmount partition %1.\n" "\n" @@ -650,7 +650,7 @@ "or restart your computer.\n" #. label, %1 is partition -#: src/modules/RootPart.rb:380 +#: src/modules/RootPart.rb:379 msgid "Checking partition %1" msgstr "Checking partition %1" @@ -659,23 +659,23 @@ #. @param string button (true) #. @param string button (false) #. @param [String] details (hidden under [Details] button; optional; to disable, use "") -#: src/modules/RootPart.rb:417 +#: src/modules/RootPart.rb:416 msgid "Show &Details" msgstr "Show &Details" #. #176292, run fsck before jfs is mounted -#: src/modules/RootPart.rb:499 +#: src/modules/RootPart.rb:498 msgid "Checking file system on %1..." msgstr "Checking file system on %1..." #. popup headline -#: src/modules/RootPart.rb:531 +#: src/modules/RootPart.rb:530 msgid "File System Check Failed" msgstr "File System Check Failed" #. popup question (continue/cancel dialog) #. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.rb:535 +#: src/modules/RootPart.rb:534 #, fuzzy #| msgid "" #| "The file system check of device %1 has failed.\n" @@ -691,24 +691,24 @@ "Would you like to continue in mounting the device?" #. button -#: src/modules/RootPart.rb:544 +#: src/modules/RootPart.rb:543 msgid "&Skip Mounting" msgstr "&Skip Mounting" #. yes-no popup -#: src/modules/RootPart.rb:1066 +#: src/modules/RootPart.rb:1065 msgid "Incorrect password. Try again?" msgstr "Incorrect password. Try again?" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.rb:1169 +#: src/modules/RootPart.rb:1168 msgid "Warning" msgstr "Warning" #. TRANSLATORS: error message, #. %1 is replaced with the current /boot partition size #. %2 with the recommended size -#: src/modules/RootPart.rb:1174 +#: src/modules/RootPart.rb:1173 #, fuzzy #| msgid "" #| "Your /boot partition is too small (%1 MB).\n" @@ -733,7 +733,7 @@ "Would you like to continue updating the current system?" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.rb:1266 +#: src/modules/RootPart.rb:1265 #, fuzzy #| msgid "" #| "The partition %1 could not be mounted.\n" @@ -764,27 +764,27 @@ "To abort update, click Cancel." #. push button -#: src/modules/RootPart.rb:1284 +#: src/modules/RootPart.rb:1283 msgid "&Specify Mount Options" msgstr "&Specify Mount Options" #. popup heading -#: src/modules/RootPart.rb:1300 +#: src/modules/RootPart.rb:1299 msgid "Mount Options" msgstr "Mount Options" #. text entry label -#: src/modules/RootPart.rb:1303 +#: src/modules/RootPart.rb:1302 msgid "&Mount Point" msgstr "&Mount Point" #. tex entry label -#: src/modules/RootPart.rb:1306 +#: src/modules/RootPart.rb:1305 msgid "&Device" msgstr "&Device" #. text entry label -#: src/modules/RootPart.rb:1311 +#: src/modules/RootPart.rb:1310 msgid "" "&File System\n" "(empty for autodetection)" @@ -793,12 +793,12 @@ "(empty for autodetection)" #. error message -#: src/modules/RootPart.rb:1388 +#: src/modules/RootPart.rb:1387 msgid "The /var partition %1 could not be mounted.\n" msgstr "The /var partition %1 could not be mounted.\n" #. Informational text about selected partition, %x are replaced with values later -#: src/modules/RootPart.rb:1429 +#: src/modules/RootPart.rb:1428 msgid "" "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" @@ -806,18 +806,18 @@ "<b>udev path:</b> %6" msgstr "" -#: src/modules/RootPart.rb:1443 +#: src/modules/RootPart.rb:1442 msgid "None" msgstr "None" #. a popup caption -#: src/modules/RootPart.rb:1466 +#: src/modules/RootPart.rb:1465 #, fuzzy msgid "Unable to find the /var partition automatically" msgstr "Unable to mount /var partition with this disk configuration.\n" #. a popup message -#: src/modules/RootPart.rb:1471 +#: src/modules/RootPart.rb:1470 msgid "" "Your system uses a separate /var partition which is required for the upgrade\n" "process to detect the disk-naming changes. Select the /var partition manually\n" @@ -825,24 +825,24 @@ msgstr "" #. a combo-box label -#: src/modules/RootPart.rb:1484 +#: src/modules/RootPart.rb:1483 #, fuzzy msgid "&Select /var Partition Device" msgstr "Select a Root Partition" #. an informational rich-text widget label -#: src/modules/RootPart.rb:1490 +#: src/modules/RootPart.rb:1489 #, fuzzy msgid "Device Info" msgstr "Device ID" #. error message -#: src/modules/RootPart.rb:1631 +#: src/modules/RootPart.rb:1630 msgid "Unable to mount /var partition with this disk configuration.\n" msgstr "Unable to mount /var partition with this disk configuration.\n" #. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.rb:1662 +#: src/modules/RootPart.rb:1661 msgid "" "Partitions could not be mounted.\n" "\n" @@ -855,7 +855,7 @@ #. read the keyboard settings now, so that it used when #. typing passwords for encrypted partitions #. Calling a script because otherwise this module would depend on yast2-country -#: src/modules/RootPart.rb:1706 +#: src/modules/RootPart.rb:1705 msgid "" "Some partitions in the system on %1 are mounted by kernel-device name. This is\n" "not reliable for the update since kernel-device names are unfortunately not\n" @@ -864,32 +864,32 @@ msgstr "" #. error message -#: src/modules/RootPart.rb:1724 +#: src/modules/RootPart.rb:1723 msgid "No fstab found." msgstr "No fstab found." #. message part 1 -#: src/modules/RootPart.rb:1749 +#: src/modules/RootPart.rb:1748 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "The root partition in /etc/fstab has an invalid root device.\n" #. message part 2 -#: src/modules/RootPart.rb:1754 +#: src/modules/RootPart.rb:1753 msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "It is currently mounted as %1 but listed as %2.\n" #. prepare progress-bar -#: src/modules/RootPart.rb:2130 +#: src/modules/RootPart.rb:2115 msgid "Evaluating root partition. One moment please..." msgstr "Evaluating root partition. One moment please..." #. intermediate popup while mounting partitions -#: src/modules/RootPart.rb:2213 +#: src/modules/RootPart.rb:2197 msgid "Mounting partitions. One moment please..." msgstr "Mounting partitions. One moment please..." #. TRANSLATORS: dialog caption -#: src/modules/RootPart.rb:2228 +#: src/modules/RootPart.rb:2212 #, fuzzy #| msgid "Checking for available updates..." msgid "Searching for Available Systems" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/users.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/users.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/users.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:31+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" @@ -249,18 +249,6 @@ msgid "New UID of the user" msgstr "New UID of the user" -#. Checking double user entries -#. (double username or UID) -#. @param [Array] users to check -#: src/clients/users_auto.rb:172 -msgid "Found users in profile with equal <username>." -msgstr "" - -#. Do not check users without defined UID. (bnc#996823) -#: src/clients/users_auto.rb:178 -msgid "Found users in profile with equal <uid>." -msgstr "" - #. helptext 1/3 #: src/clients/users_plugin_ldap_all.rb:105 msgid "" @@ -699,7 +687,7 @@ #: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247 #: src/include/users/dialogs.rb:2364 #: src/lib/users/dialogs/inst_root_first.rb:193 -#: src/lib/users/dialogs/inst_user_first.rb:473 +#: src/lib/users/dialogs/inst_user_first.rb:471 msgid "" "The passwords do not match.\n" "Try again." @@ -736,7 +724,7 @@ #. text entry #. text entry #: src/include/users/dialogs.rb:403 -#: src/lib/users/dialogs/inst_user_first.rb:585 +#: src/lib/users/dialogs/inst_user_first.rb:583 msgid "User's &Full Name" msgstr "User's &Full Name" @@ -758,7 +746,7 @@ #. input field for login name #. input field for login name #: src/include/users/dialogs.rb:433 -#: src/lib/users/dialogs/inst_user_first.rb:592 +#: src/lib/users/dialogs/inst_user_first.rb:590 msgid "&Username" msgstr "&Username" @@ -775,7 +763,7 @@ #. checkbox label #. checkbox label #: src/include/users/dialogs.rb:470 -#: src/lib/users/dialogs/inst_user_first.rb:616 +#: src/lib/users/dialogs/inst_user_first.rb:614 msgid "U&se this password for system administrator" msgstr "U&se this password for system administrator" @@ -973,7 +961,7 @@ #. User can confirm using "invalid" password confirming all the errors #: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391 #: src/lib/users/dialogs/inst_root_first.rb:212 -#: src/lib/users/dialogs/inst_user_first.rb:485 +#: src/lib/users/dialogs/inst_user_first.rb:483 #, fuzzy #| msgid "&Reset Password" msgid "Really use this password?" @@ -1113,7 +1101,7 @@ "</p>" #. help text 4/4 -#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:164 +#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160 msgid "" "<p>\n" "To ensure that the password was entered correctly,\n" @@ -1295,7 +1283,7 @@ "</p>\n" #. alternative help text 1/7 -#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:143 +#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139 msgid "" "<p>\n" "Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" @@ -1349,7 +1337,7 @@ #. these are used only during installation time #. help text 4/7 (only during installation) -#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:180 +#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176 msgid "" "<p>\n" "The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n" @@ -2128,8 +2116,7 @@ #. the type of user set #. New user is the default option -#: src/include/users/widgets.rb:79 -#: src/lib/users/dialogs/inst_user_first.rb:279 +#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275 msgid "Local Users" msgstr "Local Users" @@ -3237,7 +3224,7 @@ "Try again." #. reenable suggestion -#: src/lib/users/dialogs/inst_user_first.rb:138 +#: src/lib/users/dialogs/inst_user_first.rb:134 #, fuzzy #| msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>" msgid "" @@ -3247,13 +3234,13 @@ "</p>\n" msgstr "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>" -#: src/lib/users/dialogs/inst_user_first.rb:142 +#: src/lib/users/dialogs/inst_user_first.rb:138 #, fuzzy #| msgid "Create New User" msgid "Create new user" msgstr "Create New User" -#: src/lib/users/dialogs/inst_user_first.rb:146 +#: src/lib/users/dialogs/inst_user_first.rb:142 #, fuzzy msgid "" "<p>\n" @@ -3268,7 +3255,7 @@ "</p>\n" #. TRANSLATORS: %{min} and %{max} will be replaced by numbers -#: src/lib/users/dialogs/inst_user_first.rb:153 +#: src/lib/users/dialogs/inst_user_first.rb:149 #, fuzzy #| msgid "" #| "<p>\n" @@ -3286,7 +3273,7 @@ " %2 and %3 characters.\n" "</p>" -#: src/lib/users/dialogs/inst_user_first.rb:169 +#: src/lib/users/dialogs/inst_user_first.rb:165 msgid "" "<p>\n" "For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" @@ -3302,17 +3289,17 @@ "restrictions in the /etc/login.defs file. Read its man page for information.\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:176 +#: src/lib/users/dialogs/inst_user_first.rb:172 msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>" msgstr "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>" -#: src/lib/users/dialogs/inst_user_first.rb:187 +#: src/lib/users/dialogs/inst_user_first.rb:183 #, fuzzy #| msgid "&Read User Data from a Previous Installation" msgid "Import User Data from a Previous Installation" msgstr "&Read User Data from a Previous Installation" -#: src/lib/users/dialogs/inst_user_first.rb:188 +#: src/lib/users/dialogs/inst_user_first.rb:184 msgid "" "<p>\n" "A previous Linux installation with local users has been detected.\n" @@ -3322,11 +3309,11 @@ "</p>\n" msgstr "" -#: src/lib/users/dialogs/inst_user_first.rb:196 +#: src/lib/users/dialogs/inst_user_first.rb:192 msgid "Skip User Creation" msgstr "" -#: src/lib/users/dialogs/inst_user_first.rb:197 +#: src/lib/users/dialogs/inst_user_first.rb:193 msgid "" "<p>\n" "Sometimes root is the only needed local user, like in network environments\n" @@ -3335,14 +3322,14 @@ "</p>\n" msgstr "" -#: src/lib/users/dialogs/inst_user_first.rb:279 +#: src/lib/users/dialogs/inst_user_first.rb:275 #, fuzzy #| msgid "Local Users" msgid "Local User" msgstr "Local Users" #. TRANSLATORS: Error popup -#: src/lib/users/dialogs/inst_user_first.rb:332 +#: src/lib/users/dialogs/inst_user_first.rb:330 msgid "" "The new username cannot be blank.\n" "If you don't want to create a user now, select\n" @@ -3350,7 +3337,7 @@ msgstr "" #. TRANSLATORS: error popup -#: src/lib/users/dialogs/inst_user_first.rb:389 +#: src/lib/users/dialogs/inst_user_first.rb:387 msgid "" "No users from the previous installation were choosen.\n" "If you don't want to create a user now, select\n" @@ -3358,42 +3345,42 @@ msgstr "" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:516 +#: src/lib/users/dialogs/inst_user_first.rb:514 #, fuzzy #| msgid "Create New User" msgid "&Create New User" msgstr "Create New User" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:539 +#: src/lib/users/dialogs/inst_user_first.rb:537 #, fuzzy #| msgid "&Read User Data from a Previous Installation" msgid "&Import User Data from a Previous Installation" msgstr "&Read User Data from a Previous Installation" -#: src/lib/users/dialogs/inst_user_first.rb:549 +#: src/lib/users/dialogs/inst_user_first.rb:547 #, fuzzy #| msgid "System Users" msgid "Choose Users" msgstr "System Users" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:565 +#: src/lib/users/dialogs/inst_user_first.rb:563 msgid "&Skip User Creation" msgstr "" #. checkbox label -#: src/lib/users/dialogs/inst_user_first.rb:621 +#: src/lib/users/dialogs/inst_user_first.rb:619 msgid "&Automatic Login" msgstr "&Automatic Login" -#: src/lib/users/dialogs/inst_user_first.rb:628 +#: src/lib/users/dialogs/inst_user_first.rb:626 #, fuzzy #| msgid "No user was specified." msgid "No users selected" msgstr "No user was specified." -#: src/lib/users/dialogs/inst_user_first.rb:630 +#: src/lib/users/dialogs/inst_user_first.rb:628 #, fuzzy msgid "%d user will be imported" msgid_plural "%d users will be imported" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/vm.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/vm.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/vm.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: vm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:06+0200\n" +"POT-Creation-Date: 2016-08-04 14:56+0200\n" "PO-Revision-Date: 2008-03-27 22:27+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/wol.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/wol.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/wol.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: wol\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:27+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po 2016-09-22 12:11:19 UTC (rev 97017) +++ branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po 2016-09-22 12:11:24 UTC (rev 97018) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 15:04+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:23+0000\n" "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n" "Language-Team: <en@li.org>\n"